Mercurial > emacs
view lisp/widget.el @ 106395:f2b36fb84bf7
Enhance `c-parse-state' to run efficiently in "brace desserts".
* progmodes/cc-mode.el (c-basic-common-init): Call
c-state-cache-init.
(c-neutralize-syntax-in-and-mark-CPP): Renamed from
c-extend-and-neutralize-syntax-in-CPP. Mark each CPP construct by
placing `category' properties value 'c-cpp-delimiter at its
boundaries.
* progmodes/cc-langs.el (c-before-font-lock-function):
c-extend-and-neutralize-syntax-in-CPP has been renamed
c-neutralize-syntax-in-and-mark-CPP.
* progmodes/cc-fonts.el (c-cpp-matchers): Mark template brackets
with `category' properties now, not `syntax-table' ones.
* progmodes/cc-engine.el (c-syntactic-end-of-macro): A new
enhanced (but slower) version of c-end-of-macro that won't land
inside a literal or on another awkward character.
(c-state-cache-too-far, c-state-cache-start)
(c-state-nonlit-pos-interval, c-state-nonlit-pos-cache)
(c-state-nonlit-pos-cache-limit, c-state-point-min)
(c-state-point-min-lit-type, c-state-point-min-lit-start)
(c-state-min-scan-pos, c-state-brace-pair-desert)
(c-state-old-cpp-beg, c-state-old-cpp-end): New constants and
buffer local variables.
(c-state-literal-at, c-state-lit-beg)
(c-state-cache-non-literal-place, c-state-get-min-scan-pos)
(c-state-mark-point-min-literal, c-state-cache-top-lparen)
(c-state-cache-top-paren, c-state-cache-after-top-paren)
(c-get-cache-scan-pos, c-get-fallback-scan-pos)
(c-state-balance-parens-backwards, c-parse-state-get-strategy)
(c-renarrow-state-cache)
(c-append-lower-brace-pair-to-state-cache)
(c-state-push-any-brace-pair, c-append-to-state-cache)
(c-remove-stale-state-cache)
(c-remove-stale-state-cache-backwards, c-state-cache-init)
(c-invalidate-state-cache-1, c-parse-state-1)
(c-invalidate-state-cache): New defuns/defmacros/defsubsts.
(c-parse-state): Enhanced and refactored.
(c-debug-parse-state): Amended to deal with all the new variables.
* progmodes/cc-defs.el (c-<-as-paren-syntax, c-mark-<-as-paren)
(c->-as-paren-syntax, c-mark->-as-paren, c-unmark-<->-as-paren):
modify to use category text properties rather than syntax-table
ones.
(c-suppress-<->-as-parens, c-restore-<->-as-parens): new defsubsts
to switch off/on the syntactic paren property of C++ template
delimiters using the category property.
(c-with-<->-as-parens-suppressed): Macro to invoke code with
template delims suppressed.
(c-cpp-delimiter, c-set-cpp-delimiters, c-clear-cpp-delimiters):
New constant/macros which apply category properties to the start
and end of preprocessor constructs.
(c-comment-out-cpps, c-uncomment-out-cpps): defsubsts which
"comment out" the syntactic value of characters in preprocessor
constructs.
(c-with-cpps-commented-out)
(c-with-all-but-one-cpps-commented-out): Macros to invoke code
with characters in all or all but one preprocessor constructs
"commented out".
author | Alan Mackenzie <acm@muc.de> |
---|---|
date | Thu, 03 Dec 2009 16:02:10 +0000 |
parents | 25e1d7e37015 |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; widget.el --- a library of user interface components ;; ;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: help, extensions, faces, hypermedia ;; Version: 1.9920 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; ;; The widget library is partially documented in the `widget' Info ;; file. ;; ;; This file only contains the code needed to define new widget types. ;; Everything else is autoloaded from `wid-edit.el'. ;;; Code: ;; Doing this is unnecessary in Emacs 20. Kept as dummy in case ;; external libraries call it. We save a kb or two of purespace by ;; dummying-out such definitions generally. (defmacro define-widget-keywords (&rest keys) ;; ;; Don't use backquote, since that makes trouble trying to ;; ;; re-bootstrap from just the .el files. ;; (list 'eval-and-compile ;; (list 'let (list (list 'keywords (list 'quote keys))) ;; (list 'while 'keywords ;; (list 'or (list 'boundp (list 'car 'keywords)) ;; (list 'set (list 'car 'keywords) (list 'car 'keywords))) ;; (list 'setq 'keywords (list 'cdr 'keywords))))) ) ;;(define-widget-keywords :documentation-indent ;; :complete-function :complete :button-overlay ;; :field-overlay ;; :documentation-shown :button-prefix ;; :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive ;; :prompt-internal :prompt-history :prompt-match ;; :prompt-value :deactivate :active ;; :inactive :activate :sibling-args :delete-button-args ;; :insert-button-args :append-button-args :button-args ;; :tag-glyph :off-glyph :on-glyph :valid-regexp ;; :secret :sample-face :sample-face-get :case-fold ;; :create :convert-widget :format :value-create :offset :extra-offset ;; :tag :doc :from :to :args :value :action ;; :value-set :value-delete :match :parent :delete :menu-tag-get ;; :value-get :choice :void :menu-tag :on :off :on-type :off-type ;; :notify :entry-format :button :children :buttons :insert-before ;; :delete-at :format-handler :widget :value-pos :value-to-internal ;; :indent :size :value-to-external :validate :error :directory ;; :must-match :type-error :value-inline :inline :match-inline :greedy ;; :button-face-get :button-face :value-face :keymap :entry-from ;; :entry-to :help-echo :documentation-property :tab-order) (put 'define-widget 'doc-string-elt 3) ;`declare' doesn't work in functions. (defun define-widget (name class doc &rest args) "Define a new widget type named NAME from CLASS. NAME and CLASS should both be symbols, CLASS should be one of the existing widget types, or nil to create the widget from scratch. After the new widget has been defined, the following two calls will create identical widgets: * (widget-create NAME) * (apply 'widget-create CLASS ARGS) The third argument DOC is a documentation string for the widget." (put name 'widget-type (cons class args)) (put name 'widget-documentation (purecopy doc)) name) ;; This is used by external widget code (in W3, at least). (defalias 'widget-plist-member 'plist-member) ;;; The End. (provide 'widget) ;; arch-tag: 932c71a3-9aeb-4827-a293-8b88b26d5c58 ;;; widget.el ends here