From thenriksen at common-lisp.net Mon Jun 4 21:52:06 2007 From: thenriksen at common-lisp.net (thenriksen) Date: Mon, 4 Jun 2007 17:52:06 -0400 (EDT) Subject: [climacs-cvs] CVS climacs Message-ID: <20070604215206.B20C0586C2@common-lisp.net> Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv8059 Modified Files: text-syntax.lisp packages.lisp Log Message: Put Text Syntax into its own package. --- /project/climacs/cvsroot/climacs/text-syntax.lisp 2006/11/12 16:06:06 1.12 +++ /project/climacs/cvsroot/climacs/text-syntax.lisp 2007/06/04 21:52:06 1.13 @@ -52,7 +52,7 @@ ;;; Right stickies at non whitespace characters preceeded by space and punctuation. ;;; -(in-package :drei-syntax) ;;; Put this in a separate package once it works +(in-package :climacs-text-syntax) ;;; Put this in a separate package once it works (defun index-of-mark-after-offset (flexichain offset) "Searches for the mark after `offset' in the marks stored in `flexichain'." @@ -159,7 +159,7 @@ (offset (element* paragraphs (1- pos1))))) t)))) -(defmethod forward-one-paragraph (mark (syntax text-syntax)) +(defmethod forward-one-paragraph ((mark mark) (syntax text-syntax)) (with-slots (paragraphs) syntax (let ((pos1 (index-of-mark-after-offset paragraphs @@ -173,7 +173,7 @@ (offset (element* paragraphs pos1)))) t)))) - (defmethod backward-one-sentence (mark (syntax text-syntax)) + (defmethod backward-one-sentence ((mark mark) (syntax text-syntax)) (with-slots (sentence-beginnings) syntax (let ((pos1 (index-of-mark-after-offset sentence-beginnings (offset mark)))) (when (> pos1 0) @@ -181,7 +181,7 @@ (offset (element* sentence-beginnings (1- pos1)))) t)))) - (defmethod forward-one-sentence (mark (syntax text-syntax)) + (defmethod forward-one-sentence ((mark mark) (syntax text-syntax)) (with-slots (sentence-endings) syntax (let ((pos1 (index-of-mark-after-offset sentence-endings @@ -193,7 +193,7 @@ (offset (element* sentence-endings pos1))) t)))) -(defmethod syntax-line-indentation (mark tab-width (syntax text-syntax)) +(defmethod syntax-line-indentation ((mark mark) tab-width (syntax text-syntax)) (loop with indentation = 0 with mark2 = (clone-mark mark) until (beginning-of-buffer-p mark2) --- /project/climacs/cvsroot/climacs/packages.lisp 2007/05/01 17:09:52 1.124 +++ /project/climacs/cvsroot/climacs/packages.lisp 2007/06/04 21:52:06 1.125 @@ -138,6 +138,10 @@ (:use :clim-lisp :clim :drei-buffer :drei-base :drei-syntax :flexichain :drei :drei-fundamental-syntax)) +(defpackage :climacs-text-syntax + (:use :clim-lisp :clim :drei-buffer :drei-base + :drei-syntax :flexichain :drei :drei-fundamental-syntax)) + (defpackage :climacs-prolog-syntax (:use :clim-lisp :clim :drei-buffer :drei-base :drei-syntax :flexichain :drei :climacs-core :drei-fundamental-syntax From thenriksen at common-lisp.net Mon Jun 4 22:34:45 2007 From: thenriksen at common-lisp.net (thenriksen) Date: Mon, 4 Jun 2007 18:34:45 -0400 (EDT) Subject: [climacs-cvs] CVS climacs Message-ID: <20070604223445.4122B3D00B@common-lisp.net> Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv15442 Modified Files: java-syntax.lisp c-syntax.lisp Log Message: Removed unnecessary defgenerics. --- /project/climacs/cvsroot/climacs/java-syntax.lisp 2007/05/06 11:08:56 1.3 +++ /project/climacs/cvsroot/climacs/java-syntax.lisp 2007/06/04 22:34:44 1.4 @@ -1120,7 +1120,7 @@ (match right-brace-lexeme)) t) -(defmethod backward-one-expression (mark (syntax java-syntax)) +(defmethod backward-one-expression ((mark mark) (syntax java-syntax)) (let ((tlv (top-level-vector syntax))) (multiple-value-bind (form count) (top-level-form-before-in-vector tlv (offset mark) t) @@ -1141,7 +1141,7 @@ (t (return nil)))) (setf (offset mark) (start-offset form))))))) -(defmethod forward-one-expression (mark (syntax java-syntax)) +(defmethod forward-one-expression ((mark mark) (syntax java-syntax)) (let ((tlv (top-level-vector syntax))) (multiple-value-bind (form count) (top-level-form-after-in-vector tlv (offset mark) t) @@ -1162,10 +1162,6 @@ (t (return nil)))) (setf (offset mark) (end-offset form))))))) -(defgeneric forward-one-list (mark syntax) - (:documentation "Move `mark' forward by one list. -Return T if successful, or NIL if the buffer limit was reached.")) - (defmethod forward-one-list (mark (syntax java-syntax)) (let ((tlv (top-level-vector syntax))) (multiple-value-bind (form count) @@ -1188,10 +1184,6 @@ (t (return nil))))) finally (return nil)))))) -(defgeneric backward-one-list (mark syntax) - (:documentation "Move `mark' backward by one list. Return T if -successful, or NIL if the buffer limit was reached.")) - (defmethod backward-one-list (mark (syntax java-syntax)) (let ((tlv (top-level-vector syntax))) (multiple-value-bind (form count) --- /project/climacs/cvsroot/climacs/c-syntax.lisp 2007/05/08 10:23:09 1.3 +++ /project/climacs/cvsroot/climacs/c-syntax.lisp 2007/06/04 22:34:45 1.4 @@ -1187,11 +1187,7 @@ (t (return nil)))) (setf (offset mark) (end-offset form))))))) -(defgeneric forward-one-list (mark syntax) - (:documentation "Move `mark' forward by one list. -Return T if successful, or NIL if the buffer limit was reached.")) - -(defmethod forward-one-list (mark (syntax c-syntax)) +(defmethod forward-one-list ((mark mark) (syntax c-syntax)) (let ((tlv (top-level-vector syntax))) (multiple-value-bind (form count) (top-level-form-after-in-vector tlv (offset mark)) @@ -1213,11 +1209,7 @@ (t (return nil))))) finally (return nil)))))) -(defgeneric backward-one-list (mark syntax) - (:documentation "Move `mark' backward by one list. Return T if -successful, or NIL if the buffer limit was reached.")) - -(defmethod backward-one-list (mark (syntax c-syntax)) +(defmethod backward-one-list ((mark mark) (syntax c-syntax)) (let ((tlv (top-level-vector syntax))) (multiple-value-bind (form count) (top-level-form-before-in-vector tlv (offset mark))