Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv26459

Modified Files: climacs.asd c-syntax.lisp Log Message: Restored C syntax, including syntax highlighting.

--- /project/climacs/cvsroot/climacs/climacs.asd 2008/01/04 13:08:22 1.64 +++ /project/climacs/cvsroot/climacs/climacs.asd 2008/01/07 23:08:14 1.65 @@ -41,8 +41,8 @@ ;; (:file "ttcn3-syntax" :depends-on ("packages")) (:file "climacs-lisp-syntax" :depends-on ("core" "groups")) (:file "climacs-lisp-syntax-commands" :depends-on ("climacs-lisp-syntax" "misc-commands")) - #+nil(:file "c-syntax" :depends-on ("core")) - #+nil(:file "c-syntax-commands" :depends-on ("c-syntax" "misc-commands")) + (:file "c-syntax" :depends-on ("core")) + (:file "c-syntax-commands" :depends-on ("c-syntax" "misc-commands")) #+nil(:file "java-syntax" :depends-on ("core")) #+nil(:file "java-syntax-commands" :depends-on ("java-syntax" "misc-commands")) (:file "gui" :depends-on ("packages")) --- /project/climacs/cvsroot/climacs/c-syntax.lisp 2007/12/08 08:55:05 1.5 +++ /project/climacs/cvsroot/climacs/c-syntax.lisp 2008/01/07 23:08:14 1.6 @@ -782,6 +782,26 @@ `syntax'." (buffer-substring (buffer syntax) (start-offset form) (end-offset form)))

+(define-syntax-highlighting-rules default-c-highlighting + (error-symbol (*error-drawing-options*)) + (string-form (*string-drawing-options*)) + (operator (*special-operator-drawing-options*)) + (type-specifier (*keyword-drawing-options*)) + (type-qualifier (*keyword-drawing-options*)) + (storage-class-specifier (:face :ink +dark-green+)) + (function-specifier (:face :ink +dark-green+)) + (comment (*comment-drawing-options*)) + (integer-constant-lexeme (:face :ink +gray50+)) + (floating-constant-lexeme (:face :ink +gray50+))) + +(defparameter *syntax-highlighting-rules* 'default-c-highlighting + "The syntax highlighting rules used for highlighting C +syntax.") + +(defmethod syntax-highlighting-rules ((syntax c-syntax)) + *syntax-highlighting-rules*) + +#| (define-standard-faces c-syntax (make-face :error +red+) (make-face :string +rosy-brown+ (make-text-style nil :italic nil)) @@ -957,6 +977,8 @@ (with-face (:comment) (call-next-method)))

+|# + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; exploit the parse