1. xemacs
  2. semantic

Source

semantic / semantic-util.el

Diff from to

File semantic-util.el

-;;; semantic-util.el --- Utilities for use with semantic token streams
+;;; semantic-util.el --- Utilities for use with semantic tag tables
 
-;;; Copyright (C) 1999, 2000, 2001, 2002 Eric M. Ludlam
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 Eric M. Ludlam
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;
-;; API for accessing and searching nonterminal streams from the
-;; Semantic Bovinator.
+;; Semantic utility API for use with semantic tag tables.
 ;;
 
 (require 'assoc)
   (condition-case nil
       (require 'newcomment)
     (error nil))
-  (require 'semanticdb) ;; XEmacs change: from upstream cedet
+  ;; Semanticdb calls
+  (require 'semanticdb)
   )
 
 ;;; Code:
 (defvar semantic-equivalent-major-modes nil
   "List of major modes which are considered equivalent.
 Equivalent modes share a parser, and a set of override methods.
-Setup from the BNF code generator.  A value of nil means that
-the current major mode is the only one.")
+A value of nil means that the current major mode is the only one.")
 (make-variable-buffer-local 'semantic-equivalent-major-modes)
 
-;;; Utility API functions
-;;
-;; These functions use the flex and bovination engines to perform some
-;; simple tasks useful to other programs.  These are just the most
-;; critical entries.
-(defun semantic-equivalent-tokens-p (token1 token2)
-  "Compare TOKEN1 and TOKEN2 and return non-nil if they are equivalent.
-Use `eq' to test of two tokens are the same.  Use this function if tokens
-are being copied and regrouped to test for if two tokens represent the same
-thing, but may be constructed of different cons cells."
-  (and (string= (semantic-token-name token1) (semantic-token-name token2))
-       (eq (semantic-token-token token1) (semantic-token-token token2))
-       (eq (semantic-token-start token1) (semantic-token-start token2))
-       (eq (semantic-token-end token1) (semantic-token-end token2))))
-
-(defun semantic-token-type (token)
-  "Retrieve the type of TOKEN."
-  (if (member (semantic-token-token token)
-	      '(function variable type))
-      (nth 2 token)))
-
-(defmacro semantic-token-type-parts (token)
-  "Retrieve the parts of the type TOKEN."
-  `(nth 3 ,token))
-
-(defmacro semantic-token-type-parent (token)
-  "Retrieve the parent of the type TOKEN.
-The return value is a list.  A value of nil means no parents.
-The `car' of the list is either the parent class, or a list
-of parent classes.  The `cdr' of the list is the list of
-interfaces, or abstract classes which are parents of TOKEN."
-  `(nth 4 ,token))
-
-(defun semantic-token-type-parent-superclass (token)
-  "Retrieve a list of parent superclasses for the type token TOKEN."
-  (let ((p (semantic-token-type-parent token)))
-    (cond ((stringp (car p))
-	   (list (car p)))
-	  ((listp (car p))
-	   (car p)))))
-
-(defun semantic-token-type-parent-implement (token)
-  "Retrieve a list of parent interfaces for the type token TOKEN."
-  (cdr (semantic-token-type-parent token)))
-
-(defmacro semantic-token-type-extra-specs (token)
-  "Retrieve extra specifications for the type TOKEN."
-  `(nth 5 ,token))
-
-(defmacro semantic-token-type-extra-spec (token spec)
-  "Retrieve an extra specification for the type TOKEN.
-SPEC is the symbol whose specification value to get."
-  `(cdr (assoc ,spec (semantic-token-type-extra-specs ,token))))
-
-(defmacro semantic-token-type-modifiers (token)
-  "Retrieve modifiers for the type TOKEN."
-  `(semantic-token-type-extra-spec ,token 'typemodifiers))
-
-(defmacro semantic-token-function-args (token)
-  "Retrieve the arguments of the function TOKEN."
-  `(nth 3 ,token))
-
-(defmacro semantic-token-function-extra-specs (token)
-  "Retrieve extra specifications for the function TOKEN."
-  `(nth 4 ,token))
-
-(defmacro semantic-token-function-extra-spec (token spec)
-  "Retrieve an extra specification for the function TOKEN.
-SPEC is the symbol whose specification value to get."
-  `(cdr (assoc ,spec (semantic-token-function-extra-specs ,token))))
-
-(defmacro semantic-token-function-modifiers (token)
-  "Retrieve modifiers for the function TOKEN."
-  `(semantic-token-function-extra-spec ,token 'typemodifiers))
-
-(defmacro semantic-token-function-throws (token)
-  "The symbol string that a function can throws.
-Determines if it is available based on the length of TOKEN."
-  `(semantic-token-function-extra-spec ,token 'throws))
-
-(defmacro semantic-token-function-parent (token)
-  "The parent of the function TOKEN.
-A function has a parent if it is a method of a class, and if the
-function does not appear in body of it's parent class."
-  `(semantic-token-function-extra-spec ,token 'parent))
-
-(defmacro semantic-token-function-destructor (token)
-  "Non-nil if TOKEN is a destructor function."
-  `(semantic-token-function-extra-spec ,token 'destructor))
-
-(defmacro semantic-token-variable-default (token)
-  "Retrieve the default value of the variable TOKEN."
-  `(nth 3 ,token))
-
-(defmacro semantic-token-variable-extra-specs (token)
-  "Retrieve extra specifications for the variable TOKEN."
-  `(nth 4 ,token))
-
-(defmacro semantic-token-variable-extra-spec (token spec)
-  "Retrieve an extra specification for the variable TOKEN.
-SPEC is the symbol whose specification value to get."
-  `(cdr (assoc ,spec (semantic-token-variable-extra-specs ,token))))
-
-(defmacro semantic-token-variable-modifiers (token)
-  "Retrieve modifiers for the variable TOKEN."
-  `(semantic-token-variable-extra-spec ,token 'typemodifiers))
-
-(defmacro semantic-token-variable-const (token)
-  "Retrieve the status of constantness from the variable TOKEN."
-  `(semantic-token-variable-extra-spec ,token 'const))
-
-(defmacro semantic-token-variable-optsuffix (token)
-  "Optional details if this variable has bit fields, or array dimentions.
-Determines if it is available based on the length of TOKEN."
-  `(semantic-token-variable-extra-spec ,token 'suffix))
-
-(defmacro semantic-token-include-system (token)
- "Retrieve the flag indicating if the include TOKEN is a system include."
-  `(nth 2 ,token))
-
-(defun semantic-token-extra-spec (token spec)
-  "Retrieve an extra specification for TOKEN.
-SPEC is a symbol whose specification value to get.
-This function can get extra specifications from any type of token.
-Do not use the function if you know what type of token you are dereferencing.
-Instead, use `semantic-token-variable-extra-spec',
-`semantic-token-function-extra-spec', or  `semantic-token-type-extra-spec'."
-  (let ((tt (semantic-token-token token)))
-    (cond ((eq tt 'variable)
-	   (semantic-token-variable-extra-spec token spec))
-	  ((eq tt 'function)
-	   (semantic-token-function-extra-spec token spec))
-	  ((eq tt 'type)
-	   (semantic-token-type-extra-spec token spec))
-	  (t nil))))
-
-(defun semantic-token-extra-specs (token)
-  "Retrieve the extra specifications list for TOKEN.
-This function can get extra specifications from any type of token.
-Do not use the function if you know what type of token you are dereferencing.
-Instead, use `semantic-token-variable-extra-specs',
-`semantic-token-function-extra-specs', or  `semantic-token-type-extra-specs'."
-  (let ((tt (semantic-token-token token)))
-    (cond ((eq tt 'variable)
-	   (semantic-token-variable-extra-specs token))
-	  ((eq tt 'function)
-	   (semantic-token-function-extra-specs token))
-	  ((eq tt 'type)
-	   (semantic-token-type-extra-specs token))
-	  (t nil))))
-
-(defun semantic-token-add-extra-spec (token spec value)
-  "Add to TOKEN, and extra specifier SPEC with VALUE.
-Use this function in a parser when not all specifiers are known
-at the same time."
-  (let ((tt (semantic-token-token token)))
-    (cond ((eq tt 'variable)
-	   (setcar (nthcdr 4 token)
-		   (cons (cons spec value)
-			 (semantic-token-variable-extra-specs token))))
-	  ((eq tt 'function)
-	   (setcar (nthcdr 4 token)
-		   (cons (cons spec value)
-			 (semantic-token-function-extra-specs token))))
-	  ((eq tt 'type)
-	   (setcar (nthcdr 5 token)
-		   (cons (cons spec value)
-			 (semantic-token-type-extra-specs token))))
-	  (t nil))
-    token))
-
-
-(defmacro semantic-token-modifiers (token)
-  "Retrieve modifiers for TOKEN.
-If TOKEN is of an unknown type, then nil is returned."
-  `(semantic-token-extra-spec ,token 'typemodifiers))
-
-;;; Misc. utilities
-;;
-(defun semantic-map-buffers (fun)
-  "Run function FUN for each Semantic enabled buffer found.
-FUN does not have arguments.  When FUN is entered, `current-buffer' is
-the current Semantic enabled buffer found."
-  (let ((bl (buffer-list))
-        b)
-    (while bl
-      (setq b  (car bl)
-            bl (cdr bl))
-      (if (and (buffer-live-p b)
-               (buffer-file-name b))
-          (with-current-buffer b
-            (if (semantic-active-p)
-                (funcall fun)))))))
-
 ;; These semanticdb calls will throw warnings in the byte compiler.
 ;; Doing the right thing to make them available at compile time
 ;; really messes up the compilation sequence.
-(defun semantic-file-token-stream (file &optional checkcache)
-  "Return a token stream for FILE.
+(defun semantic-file-tag-table (file)
+  "Return a tag table for FILE.
 If it is loaded, return the stream after making sure it's ok.
 If FILE is not loaded, check to see if `semanticdb' feature exists,
-   and use it to get tokens from files not in memory.
+   and use it to get tags from files not in memory.
 If FILE is not loaded, and semanticdb is not available, find the file
-   and parse it.
-Optional argument CHECKCACHE is the same as that for
-`semantic-bovinate-toplevel'."
+   and parse it."
   (if (get-file-buffer file)
       (save-excursion
 	(set-buffer (get-file-buffer file))
-	(semantic-bovinate-toplevel checkcache))
+	(semantic-fetch-tags))
     ;; File not loaded
     (if (and (fboundp 'semanticdb-minor-mode-p)
 	     (semanticdb-minor-mode-p))
       ;; Get the stream ourselves.
       (save-excursion
 	(set-buffer (find-file-noselect file))
-	(semantic-bovinate-toplevel checkcache)))))
+	(semantic-fetch-tags)))))
 
-(defun semantic-something-to-stream (something)
-  "Convert SOMETHING into a semantic token stream.
-Something can be a token with a valid BUFFER property, a stream, a
-buffer, or a filename."
-  (cond ((bufferp something)
-	 (save-excursion
-	   (set-buffer something)
-	   (semantic-bovinate-toplevel nil)))
-	((semantic-token-with-position-p something)
-	 (save-excursion
-	   (when (semantic-token-buffer something)
-	     (set-buffer (semantic-token-buffer something))
-	     (semantic-bovinate-toplevel nil))))
-	((and (listp something)
-	      (semantic-token-p (car something)))
-	 something)
-	((and (stringp something)
-	      (file-exists-p something))
-	 (semantic-file-token-stream something nil))
-	(t nil)))
+(semantic-alias-obsolete 'semantic-file-token-stream
+			 'semantic-file-tag-table)
 
-;;; Searching by Position APIs
-;;
-;; These functions will find nonterminals based on a position.
-(defun semantic-find-nonterminal-by-position (position streamorbuffer
-						       &optional nomedian)
-  "Find a nonterminal covering POSITION within STREAMORBUFFER.
-POSITION is a number, or marker.  If NOMEDIAN is non-nil, don't do
-the median calculation, and return nil."
-  (save-excursion
-    (if (markerp position) (set-buffer (marker-buffer position)))
-    (let* ((stream (if (bufferp streamorbuffer)
-		       (save-excursion
-			 (set-buffer streamorbuffer)
-			 (semantic-bovinate-toplevel))
-		     streamorbuffer))
-	   (prev nil)
-	   (found nil))
-      (while (and stream (not found))
-	;; perfect fit
-	(if (and (>= position (semantic-token-start (car stream)))
-		 (<= position (semantic-token-end (car stream))))
-	    (setq found (car stream))
-	  ;; Median between to objects.
-	  (if (and prev (not nomedian)
-		   (>= position (semantic-token-end prev))
-		   (<= position (semantic-token-start (car stream))))
-	      (let ((median (/ (+ (semantic-token-end prev)
-				  (semantic-token-start (car stream)))
-			       2)))
-		(setq found
-		      (if (> position median)
-			  (car stream)
-			prev)))))
-	;; Next!!!
-	(setq prev (car stream)
-	      stream (cdr stream)))
-      found)))
+(defun semantic-something-to-tag-table (something)
+  "Convert SOMETHING into a semantic tag table.
+Something can be a tag with a valid BUFFER property, a tag table, a
+buffer, or a filename.  If SOMETHING is nil return nil."
+  (cond
+   ;; A list of tags
+   ((and (listp something)
+	 (semantic-tag-p (car something)))
+    something)
+   ;; A buffer
+   ((bufferp something)
+    (save-excursion
+      (set-buffer something)
+      (semantic-fetch-tags)))
+   ;; A Tag: Get that tag's buffer
+   ((and (semantic-tag-with-position-p something)
+	 (semantic-tag-buffer something))
+    (save-excursion
+      (set-buffer (semantic-tag-buffer something))
+      (semantic-fetch-tags)))
+   ;; Tag with a file name in it
+   ((and (semantic-tag-p something)
+	 (semantic-tag-file-name something)
+	 (file-exists-p (semantic-tag-file-name something)))
+    (semantic-file-tag-table
+     (semantic-tag-file-name something)))
+   ;; A file name
+   ((and (stringp something)
+	 (file-exists-p something))
+    (semantic-file-tag-table something))
+   ;; A Semanticdb table
+   ((and (featurep 'semanticdb)
+	 (semanticdb-minor-mode-p)
+	 (semanticdb-abstract-table-p something))
+    (semanticdb-get-tags something something))
+   ;; Use the current buffer for nil
+;;   ((null something)
+;;    (semantic-fetch-tags))
+   ;; don't know what it is
+   (t nil)))
 
-(defun semantic-find-innermost-nonterminal-by-position
-  (position streamorbuffer &optional nomedian)
-  "Find a list of nonterminals covering POSITION within STREAMORBUFFER.
-POSITION is a number, or marker.  If NOMEDIAN is non-nil, don't do
-the median calculation, and return nil.
-This function will find the topmost item, and recurse until no more
-details are available of findable."
-  (let* ((returnme nil)
-	 (current (semantic-find-nonterminal-by-position
-		   position streamorbuffer nomedian))
-	 (nextstream (and current
-			  (if (eq (semantic-token-token current) 'type)
-			      (semantic-token-type-parts current)
-			    nil))))
-    (while nextstream
-      (setq returnme (cons current returnme))
-      (setq current (semantic-find-nonterminal-by-position
-		     position nextstream nomedian))
-      (setq nextstream (and current
-			    (if (eq (semantic-token-token current) 'token)
-				(semantic-token-type-parts current)
-			      nil))))
-    (nreverse (cons current returnme))))
-
-(defun semantic-find-nonterminal-by-overlay (&optional positionormarker buffer)
-  "Find all nonterminals covering POSITIONORMARKER by using overlays.
-If POSITIONORMARKER is nil, use the current point.
-Optional BUFFER is used if POSITIONORMARKER is a number, otherwise the current
-buffer is used.  This finds all tokens covering the specified position
-by checking for all overlays covering the current spot.  They are then sorted
-from largest to smallest via the start location."
-  (save-excursion
-    (when positionormarker
-      (if (markerp positionormarker)
-	  (set-buffer (marker-buffer positionormarker))
-	(if (bufferp buffer)
-	    (set-buffer buffer))))
-    (let ((ol (semantic-overlays-at (or positionormarker (point))))
-	  (ret nil))
-      (while ol
-	(let ((tmp (semantic-overlay-get (car ol) 'semantic)))
-	  (when (and tmp
-		     ;; We don't need with-position because no token w/out
-		     ;; a position could exist in an overlay.
-		     (semantic-token-p tmp))
-	    (setq ret (cons tmp ret))))
-	(setq ol (cdr ol)))
-      (sort ret (lambda (a b) (< (semantic-token-start a)
-				 (semantic-token-start b)))))))
-
-(defun semantic-find-nonterminal-by-overlay-in-region (start end &optional buffer)
-  "Find all nonterminals which exist in whole or in part between START and END.
-Uses overlays to determine positin.
-Optional BUFFER argument specifies the buffer to use."
-  (save-excursion
-    (if buffer (set-buffer buffer))
-    (let ((ol (semantic-overlays-in start end))
-	  (ret nil))
-      (while ol
-	(let ((tmp (semantic-overlay-get (car ol) 'semantic)))
-	  (when (and tmp
-		     ;; See above about position
-		     (semantic-token-p tmp))
-	    (setq ret (cons tmp ret))))
-	(setq ol (cdr ol)))
-      (sort ret (lambda (a b) (< (semantic-token-start a)
-				 (semantic-token-start b)))))))
-
-(defun semantic-find-nonterminal-by-overlay-next (&optional start buffer)
-  "Find the next nonterminal after START in BUFFER.
-If START is in an overlay, find the token which starts next,
-not the current token."
-  (save-excursion
-    (if buffer (set-buffer buffer))
-    (if (not start) (setq start (point)))
-    (let ((os start) (ol nil))
-      (while (and os (< os (point-max)) (not ol))
-	(setq os (semantic-overlay-next-change os))
-	(when os
-	  ;; Get overlays at position
-	  (setq ol (semantic-overlays-at os))
-	  ;; find the overlay that belongs to semantic
-	  ;; and starts at the found position.
-	  (while (and ol (listp ol))
-	    (if (and (semantic-overlay-get (car ol) 'semantic)
-		     (semantic-token-p
-		      (semantic-overlay-get (car ol) 'semantic))
-		     (= (semantic-overlay-start (car ol)) os))
-		(setq ol (car ol)))
-	    (when (listp ol) (setq ol (cdr ol))))))
-      ;; convert ol to a token
-      (when (and ol (semantic-token-p (semantic-overlay-get ol 'semantic)))
-	(semantic-overlay-get ol 'semantic)))))
-
-(defun semantic-find-nonterminal-by-overlay-prev (&optional start buffer)
-  "Find the next nonterminal after START in BUFFER.
-If START is in an overlay, find the token which starts next,
-not the current token."
-  (save-excursion
-    (if buffer (set-buffer buffer))
-    (if (not start) (setq start (point)))
-    (let ((os start) (ol nil))
-      (while (and os (> os (point-min)) (not ol))
-	(setq os (semantic-overlay-previous-change os))
-	(when os
-	  ;; Get overlays at position
-	  (setq ol (semantic-overlays-at os))
-	  ;; find the overlay that belongs to semantic
-	  ;; and starts at the found position.
-	  (while (and ol (listp ol))
-	    (if (and (semantic-overlay-get (car ol) 'semantic)
-		     (semantic-token-p
-		      (semantic-overlay-get (car ol) 'semantic))
-		     (= (semantic-overlay-start (car ol)) os))
-		(setq ol (car ol)))
-	    (when (listp ol) (setq ol (cdr ol))))))
-      ;; convert ol to a token
-      (when (and ol
-		 (semantic-token-p (semantic-overlay-get ol 'semantic)))
-	(semantic-overlay-get ol 'semantic)))))
-
-(defun semantic-current-nonterminal ()
-  "Return the current nonterminal in the current buffer.
-If there are more than one in the same location, return the
-smallest token.  Return nil if there is no token here."
-  (car (nreverse (semantic-find-nonterminal-by-overlay))))
-
-(defun semantic-current-nonterminal-parent ()
-  "Return the current nonterminals parent in the current buffer.
-A token's parent would be a containing structure, such as a type
-containing a field.  Return nil if there is no parent."
-  (car (cdr (nreverse (semantic-find-nonterminal-by-overlay)))))
-
-(defun semantic-current-nonterminal-of-type (type)
-  "Return the current (smallest) nonterminal of TYPE in the current buffer.
-If the smallest token is not of type TYPE, keep going upwards until one
-is found."
-  (let ((toks (nreverse (semantic-find-nonterminal-by-overlay))))
-    (while (and toks
-		(not (eq (semantic-token-token (car toks)) type)))
-      (setq toks (cdr toks)))
-    (car toks)))
-
-
-;;; Nonterminal regions and splicing
-;;
-;; This functionality is needed to take some set of dirty code,
-;; and splice in new tokens after a partial reparse.
-
-(defun semantic-change-function-mark-dirty  (start end length)
-  "Run whenever a buffer controlled by `semantic-mode' changes.
-Tracks when and how the buffer is re-parsed.
-Argument START, END, and LENGTH specify the bounds of the change."
-  (when (and (not semantic-toplevel-bovine-cache-check)
-	     (not semantic-edits-are-safe))
-    (let ((tl (condition-case nil
-		  (nreverse (semantic-find-nonterminal-by-overlay-in-region
-		   (1- start) (1+ end)))
-		(error nil))))
-      (if tl
-	  (catch 'alldone
-	    ;; Loop over the token list
-	    (while tl
-	      (cond
-	       ;; If we are completely enclosed in this overlay.
-	       ((and (> start (semantic-token-start (car tl)))
-		     (< end (semantic-token-end (car tl))))
-		(if (semantic-token-get (car tl) 'dirty)
-		    nil
-		  ;; Don't use `add-to-list' here.  It calls `member'
-		  ;; (`equal') to search for an already existing
-		  ;; element, and can fail with error "Stack overflow
-		  ;; in equal" when comparing complex tokens.  Using
-		  ;; `memq' instead should suffice here.
-		  (or (memq (car tl) semantic-dirty-tokens)
-		      (setq semantic-dirty-tokens
-			    (cons (car tl) semantic-dirty-tokens)))
-		  ;;(add-to-list 'semantic-dirty-tokens (car tl))
-		  (semantic-token-put (car tl) 'dirty t)
-		  (condition-case nil
-		      (run-hook-with-args 'semantic-dirty-token-hooks
-					  (car tl) start end)
-		    (error (if debug-on-error (debug)))))
-		  (throw 'alldone t))
-	       ;; If we cover the beginning or end of this item, we must
-	       ;; reparse this object.  If there are more items coming, then postpone
-	       ;; this till later.
-	       ((not (cdr tl))
-		(setq semantic-toplevel-bovine-cache-check t)
-		(run-hooks 'semantic-reparse-needed-change-hook))
-	       (t nil))
-	      ;; next
-	      (setq tl (cdr tl))))
-	;; There was no hit, perhaps we need to reparse this intermediate area.
-	(setq semantic-toplevel-bovine-cache-check t)
-	)
-      )))
-;;
-;; Properties set on the tokens are:
-;;  dirty          - This token is dirty
-;;  dirty-after    - This token, and the white space after it is dirty
-;;  dirty-before   - This token, and the white space before it is dirty
-;;  dirty-children - This token has children that are dirty.
-;;
-;; EXPERIMENTAL
-(defsubst semantic-find-nearby-dirty-tokens (beg end)
-  "Make a special kind of token for dirty whitespace.
-Argument BEG and END is the region to find nearby tokens.
-EXPERIMENTAL"
-  (let ((prev (semantic-find-nonterminal-by-overlay-prev beg))
-	(next (semantic-find-nonterminal-by-overlay-next end)))
-    (if prev (semantic-token-put prev 'dirty-after t))
-    (if next (semantic-token-put next 'dirty-before t))
-    (list prev next)))
-
-(defun semantic-set-tokens-dirty-in-region (beg end)
-  "Mark the region between BEG and END as dirty.
-This is done by finding tokens overlapping the region, and marking
-them dirty.  Regions not covered by a token are then marked as
-dirty-after, meaning the space after that area is dirty.
-This function will be called in an after change hook, and must
-be very fast.
-EXPERIMENTAL"
-  (let ((tromp (semantic-find-nonterminal-by-overlay-in-region beg end))
-	(ttmp nil)
-	)
-    (if (not tromp)
-	;; No tokens hit, setup a dirty region on the screen.
-	(setq tromp nil) ;(semantic-get-dirty-token beg end))
-      ;; First, mark all fully dirty tokens.
-      (setq ttmp tromp)
-      (while ttmp
-	(and (> beg (semantic-token-start (car tromp)))
-	     (< end (semantic-token-end (car tromp))))
-
-	)
-	)))
-
-
-;;; Generalized nonterminal searching
-;;
-;; These functions will search through nonterminal lists explicity for
-;; desired information.
-
-;; The -by-name nonterminal search can use the built in fcn
-;; `assoc', which is faster than looping ourselves, so we will
-;; not use `semantic-find-nonterminal-by-function' to do this,
-;; instead erroring on the side of speed.
-(defun semantic-find-nonterminal-by-name
-  (name streamorbuffer &optional search-parts search-include)
-  "Find a nonterminal NAME within STREAMORBUFFER.  NAME is a string.
-If SEARCH-PARTS is non-nil, search children of tokens.
-If SEARCH-INCLUDE is non-nil, search include files."
-  (let* ((stream (if (bufferp streamorbuffer)
-		     (save-excursion
-		       (set-buffer streamorbuffer)
-		       (semantic-bovinate-toplevel))
-		   streamorbuffer))
-         (assoc-fun (if semantic-case-fold
-                        #'assoc-ignore-case
-                      #'assoc))
-	 (m (funcall assoc-fun name stream)))
-    (if m
-	m
-      (let ((toklst stream)
-	    (children nil))
-	(while (and (not m) toklst)
-	  (if search-parts
-	      (progn
-		(setq children (semantic-nonterminal-children (car toklst) t))
-		(if children
-		    (setq m (semantic-find-nonterminal-by-name
-			     name children search-parts search-include)))))
-	  (setq toklst (cdr toklst)))
-	(if (not m)
-	    ;; Go to dependencies, and search there.
-	    nil)
-	m))))
-
-(defmacro semantic-find-nonterminal-by-token
-  (token streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals with a token TOKEN within STREAMORBUFFER.
-TOKEN is a symbol representing the type of the tokens to find.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  `(semantic-find-nonterminal-by-function
-    (lambda (tok) (eq ,token (semantic-token-token tok)))
-    ,streamorbuffer ,search-parts ,search-includes))
-
-(defmacro semantic-find-nonterminal-standard
-  (streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals in STREAMORBUFFER which define simple token types.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  `(semantic-find-nonterminal-by-function
-    (lambda (tok) (member (semantic-token-token tok)
-			  '(function variable type)))
-    ,streamorbuffer ,search-parts ,search-includes))
-
-(defun semantic-find-nonterminal-by-type
-  (type streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals with type TYPE within STREAMORBUFFER.
-TYPE is a string which is the name of the type of the token returned.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  (semantic-find-nonterminal-by-function
-   (lambda (tok)
-     (let ((ts (semantic-token-type tok)))
-       (if (and (listp ts)
-		(or (= (length ts) 1)
-		    (eq (semantic-token-token ts) 'type)))
-	   (setq ts (semantic-token-name ts)))
-       (equal type ts)))
-   streamorbuffer search-parts search-includes))
-
-(defun semantic-find-nonterminal-by-type-regexp
-  (regexp streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals with type matching REGEXP within STREAMORBUFFER.
-REGEXP is a regular expression  which matches the  name of the type of the
-tokens returned.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  (semantic-find-nonterminal-by-function
-   (lambda (tok)
-     (let ((ts (semantic-token-type tok)))
-       (if (listp ts)
-	   (setq ts
-		 (if (eq (semantic-token-token ts) 'type)
-		     (semantic-token-name ts)
-		   (car ts))))
-       (and ts (string-match regexp ts))))
-   streamorbuffer search-parts search-includes))
-
-(defun semantic-find-nonterminal-by-name-regexp
-  (regex streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals whose name match REGEX in STREAMORBUFFER.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  (semantic-find-nonterminal-by-function
-   (lambda (tok) (string-match regex (semantic-token-name tok)))
-    streamorbuffer search-parts search-includes)
-  )
-
-(defun semantic-find-nonterminal-by-property
-  (property value streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals with PROPERTY equal to VALUE in STREAMORBUFFER.
-Properties can be added with `semantic-token-put'.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  (semantic-find-nonterminal-by-function
-   (lambda (tok) (equal (semantic-token-get tok property) value))
-   streamorbuffer search-parts search-includes)
-  )
-
-(defun semantic-find-nonterminal-by-extra-spec
-  (spec streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals with a given SPEC in STREAMORBUFFER.
-SPEC is a symbol key into the modifiers association list.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  (semantic-find-nonterminal-by-function
-   (lambda (tok) (semantic-token-extra-spec tok spec))
-   streamorbuffer search-parts search-includes)
-  )
-
-(defun semantic-find-nonterminal-by-extra-spec-value
-  (spec value streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals with a given SPEC equal to VALUE in STREAMORBUFFER.
-SPEC is a symbol key into the modifiers association list.
-VALUE is the value that SPEC should match.
-Optional argument SEARCH-PARTS and SEARCH-INCLUDES are passed to
-`semantic-find-nonterminal-by-function'."
-  (semantic-find-nonterminal-by-function
-   (lambda (tok) (equal (semantic-token-extra-spec tok spec) value))
-   streamorbuffer search-parts search-includes)
-  )
-
-(defun semantic-find-nonterminal-by-function
-  (function streamorbuffer &optional search-parts search-includes)
-  "Find all nonterminals in which FUNCTION match within STREAMORBUFFER.
-FUNCTION must return non-nil if an element of STREAM will be included
-in the new list.
-
-If optional argument SEARCH-PARTS is non-nil, all sub-parts of tokens
-are searched.  The overloadable function `semantic-nonterminal-children' is
-used for the searching child lists.  If SEARCH-PARTS is the symbol
-'positiononly, then only children that have positional information are
-searched.
-
-If SEARCH-INCLUDES is non-nil, then all include files are also
-searched for matches."
-  (let ((streamlist (list
-		     (semantic-something-to-stream streamorbuffer)))
-	(includes nil)			;list of includes
-	(stream nil)			;current stream
-        (token  nil)                    ;current token
-	(sl nil)			;list of token children
-	(nl nil)			;new list
-        (case-fold-search semantic-case-fold))
-    (if search-includes
-	(setq includes (semantic-find-nonterminal-by-token
-			'include (car streamlist))))
-    (while streamlist
-      (setq stream     (car streamlist)
-            streamlist (cdr streamlist))
-      (while stream
-        (setq token  (car stream)
-              stream (cdr stream))
-	(if (not (semantic-token-p token))
-            ;; `semantic-nonterminal-children' can return invalid
-            ;; tokens if search-parts is not equal to 'positiononly
-            nil ;; Ignore them!
-          (if (funcall function token)
-              (setq nl (cons token nl)))
-          (and search-parts
-               (setq sl (semantic-nonterminal-children
-                         token
-                         (eq search-parts 'positiononly)))
-               (setq nl (nconc nl
-                               (semantic-find-nonterminal-by-function
-                                function sl
-                                search-parts search-includes)))))))
-    (setq nl (nreverse nl))
-;;;    (while includes
-;;;      (setq nl (append nl (semantic-find-nonterminal-by-function
-;;;			   
-;;;			   ))))
-    nl))
-
-(defun semantic-find-nonterminal-by-function-first-match
-  (function streamorbuffer &optional search-parts search-includes)
-  "Find the first nonterminal which FUNCTION match within STREAMORBUFFER.
-FUNCTION must return non-nil if an element of STREAM will be included
-in the new list.
-If optional argument SEARCH-PARTS, all sub-parts of tokens are searched.
-The overloadable function `semantic-nonterminal-children' is used for
-searching.
-If SEARCH-INCLUDES is non-nil, then all include files are also
-searched for matches."
-  (let ((stream (semantic-something-to-stream streamorbuffer))
-	(found nil)
-        (case-fold-search semantic-case-fold))
-    (while (and (not found) stream)
-      (if (funcall function (car stream))
-	  (setq found (car stream)))
-      (setq stream (cdr stream)))
-    found))
-
-;;; Bucketizing: Take and convert the tokens based on type.
-;;
-(defvar semantic-bucketize-token-token
-  ;; Must use lambda because `semantic-token-token' is a macro.
-  (lambda (tok) (semantic-token-token tok))
-  "Function used to get a symbol describing the class of a token.
-This function must take one argument of a semantic token.
-It should return a symbol found in `semantic-symbol->name-assoc-list'
-which `semantic-bucketize' uses to bin up tokens.
-To create new bins for an application augment
-`semantic-symbol->name-assoc-list', and
-`semantic-symbol->name-assoc-list-for-type-parts' in addition
-to setting this variable (locally in your function).")
-
-(defun semantic-bucketize (tokens &optional parent filter)
-  "Sort TOKENS into a group of buckets based on token type.
-Unknown types are placed in a Misc bucket.
-Type bucket names are defined by either `semantic-symbol->name-assoc-list'.
-If PARENT is specified, then TOKENS belong to this PARENT in some way.
-This will use `semantic-symbol->name-assoc-list-for-type-parts' to
-generate bucket names.
-Optional argument FILTER is a filter function to be applied to each bucket.
-The filter function will take one argument, which is a list of tokens, and
-may re-organize the list with side-effects."
-  (let* ((name-list (if parent
-			semantic-symbol->name-assoc-list-for-type-parts
-		      semantic-symbol->name-assoc-list))
-	 (sn name-list)
-	 (bins (make-vector (1+ (length sn)) nil))
-	 ask toktype
-	 (nsn nil)
-	 (num 1)
-	 (out nil))
-    ;; Build up the bucket vector
-    (while sn
-      (setq nsn (cons (cons (car (car sn)) num) nsn)
-	    sn (cdr sn)
-	    num (1+ num)))
-    ;; Place into buckets
-    (while tokens
-      (setq toktype (funcall semantic-bucketize-token-token (car tokens))
-	    ask (assq toktype nsn)
-	    num (or (cdr ask) 0))
-      (aset bins num (cons (car tokens) (aref bins num)))
-      (setq tokens (cdr tokens)))
-    ;; Remove from buckets into a list.
-    (setq num 1)
-    (while (< num (length bins))
-      (when (aref bins num)
-	(setq out
-	      (cons (cons
-		     (cdr (nth (1- num) name-list))
-		     ;; Filtering, First hacked by David Ponce david@dponce.com
-		     (funcall (or filter 'nreverse) (aref bins num)))
-		    out)))
-      (setq num (1+ num)))
-    (if (aref bins 0)
-	(setq out (cons (cons "Misc"
-			      (funcall (or filter 'nreverse) (aref bins 0)))
-			out)))
-    (nreverse out)))
-
-;;; Adopt external children by rebuilding the list
-;;
-(defvar semantic-orphaned-member-metaparent-type "class"
-  "In `semantic-adopt-external-members', the type of 'type for metaparents.
-A metaparent is a made-up type semantic token used to hold the child list
-of orphaned members of a named type.")
-(make-variable-buffer-local 'semantic-orphaned-member-metaparent-type)
-
-(defvar semantic-mark-external-member-function nil
-  "Function called when an externally defined orphan is found.
-Be default, the token is always marked with the `adopted' property.
-This function should be locally bound by a program that needs
-to add additional behaviors into the token list.
-This function is called with two arguments.  The first is TOKEN which is
-a shallow copy of the token to be modified.  The second is the PARENT
-which is adopting TOKEN.  This function should return TOKEN (or a copy of it)
-which is then integrated into the revised token list.")
-
-(defun semantic-adopt-external-members (tokens)
-  "Rebuild TOKENS so that externally defined members are regrouped.
-Some languages such as C++ and CLOS permit the declaration of member
-functions outside the definition of the class.  It is easier to study
-the structure of a program when such methods are grouped together
-more logically.
-
-This function uses `semantic-nonterminal-external-member-p' to
-determine when a potential child is an externally defined member.
-
-Note: Applications which use this function must account for token
-types which do not have a position, but have children which *do*
-have positions.
-
-Applications should use `semantic-mark-external-member-function'
-to modify all tokens which are found as externally defined to some
-type.  For example, changing the token type for generating extra
-buckets with the bucket function."
-  (let ((parent-buckets nil)
-	(decent-list nil)
-	(out nil)
-	(tmp nil)
-	)
-    ;; Rebuild the output list, stripping out all parented
-    ;; external entries
-    (while tokens
-      (cond
-       ((setq tmp (semantic-nonterminal-external-member-parent (car tokens)))
-	(let ((tokencopy (copy-sequence (car tokens)))
-	      (a (assoc tmp parent-buckets)))
-	  (semantic-token-put-no-side-effect tokencopy 'adopted t)
-	  (if a
-	      ;; If this parent is already in the list, append.
-	      (setcdr (nthcdr (1- (length a)) a) (list tokencopy))
-	    ;; If not, prepend this new parent bucket into our list
-	    (setq parent-buckets
-		  (cons (cons tmp (list tokencopy)) parent-buckets)))
-	  ))
-       ((eq (semantic-token-token (car tokens)) 'type)
-	;; Types need to be rebuilt from scratch so we can add in new
-	;; children to the child list.  Only the top-level cons
-	;; cells need to be duplicated so we can hack out the
-	;; child list later.
-	(setq out (cons (copy-sequence (car tokens)) out))
-	(setq decent-list (cons (car out) decent-list))
-	)
-       (t
-	;; Otherwise, append this token to our new output list.
-	(setq out (cons (car tokens) out)))
-       )
-      (setq tokens (cdr tokens)))
-    ;; Rescan out, by decending into all types and finding parents
-    ;; for all entries moved into the parent-buckets.
-    (while decent-list
-      (let* ((bucket (assoc (semantic-token-name (car decent-list))
-			    parent-buckets))
-	     (bucketkids (cdr bucket))
-	     (partcdr (nthcdr 3 (car decent-list))))
-	(when bucket
-	  ;; Run our secondary marking function on the children
-	  (if semantic-mark-external-member-function
-	      (setq bucketkids
-		    (mapcar (lambda (tok)
-			      (funcall semantic-mark-external-member-function
-				       tok (car decent-list)))
-			    bucketkids)))
-	  ;; We have some extra kids.  Merge.
-	  (setcar partcdr (append (car partcdr) bucketkids))
-	  ;; Nuke the bucket label so it is not found again.
-	  (setcar bucket nil))
-	(setq decent-list
-	      (append (cdr decent-list)
-		      ;; get embedded types to scan and make copies
-		      ;; of them.
-		      (mapcar
-		       (lambda (tok) (copy-sequence tok))
-		       (semantic-find-nonterminal-by-token 'type
-			(semantic-token-type-parts (car decent-list)))))
-	      )))
-    ;; Scan over all remaining lost external methods, and tack them
-    ;; onto the end.
-    (while parent-buckets
-      (if (car (car parent-buckets))
-	  (let* ((tmp (car parent-buckets))
-		 (fauxtok (list (car tmp) 'type
-				semantic-orphaned-member-metaparent-type
-				nil ;; Part list
-				nil ;; parents (unknow)
-				nil ;; extra spec
-				nil ;; doc
-				'((faux . t)) ;; proprties
-				nil ;; overlay
-				))
-		 (partcdr (nthcdr 3 fauxtok))
-		 (bucketkids (cdr tmp)))
-	    (if semantic-mark-external-member-function
-		(setq bucketkids
-		      (mapcar (lambda (tok)
-				(funcall semantic-mark-external-member-function
-					 tok fauxtok))
-			      bucketkids)))
-	    (setcar partcdr bucketkids)
-	    ;; We have a bunch of methods with no parent in this file.
-	    ;; Create a meta-type to hold it.
-	    (setq out (cons fauxtok out))
-	    ))
-      (setq parent-buckets (cdr parent-buckets)))
-    ;; Return the new list.
-    (nreverse out)))
-
-;; Some sorting functions
-(defun semantic-string-lessp-ci (s1 s2)
-  "Case insensitive version of `string-lessp'."
-  ;; Use downcase instead of upcase because an average name
-  ;; has more lower case characters.
-  (string-lessp (downcase s1) (downcase s2)))
-
-(defun semantic-sort-token-type (token)
-  "Return a type string for TOKEN guaranteed to be a string."
-  (let ((ty (semantic-token-type token)))
-    (cond ((stringp ty)
-	   ty)
-	  ((listp ty)
-	   (or (car ty) ""))
-	  (t ""))))
-
-(defun semantic-sort-tokens-by-name-increasing (tokens)
-  "Sort TOKENS by name in increasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (string-lessp (semantic-token-name a)
-			       (semantic-token-name b)))))
-
-(defun semantic-sort-tokens-by-name-decreasing (tokens)
-  "Sort TOKENS by name in decreasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (string-lessp (semantic-token-name b)
-			       (semantic-token-name a)))))
-
-(defun semantic-sort-tokens-by-type-increasing (tokens)
-  "Sort TOKENS by type in increasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (string-lessp (semantic-sort-token-type a)
-			       (semantic-sort-token-type b)))))
-
-(defun semantic-sort-tokens-by-type-decreasing (tokens)
-  "Sort TOKENS by type in decreasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (string-lessp (semantic-sort-token-type b)
-			       (semantic-sort-token-type a)))))
-
-(defun semantic-sort-tokens-by-name-increasing-ci (tokens)
-  "Sort TOKENS by name in increasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (semantic-string-lessp-ci (semantic-token-name a)
-					   (semantic-token-name b)))))
-
-(defun semantic-sort-tokens-by-name-decreasing-ci (tokens)
-  "Sort TOKENS by name in decreasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (semantic-string-lessp-ci (semantic-token-name b)
-					   (semantic-token-name a)))))
-
-(defun semantic-sort-tokens-by-type-increasing-ci (tokens)
-  "Sort TOKENS by type in increasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (semantic-string-lessp-ci (semantic-sort-token-type a)
-					   (semantic-sort-token-type b)))))
-
-(defun semantic-sort-tokens-by-type-decreasing-ci (tokens)
-  "Sort TOKENS by type in decreasing order with side effects.
-Return the sorted list."
-  (sort tokens (lambda (a b)
-		 (semantic-string-lessp-ci (semantic-sort-token-type b)
-					   (semantic-sort-token-type a)))))
+(semantic-alias-obsolete 'semantic-something-to-stream
+			 'semantic-something-to-tag-table)
 
 ;;; Recursive searching through dependency trees
 ;;
 ;; but will add full recursion through the dependencies list per
 ;; stream.
 (defun semantic-recursive-find-nonterminal-by-name (name buffer)
-  "Recursivly find the first occurance of NAME.
+  "Recursively find the first occurrence of NAME.
 Start search with BUFFER.  Recurse through all dependencies till found.
 The return item is of the form (BUFFER TOKEN) where BUFFER is the buffer
-in which TOKEN (the token found to match NAME) was found."
+in which TOKEN (the token found to match NAME) was found.
+
+THIS ISN'T USED IN SEMANTIC.  DELETE ME SOON."
   (save-excursion
     (set-buffer buffer)
-    (let* ((stream (semantic-bovinate-toplevel))
-	   (includelist (or (semantic-find-nonterminal-by-token 'include stream)
+    (let* ((stream (semantic-fetch-tags))
+	   (includelist (or (semantic-find-tags-by-class 'include stream)
 			    "empty.silly.thing"))
-	   (found (semantic-find-nonterminal-by-name name stream))
+	   (found (semantic-find-first-tag-by-name name stream))
 	   (unfound nil))
       (while (and (not found) includelist)
-	(let ((fn (semantic-find-dependency (car includelist))))
+	(let ((fn (semantic-dependency-tag-file (car includelist))))
 	  (if (and fn (not (member fn unfound)))
 	      (save-excursion
 		(set-buffer (find-file-noselect fn))
 		(message "Scanning %s" (buffer-file-name))
-		(setq stream (semantic-bovinate-toplevel))
-		(setq found (semantic-find-nonterminal-by-name name stream))
+		(setq stream (semantic-fetch-tags))
+		(setq found (semantic-find-first-tag-by-name name stream))
 		(if found
 		    (setq found (cons (current-buffer) (list found)))
 		  (setq includelist
 			(append includelist
-				(semantic-find-nonterminal-by-token
+				(semantic-find-tags-by-class
 				 'include stream))))
 		(setq unfound (cons fn unfound)))))
 	(setq includelist (cdr includelist)))
       found)))
+(make-obsolete 'semantic-recursive-find-nonterminal-by-name
+	       "Do not use this function.")
   
 ;;; Completion APIs
 ;;
 FILTER is provides a filter on the types of things to complete.
 FILTER must be a function to call on each element."
   (if (not default) (setq default (thing-at-point 'symbol)))
-  (if (not stream) (setq stream (semantic-bovinate-toplevel)))
+  (if (not stream) (setq stream (semantic-fetch-tags)))
   (setq stream
 	(if filter
-	    (semantic-find-nonterminal-by-function filter stream)
-	  (semantic-find-nonterminal-standard stream)))
+	    (semantic--find-tags-by-function filter stream)
+	  (semantic-brute-find-tag-standard stream)))
   (if (and default (string-match ":" prompt))
       (setq prompt
 	    (concat (substring prompt 0 (match-end 0))
 from under point.
 STREAM is the list of tokens to complete from."
   (semantic-read-symbol
-   prompt default (semantic-find-nonterminal-by-type 'variable stream)))
+   prompt default
+   (or (semantic-find-tags-by-class
+	'variable (or stream (current-buffer)))
+       (error "No local variables"))))
 
 (defun semantic-read-function (prompt &optional default stream)
   "Read a function name from the user for the current buffer.
 Optional arguments:
 DEFAULT is the default choice.  If no default is given, one is read
 from under point.
-STREAM is the list of tokens to complete from."
+STREAM is the list of tags to complete from."
   (semantic-read-symbol
-   prompt default (semantic-find-nonterminal-by-type 'function stream)))
+   prompt default
+   (or (semantic-find-tags-by-class
+	'function (or stream (current-buffer)))
+       (error "No local functions"))))
 
 (defun semantic-read-type (prompt &optional default stream)
   "Read a type name from the user for the current buffer.
 Optional arguments:
 DEFAULT is the default choice.  If no default is given, one is read
 from under point.
-STREAM is the list of tokens to complete from."
+STREAM is the list of tags to complete from."
   (semantic-read-symbol
-   prompt default (semantic-find-nonterminal-by-type 'type stream)))
-
-;;; Behavioral APIs
-;;
-;; Each major mode will want to support a specific set of behaviors.
-;; Usually generic behaviors that need just a little bit of local
-;; specifics.  This section permits the setting of override functions
-;; for tasks of that nature, and also provides reasonable defaults.
-
-(defvar semantic-override-table nil
-  "Buffer local semantic function overrides obarray.
-These overrides provide a hook for a `major-mode' to override specific
-behaviors with respect to generated semantic toplevel nonterminals and
-things that these non-terminals are useful for.  Use the function
-`semantic-install-function-overrides' to install overrides.
-
-Available override symbols:
-
-  SYBMOL                  PARAMETERS         DESCRIPTION
- `abbreviate-nonterminal' (tok & parent color)        Return summary string.
- `summarize-nonterminal'  (tok & parent color)        Return summary string.
- `prototype-nonterminal'  (tok & parent color)        Return a prototype string.
- `concise-prototype-nonterminal' (tok & parent color) Return a concise prototype string.
- `uml-abbreviate-nonterminal' (tok & parent color)    Return a UML standard abbreviation string.
- `uml-prototype-nonterminal' (tok & parent color)     Return a UML like prototype string.
- `uml-concise-prototype-nonterminal' (tok & parent color)     Return a UML like concise prototype string.
-
- `find-dependency'        (token)            Find the dependency file
- `find-nonterminal'       (token & parent)   Find token in buffer.
- `find-documentation'     (token & nosnarf)  Find doc comments.
- `prototype-file'         (buffer)           Return a file in which
- 	                                     prototypes are placed
- `nonterminal-children'   (token)            Return first rate children.
-					     These are children which may
-					     contain overlays.
- `nonterminal-protection' (token & parent)   Protection (as a symbol)
-
-  CONTEXT FUNCTIONS:
- `beginning-of-context'   (& point)          Move to the beginning of the
-					     current context.
- `end-of-context'         (& point)          Move to the end of the
-					     current context.
- `up-context'             (& point)          Move up one context level.
- `get-local-variables'    (& point)          Get local variables.
- `get-all-local-variables'(& point)          Get all local variables.
- `get-local-arguments'    (& point)          Get arguments to this function.
-
- `end-of-command'                            Move to the end of the current
-                                             command
- `beginning-of-command'                      Move to the beginning of the
-                                             current command
- `ctxt-current-symbol'    (& point)          List of related symbols.
- `ctxt-current-assignment'(& point)          Variable being assigned to.
- `ctxt-current-function'  (& point)          Function being called at point.
- `ctxt-current-argument'  (& point)          The index to the argument of
-                                             the current function the cursor
-                                             is in.
-
-Parameters mean:
-
-  &      - Following parameters are optional
-  buffer - The buffer in which a token was found.
-  token  - The nonterminal token we are doing stuff with
-  parent - If a TOKEN is stripped (of positional infomration) then
-           this will be the parent token which should have positional
-           information in it.")
-(make-variable-buffer-local 'semantic-override-table)
-
-(defun semantic-install-function-overrides (overrides &optional transient)
-  "Install function OVERRIDES in `semantic-override-table'.
-If optional TRANSIENT is non-nil installed overrides can in turn be
-overridden by next installation.  OVERRIDES must be an alist.  Each
-element must be of the form: (SYM . FUN) where SYM is the symbol to
-override, and FUN is the function to override it with."
-  (if (not (arrayp semantic-override-table))
-      (setq semantic-override-table (make-vector 13 nil)))
-  (let (sym sym-name fun override)
-    (while overrides
-      (setq override  (car overrides)
-            overrides (cdr overrides)
-            sym-name  (symbol-name (car override))
-            fun       (cdr override))
-      (if (setq sym (intern-soft sym-name semantic-override-table))
-          (if (get sym 'override)
-              (set sym fun)
-            (or (equal (symbol-value sym) fun)
-                (message "Current `%s' function #'%s not overrode by #'%s"
-                         sym (symbol-value sym) fun)))
-        (setq sym (intern sym-name semantic-override-table))
-        (set sym fun))
-      (put sym 'override transient))))
-
-(defun semantic-fetch-overload (sym)
-  "Find and return the overload function for SYM.
-Return nil if not found."
-  (symbol-value
-   (and (arrayp semantic-override-table)
-        (intern-soft (symbol-name sym) semantic-override-table))))
-
-;;; Token to text overload functions
-;;
-;; Abbreviations, prototypes, and coloring support.
-(eval-when-compile (require 'font-lock))
-
-(defvar semantic-token->text-functions
-  '(semantic-name-nonterminal
-    semantic-abbreviate-nonterminal
-    semantic-summarize-nonterminal
-    semantic-prototype-nonterminal
-    semantic-concise-prototype-nonterminal
-    semantic-uml-abbreviate-nonterminal
-    semantic-uml-prototype-nonterminal
-    semantic-uml-concise-prototype-nonterminal
-    semantic-prin1-nonterminal
-    )
-  "List of functions which convert a token to text.
-Each function must take the parameters TOKEN &optional PARENT COLOR.
-TOKEN is the token to convert.
-PARENT is a parent token or name which refers to the structure
-or class which contains TOKEN.  PARENT is NOT a class which a TOKEN
-would claim as a parent.
-COLOR indicates that the generated text should be colored using
-`font-lock'.")
-
-(defvar semantic-token->text-custom-list
-  (append '(radio)
-	  (mapcar (lambda (f) (list 'const f))
-		  semantic-token->text-functions)
-	  '(function))
-  "A List used by customizeable variables to choose a token to text function.
-Use this variable in the :type field of a customizable variable.")
-
-(defvar semantic-function-argument-separator ","
-  "Text used to separate arguments when creating text from tokens.")
-(make-variable-buffer-local 'semantic-function-argument-separator)
-
-(defun semantic-test-all-token->text-functions ()
-  "Test all outputs from `semantic-token->text-functions'.
-Output is generated from the function under `point'."
-  (interactive)
-  (semantic-bovinate-toplevel t)
-  (let* ((tok (semantic-current-nonterminal))
-	 (par (or (semantic-current-nonterminal-parent)
-		  (if (semantic-token-function-parent tok)
-		      (semantic-find-nonterminal-by-name
-		       (semantic-token-function-parent tok)
-		       (current-buffer)))
-		  ))
-	 (fns semantic-token->text-functions))
-    (with-output-to-temp-buffer "*Token->text*"
-      (princ "Token->text function tests:")
-      (while fns
-	(princ "\n")
-	(princ (car fns))
-	(princ ":\n ")
-	(let ((s (funcall (car fns) tok par t)))
-	  (save-excursion
-	    (set-buffer "*Token->text*")
-	    (goto-char (point-max))
-	    (insert s)))
-	(setq fns (cdr fns))))
-      ))
-
-(defvar semantic-face-alist
-  `( (function . font-lock-function-name-face)
-     (variable . font-lock-variable-name-face)
-     (type . font-lock-type-face)
-     ;; These are different between Emacsen.
-     (include . ,(if (featurep 'xemacs)
-		     'font-lock-preprocessor-face
-		   'font-lock-constant-face))
-     (package . ,(if (featurep 'xemacs)
-		     'font-lock-preprocessor-face
-		   'font-lock-constant-face))
-     ;; Not a token, but instead a feature of output
-     (label . font-lock-string-face)
-     (comment . font-lock-comment-face)
-     (keyword . font-lock-keyword-face)
-     (abstract . italic)
-     (static . underline)
-     )
-  "Face used to colorize tokens of different types.
-Override the value locally if a language supports other token types.
-When adding new elements, try to use symbols also returned by the parser.
-The form of an entry in this list is of the form:
- ( SYMBOL .  FACE )
-where SYMBOL is a token type symbol used with semantic.  FACE
-is a symbol representing a face.
-Faces used are generated in `font-lock' for consistency, and will not
-be used unless font lock is a feature.")
-
-;;; Coloring Functions
-(defun semantic-colorize-text (text face-class)
-  "Apply onto TEXT a color associated with FACE-CLASS.
-FACE-CLASS is a token type found in `semantic-face-alist'.  See this variable
-for details on adding new types."
-  (let ((face (cdr-safe (assoc face-class semantic-face-alist)))
-	(newtext (concat text)))
-    (put-text-property 0 (length text) 'face face newtext)
-    newtext)
-  )
-
-(defun semantic-colorize-merge-text (precoloredtext face-class)
-  "Apply onto PRECOLOREDTEXT a color associated with FACE-CLASS.
-FACE-CLASS is a token type found in 'semantic-face-alist'.  See this
-variable for details on adding new types."
-  (let ((face (cdr-safe (assoc face-class semantic-face-alist)))
-	(newtext (concat precoloredtext))
-	)
-    (if (featurep 'xemacs)
-	(add-text-properties 0 (length newtext) (list 'face face) newtext)
-      (alter-text-property 0 (length newtext) 'face
-			   (lambda (current-face)
-			     (let ((cf
-				    (cond ((facep current-face)
-					   (list current-face))
-					  ((listp current-face)
-					   current-face)
-					  (t nil)))
-				   (nf
-				    (cond ((facep face)
-					   (list face))
-					  ((listp face)
-					   face)
-					  (t nil))))
-			       (append cf nf)))
-			   newtext))
-    newtext))
-
-;;; The token->text functions
-(defun semantic-prin1-nonterminal (token &optional parent color)
-  "Convert TOKEN to a string that is Emacs Lisp.
-PARENT and COLOR are ignored."
-  (format "%S" token))
-
-(defun semantic-name-nonterminal (token &optional parent color)
-  "Return the name string describing TOKEN.
-The name is the shortest possible representation.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'name-nonterminal)))
-    ;; No colors without font lock
-    (if (not (featurep 'font-lock)) (setq color nil))
-    (if s
-	(funcall s token parent color)
-      (semantic-name-nonterminal-default token parent color))))
-
-(defun semantic-name-nonterminal-default (token &optional parent color)
-  "Return an abbreviated string describing TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((name (semantic-token-name token))
-	(destructor
-	 (if (eq (semantic-token-token token) 'function)
-	     (semantic-token-function-destructor token))))
-    (when destructor
-      (setq name (concat "~" name)))
-    (if color
-	(setq name (semantic-colorize-text name (semantic-token-token token))))
-    name))
-
-(defun semantic-abbreviate-nonterminal (token &optional parent color)
-  "Return an abbreviated string describing TOKEN.
-The abbreviation is to be short, with possible symbols indicating
-the type of token, or other information.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'abbreviate-nonterminal)))
-    ;; No colors without font lock
-    (if (not (featurep 'font-lock)) (setq color nil))
-    (if s
-	(funcall s token parent color)
-      (semantic-abbreviate-nonterminal-default token parent color))))
-
-(defun semantic-abbreviate-nonterminal-default (token &optional parent color)
-  "Return an abbreviated string describing TOKEN.
-Optional argument PARENT is a parent token in the token hierarchy.
-In this case PARENT refers to containment, not inheritance.
-Optional argument COLOR means highlight the prototype with font-lock colors.
-This is a simple C like default."
-  ;; Do lots of complex stuff here.
-  (let ((tok (semantic-token-token token))
-	(name (semantic-name-nonterminal token parent color))
-	(suffix "")
-	str)
-    (cond ((eq tok 'function)
-	   (setq suffix "()"))
-	  ((eq tok 'include)
-	   (setq suffix "<>"))
-	  ((eq tok 'variable)
-	   (setq suffix (if (semantic-token-variable-default token)
-			    "=" "")))
-	  )
-    (setq str (concat name suffix))
-    (if parent
-	(setq str
-	      (concat (semantic-name-nonterminal parent color)
-		      (car semantic-type-relation-separator-character)
-		      str)))
-    str))
-
-;; Semantic 1.2.x had this misspelling.  Keep it for backwards compatibiity.
-(defalias 'semantic-summerize-nonterminal 'semantic-summarize-nonterminal)
-
-(defun semantic-summarize-nonterminal (token &optional parent color)
-  "Summarize TOKEN in a reasonable way.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'summarize-nonterminal)))
-    ;; No colors without font lock
-    (if (not (featurep 'font-lock)) (setq color nil))
-    (if s
-	(funcall s token parent color)
-      (semantic-summarize-nonterminal-default token parent color)
-      )))
-
-(defun semantic-summarize-nonterminal-default (token &optional parent color)
-  "Summarize TOKEN in a reasonable way.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let* ((proto (semantic-prototype-nonterminal token nil color))
-         (names (if parent
-                    semantic-symbol->name-assoc-list-for-type-parts
-                  semantic-symbol->name-assoc-list))
-         (tsymb (funcall semantic-bucketize-token-token token))
-         (label (capitalize (or (cdr-safe (assoc tsymb names))
-                                (symbol-name tsymb)))))
-    (if color
-        (setq label (semantic-colorize-text label 'label)))
-    (concat label ": " proto)))
-
-(defun semantic-prototype-nonterminal (token &optional parent color)
-  "Return a prototype for TOKEN.
-This function should be overloaded, though it need not be used.
-This is because it can be used to create code by language independent
-tools.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'prototype-nonterminal)))
-    ;; No colors without font lock
-    (if (not (featurep 'font-lock)) (setq color nil))
-    (if s
-	;; Prototype is non-local
-	(funcall s token parent color)
-      (semantic-prototype-nonterminal-default token parent color))))
-
-(defun semantic-prototype-nonterminal-default-args (args color)
-  "Create a list of of strings for prototypes of ARGS.
-ARGS can be a list of terminals, or a list of strings.
-COLOR specifies if these arguments should be colored or not."
-  (let ((out nil))
-    (while args
-      (cond ((stringp (car args))
-	     (let ((a (car args)))
-	       (if color
-		   (setq a (semantic-colorize-text a 'variable)))
-	       (setq out (cons a out))
-	       ))
-	    ((semantic-token-p (car args))
-	     (setq out
-		   (cons (semantic-prototype-nonterminal (car args) nil t)
-			 out))))
-      (setq args (cdr args)))
-    (nreverse out)))
-
-(defun semantic-prototype-nonterminal-default (token &optional parent color)
-  "Default method for returning a prototype for TOKEN.
-This will work for C like languages.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let* ((tok (semantic-token-token token))
-	 (name (semantic-name-nonterminal token parent color))
-	 (type (if (member tok '(function variable type))
-		   (semantic-token-type token)))
-	 (args (semantic-prototype-nonterminal-default-args
-		(cond ((eq tok 'function)
-		       (semantic-token-function-args token))
-		      ((eq tok 'type)
-		       (semantic-token-type-parts token))
-		      (t nil))
-		color))
-	 (const (semantic-token-extra-spec token 'const))
-	 (mods (append
-		(if const '("const") nil)
-		(semantic-token-extra-spec token 'typemodifiers)))
-	 (array (if (eq tok 'variable)
-		    (let ((deref
-			   (semantic-token-variable-extra-spec
-			    token 'dereference))
-			  (r ""))
-		      (while (and deref (/= deref 0))
-			(setq r (concat r "[]")
-			      deref (1- deref)))
-		      r)))
-	 (point (semantic-token-extra-spec token 'pointer))
-	 (ref (semantic-token-extra-spec token 'reference))
-	 )
-    (if (and (listp mods) mods)
-	(setq mods (concat (mapconcat (lambda (a) a) mods " ") " ")))
-    (if (and mods color)
-	(setq mods (semantic-colorize-text mods 'type)))
-    (if ref (setq ref "&"))		; only 1 reference?
-    (if point (setq point (make-string point ?*)) "")
-    (if args
-	(setq args
-	      (concat " "
-		      (if (eq tok 'type) "{" "(")
-		      (mapconcat (lambda (a) a) args
-				 semantic-function-argument-separator)
-		      (if (eq tok 'type) "}" ")"))))
-    (if type
-	(if (semantic-token-p type)
-	    (setq type (semantic-prototype-nonterminal type nil color))
-	  (if (listp type)
-	      (setq type (car type)))
-	  (if color
-	      (setq type (semantic-colorize-text type 'type)))))
-    (concat (or mods "")
-	    (if type (concat type " "))
-	    point ref			;there should be only 1.
-	    name
-	    (or args "")
-	    (or array ""))))
-
-(defun semantic-concise-prototype-nonterminal (token &optional parent color)
-  "Return a concise prototype for TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'concise-prototype-nonterminal)))
-    (if s
-	(funcall s token parent color)
-      (semantic-concise-prototype-nonterminal-default token parent color))))
-
-(defun semantic-concise-prototype-nonterminal-default (token &optional parent color)
-  "Return a concise prototype for TOKEN.
-This default function will make a cheap concise prototype using C like syntax.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((tok (semantic-token-token token)))
-    (cond
-     ((eq tok 'type)
-      (concat (semantic-name-nonterminal token parent color) "{}"))
-     ((eq tok 'function)
-      (let ((args (semantic-token-function-args token)))
-        (concat (semantic-name-nonterminal token parent color)
-                " ("
-                (if args
-                    (cond ((stringp (car args))
-			   (mapconcat
-			    (if color
-				(lambda (a) (semantic-colorize-text
-					     a 'variable))
-			      'identity)
-			    args semantic-function-argument-separator))
-			  ((semantic-token-p (car args))
-			   (mapconcat
-			    (lambda (a)
-			      (let ((ty (semantic-token-type a)))
-				(cond ((and (stringp ty) color)
-				       (semantic-colorize-text ty 'type))
-				      ((stringp ty)
-				       ty)
-				      ((semantic-token-p ty)
-				       (semantic-prototype-nonterminal
-					ty parent nil))
-				      ((and (consp ty) color)
-				       (semantic-colorize-text (car ty) 'type))
-				      ((consp ty)
-				       (car ty))
-				      (t (error "Concice-prototype")))))
-			    args semantic-function-argument-separator))
-			  ((consp (car args))
-			   (mapconcat
-			    (if color
-				(lambda (a)
-				  (semantic-colorize-text (car a) 'type))
-			      'car)
-			    args semantic-function-argument-separator))
-			  (t (error "Concice-prototype")))
-                  "")
-                ")")))
-     ((eq tok 'variable)
-      (let* ((deref (semantic-token-variable-extra-spec
-                     token 'dereference))
-             (array "")
-             )
-        (while (and deref (/= deref 0))
-          (setq array (concat array "[]")
-                deref (1- deref)))
-        (concat (semantic-name-nonterminal token parent color)
-                array)))
-     (t
-      (semantic-abbreviate-nonterminal token parent color)))))
-
-(defcustom semantic-uml-colon-string " : "
-  "*String used as a color separator between parts of a UML string.
-In UML, a variable may appear as `varname : type'.
-Change this variable to change the output separator."
-  :group 'semantic
-  :type 'string)
-
-(defcustom semantic-uml-no-protection-string ""
-  "*String used to describe when no protection is specified.
-Used by `semantic-uml-protection-to-string'."
-  :group 'semantic
-  :type 'string)
-
-(defun semantic-uml-post-colorize (text token parent)
-  "Add color to TEXT created from TOKEN and PARENT.
-Adds augmentation for `abstract' and `static' entries."
-  (if (semantic-nonterminal-abstract token parent)
-      (setq text (semantic-colorize-merge-text text 'abstract)))
-  (if (semantic-nonterminal-static token parent)
-      (setq text (semantic-colorize-merge-text text 'static)))
-  text
-  )
-
-(defun semantic-uml-attribute-string (token &optional parent)
-  "Return a string for TOKEN, a child of PARENT representing a UML attribute.
-UML attribute strings are things like {abstract} or {leaf}."
-  (cond ((semantic-nonterminal-abstract token parent)
-	 "{abstract}")
-	((semantic-nonterminal-leaf token parent)
-	 "{leaf}")
-	))
-
-(defun semantic-uml-protection-to-string (protection-symbol)
-  "Convert PROTECTION-SYMBOL to a string for UML.
-Default character returns are:
-  public    -- +
-  private   -- -
-  protected -- #.
-If PROTECTION-SYMBOL is unknown, then the return value is
-`semantic-uml-no-protection-string'."
-  (cond ((eq protection-symbol 'public)
-	 "+")
-	((eq protection-symbol 'private)
-	 "-")
-	((eq protection-symbol 'protected)
-	 "#")
-	(t semantic-uml-no-protection-string)))
-
-(defun semantic-uml-token-or-string-to-string (token-or-string parent &optional args color)
-  "Return a string representing the TOKEN-OR-STRING.
-If TOKEN-OR-STRING is a token, create a UML like text output for it.
-If TOKEN-OR-STRING is a string, just use that string as a variable.
-PARENT is a token representing the parent of TOKEN-OR-STRING.
-Append ARGS as a precolored string after the new text.
-Colorize the new text based on COLOR."
-  (cond ((stringp token-or-string)
-	 (if color
-	     (setq token-or-string
-		   (semantic-colorize-text token-or-string 'variable)))
-	 (concat token-or-string (or args "")))
-	((semantic-token-p token-or-string)
-	 (let ((name (semantic-name-nonterminal token-or-string parent color))
-	       (type  (semantic-token-type token-or-string))
-	       (point (semantic-token-extra-spec token-or-string 'pointer))
-	       (ref (semantic-token-extra-spec token-or-string 'reference))
-	       )
-	   (if ref (setq ref "&"))	; only 1 reference?
-	   (if point (setq point (make-string point ?*)) "")
-	   (setq type
-		 (cond ((semantic-token-p type)
-			(semantic-prototype-nonterminal type nil color))
-		       ((and (listp type)
-			     (stringp (car type)))
-			(car type))
-		       ((stringp type)
-			type)
-		       (t nil)))
-	   (if (and type color)
-	       (setq type (semantic-colorize-text type 'type)))
-	   (setq name (concat name (or args "")))
-	   (if type (concat name
-			    semantic-uml-colon-string
-			    type ref point)
-	     name)))
-	(t "")))
-
-(defmacro semantic-uml-nonterminal-protection (token &optional parent)
-  "Return protection information about TOKEN with optional PARENT.
-Check that TOKEN is a variable, function or type token.
-See also `semantic-nonterminal-protection'."
-  `(and (memq (semantic-token-token ,token)
-              '(variable function type))
-        (semantic-nonterminal-protection ,token ,parent)))
-
-(defun semantic-uml-abbreviate-nonterminal (token &optional parent color)
-  "Return a UML style abbreviation for TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'uml-abbreviate-nonterminal)))
-    (if s
-	(funcall s token parent color)
-      (semantic-uml-abbreviate-nonterminal-default token parent color))))
-
-(defun semantic-uml-abbreviate-nonterminal-default (token &optional parent color)
-  "Return a UML style abbreviation for TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let* ((text (semantic-uml-token-or-string-to-string
-		token parent nil color))
-	 (prot (semantic-uml-nonterminal-protection token parent))
-	 (protstr (semantic-uml-protection-to-string prot))
-	 (text (concat protstr text)))
-    (if color
-	(setq text (semantic-uml-post-colorize text token parent)))
-    text))
-
-(defun semantic-uml-arguments-to-string (arguments color)
-  "Convert ARGUMENTS to a string.
-ARGUMENTS is a list as returned by semantic for an argument list.
-Each element can be a s tring, or a psuedotoken (a token without
-positional elements.
-COLOR indicates if the string should be colorized."
-  (concat " ("
-	  (mapconcat (lambda (a)
-		       (semantic-uml-token-or-string-to-string
-			a nil nil color))
-		     arguments
-		     semantic-function-argument-separator)
-	  ")"))
-
-(defun semantic-uml-prototype-nonterminal (token &optional parent color)
-  "Return a UML style prototype for TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'uml-prototype-nonterminal)))
-    (if s
-	(funcall s token parent color)
-      (semantic-uml-prototype-nonterminal-default token parent color))))
-
-(defun semantic-uml-prototype-nonterminal-default (token &optional parent color)
-  "Return a UML style prototype for TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let* ((tok (semantic-token-token token))
-	 (argtext nil)
-	 (prot (semantic-uml-nonterminal-protection token parent))
-	 (text nil)
-	 )
-    (cond ((eq tok 'function)
-	   (setq argtext (semantic-uml-arguments-to-string
-			  (semantic-token-function-args token)
-			  color)))
-	  ((eq tok 'type)
-	   (setq argtext "{}")))
-    (setq prot (semantic-uml-protection-to-string prot))
-    (setq text (concat prot
-		       (semantic-uml-token-or-string-to-string
-			token parent argtext color)))
-    (if color
-	(setq text (semantic-uml-post-colorize text token parent)))
-    text
-    ))
-
-(defun semantic-uml-concise-prototype-nonterminal (token &optional parent color)
-  "Return a UML style concise prototype for TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let ((s (semantic-fetch-overload 'uml-concise-prototype-nonterminal)))
-    (if s
-	(funcall s token parent color)
-      (semantic-uml-concise-prototype-nonterminal-default token parent color))))
-
-(defun semantic-uml-concise-prototype-nonterminal-default (token &optional parent color)
-  "Return a UML style concise prototype for TOKEN.
-Optional argument PARENT is the parent type if TOKEN is a detail.
-Optional argument COLOR means highlight the prototype with font-lock colors."
-  (let* ((cp (semantic-concise-prototype-nonterminal token parent color))
-	 (type (semantic-token-type token))
-	 (prot (semantic-uml-nonterminal-protection token parent))
-	 (text nil)
-	 )
-    (setq type
-	  (cond ((semantic-token-p type)
-		 (semantic-prototype-nonterminal type nil color))
-		((listp type)
-		 (car type))
-		((stringp type)
-		 type)
-		(t nil)))
-    (setq prot (semantic-uml-protection-to-string prot))
-    (setq text
-	  (concat prot cp
-		  (if type
-		      (progn
-			(setq type (semantic-colorize-text type 'type))
-			(concat semantic-uml-colon-string type)))))
-    (if color
-	(setq text (semantic-uml-post-colorize text token parent)))
-    text
-    ))
-
-;;; Multi-file Token information
-;;
-(defvar semantic-dependency-include-path nil
-  "Defines the include path used when searching for files.
-This should be a list of directories to search which is specific to
-the file being included.
-This variable can also be set to a single function.  If it is a
-function, it will be called with one arguments, the file to find as a
-string, and  it should return the full path to that file, or nil.")
-(make-variable-buffer-local `semantic-dependency-include-path)
-
-(defun semantic-find-dependency (&optional token)
-  "Find the filename represented from TOKEN.
-TOKEN may be a stripped element, in which case PARENT specifies a
-parent token that has positinal information.
-Depends on `semantic-dependency-include-path' for searching.  Always searches
-`.' first, then searches additional paths."
-  (if (not token)
-      (setq token (car (semantic-find-nonterminal-by-overlay nil))))
-
-  (if (not (eq (semantic-token-token token) 'include))
-      (signal 'wrong-type-argument (list token 'include)))
-
-  ;; First, see if this file exists in the current EDE projecy
-  (if (and (fboundp 'ede-expand-filename) ede-minor-mode
-	   (ede-expand-filename (ede-toplevel)
-				(semantic-token-name token)))
-      (ede-expand-filename (ede-toplevel)
-			   (semantic-token-name token))
-  
-    (let ((s (semantic-fetch-overload 'find-dependency)))
-      (if s (funcall s token)
-	(save-excursion
-	  (set-buffer (semantic-token-buffer token))
-	  (let ((name (semantic-token-name token)))
-	    (cond ((file-exists-p name)
-		   (expand-file-name name))
-		  ((and (symbolp semantic-dependency-include-path)
-			(fboundp semantic-dependency-include-path))
-		   (funcall semantic-dependency-include-path name))
-		  (t
-		   (let ((p semantic-dependency-include-path)
-			 (found nil))
-		     (while (and p (not found))
-		       (if (file-exists-p (concat (car p) "/" name))
-			   (setq found (concat (car p) "/" name)))
-		       (setq p (cdr p)))
-		     found)))))))))
-
-(defun semantic-find-nonterminal (&optional token parent)
-  "Find the location of TOKEN.
-TOKEN may be a stripped element, in which case PARENT specifies a
-parent token that has position information.
-Different behaviors are provided depending on the type of token.
-For example, dependencies (includes) will seek out the file that is
-depended on, and functions will move to the specified definition."
-  (if (not token)
-      (setq token (car (semantic-find-nonterminal-by-overlay nil))))
-  (if (and (eq (semantic-token-token token) 'include)
-	   (let ((f (semantic-find-dependency token)))
-	     (if f (find-file f))))
-      nil
-    (let ((s (semantic-fetch-overload 'find-nonterminal)))
-      (if s (funcall s token parent)
-	(if (semantic-token-buffer token)
-	    ;; If the token has no buffer, it may be deoverlayed.
-	    ;; Assume the tool doing the finding knows that we came
-	    ;; in from a database, and use the current buffer.
-	    (set-buffer (semantic-token-buffer token)))
-	(if (semantic-token-with-position-p token)
-	    ;; If it's a number, go there
-	    (goto-char (semantic-token-start token))
-	  ;; Otherwise, it's a trimmed vector, such as a parameter,
-	  ;; or a structure part.
-	  (if (not parent)
-	      nil
-	    (if (semantic-token-with-position-p parent)
-		(progn
-		  (if (semantic-token-buffer parent)
-		      ;; If this parent token has no buffer, then it
-		      ;; may be deoverlayed.
-		      (set-buffer (semantic-token-buffer parent)))
-		  (goto-char (semantic-token-start parent))
-		  ;; Here we make an assumtion that the text returned by
-		  ;; the bovinator and concocted by us actually exists
-		  ;; in the buffer.
-		  (re-search-forward (semantic-token-name token) nil t)))))))))
-
-(defun semantic-find-documentation (&optional token nosnarf)
-  "Find documentation from TOKEN and return it as a clean string.
-TOKEN might have DOCUMENTATION set in it already.  If not, there may be
-some documentation in a comment preceeding TOKEN's definition which we
-cal look for.  When appropriate, this can be overridden by a language specific
-enhancement.
-Optional argument NOSNARF means to only return the flex token for it.
-If nosnarf if 'flex, then only return the flex token."
-  (if (not token)
-      (setq token (car (semantic-find-nonterminal-by-overlay nil))))
-  (let ((s (semantic-fetch-overload 'find-documentation)))
-    (if s (funcall s token nosnarf)
-      ;; No override.  Try something simple to find documentation nearby
-      (save-excursion
-	(set-buffer (semantic-token-buffer token))
-	(semantic-find-nonterminal token)
-	(or
-	 ;; Is there doc in the token???
-	 (if (semantic-token-docstring token)
-	     (if (stringp (semantic-token-docstring token))
-		 (semantic-token-docstring token)
-	       (goto-char (semantic-token-docstring token))
-	       (semantic-find-doc-snarf-comment nosnarf)))
-	 ;; Check just before the definition.
-	 (save-excursion
-	   (re-search-backward comment-start-skip nil t)
-	   (if (not (semantic-find-nonterminal-by-position
-		     (point) (current-buffer) t))
-	       ;; We found a comment that doesn't belong to the body
-	       ;; of a function.
-	       (semantic-find-doc-snarf-comment nosnarf)))
-	 ;;  Lets look for comments either after the definition, but before code:
-	 ;; Not sure yet.  Fill in something clever later....
-	 nil
-	 )))))
-
-(defun semantic-find-doc-snarf-comment (nosnarf)
-  "Snarf up the comment at POINT for `semantic-find-documentation'.
-Attempt to strip out comment syntactic sugar.
-Argument NOSNARF means don't modify the found text.
-If NOSNARF is 'flex, then return the flex token."
-  (let ((semantic-ignore-comments nil))
-    (if (eq nosnarf 'flex)
-	(car (semantic-flex (point) (1+ (point))))
-      (let ((ct (semantic-flex-text
-		 (car (semantic-flex (point) (1+ (point)))))))
-	(if nosnarf
-	    nil
-	  ;; ok, try to clean the text up.
-	  ;; Comment start thingy
-	  (while (string-match (concat "^\\s-*" comment-start-skip) ct)
-	    (setq ct (concat (substring ct 0 (match-beginning 0))
-			     (substring ct (match-end 0)))))
-	  ;; Arbitrary punctuation at the beginning of each line.
-	  (while (string-match "^\\s-*\\s.+\\s-*" ct)
-	    (setq ct (concat (substring ct 0 (match-beginning 0))
-			     (substring ct (match-end 0)))))
-	  ;; End of a block comment.
-	  (if (and block-comment-end (string-match block-comment-end ct))
-	      (setq ct (concat (substring ct 0 (match-beginning 0))
-			       (substring ct (match-end 0)))))
-	  ;; In case it's a real string, STRIPIT.
-	  (while (string-match "\\s-*\\s\"+\\s-*" ct)
-	    (setq ct (concat (substring ct 0 (match-beginning 0))
-			     (substring ct (match-end 0))))))
-	;; Now return the text.
-	ct))))
-
-(defun semantic-prototype-file (buffer)
-  "Return a file in which prototypes belonging to BUFFER should be placed.
-Default behavior (if not overriden) looks for a token specifying the
-prototype file, or the existence of an EDE variable indicating which
-file prototypes belong in."
-  (let ((s (semantic-fetch-overload 'prototype-file)))
-    (if s
-	(funcall s buffer)
-      ;; Else, perform some default behaviors
-      (if (and (fboundp 'ede-header-file) ede-minor-mode)
-	  (save-excursion
-	    (set-buffer buffer)
-	    (ede-header-file))
-	;; No EDE options for a quick answer.  Search.
-	(save-excursion
-	  (set-buffer buffer)
-	  (if (re-search-forward "::Header:: \\([a-zA-Z0-9.]+\\)" nil t)
-	      (match-string 1)))))))
+   prompt default
+   (or (semantic-find-tags-by-class
+	'type (or stream (current-buffer)))
+       (error "No local types"))))
 
 
 ;;;; Mode-specific Token information
 ;;
-(defun semantic-nonterminal-children (token &optional positionalonly)
-  "Return the list of top level children belonging to TOKEN.
-Children are any sub-tokens which may contain overlays.
-The default behavior (if not overriden with `nonterminal-children'
-is to return type parts for a type, and arguments for a function.
 
-If optional argument POSITIONALONLY is non-nil, then only return valid
-children if they contain positions.  Some languages may choose to create
-lists of children without position/overlay information.
 
-If this function is overriden, use `semantic-nonterminal-children-default'
-to also include the default behavior, and merely extend your own.
 
-Note for language authors:
-  If a mode defines a language that has tokens in it with overlays that
-should not be considered children, you should still return them with
-this function, otherwise saving cannot work."
-  (let* ((s (semantic-fetch-overload 'nonterminal-children))
-	 (chil (if s (funcall s token)
-		 (semantic-nonterminal-children-default token))))
-    (if positionalonly
-      (let ((newchil nil))
-	(while chil
-	  (if (semantic-token-with-position-p (car chil))
-	      (setq newchil (cons (car chil) newchil)))
-	  (setq chil (cdr chil)))
-	(nreverse newchil))
-      chil)))
-
-(defun semantic-nonterminal-children-default (token)
-  "Return the children of TOKEN.
-For types, return the type parts.
-For functions return the argument list."
-  (let ((explicit-children
-	 (cond ((eq (semantic-token-token token) 'type)
-		(semantic-token-type-parts token))
-	       ((eq (semantic-token-token token) 'function)
-		(semantic-token-function-args token))
-	       (t nil)))
-	(type (semantic-token-type token))
-	(anon-type-children nil))
-    ;; Identify if this token has an anonymous structure as
-    ;; its type.  This implies it may have children with overlays.
-    (if (and type
-	     (semantic-token-p type)
-	     (eq (semantic-token-token type) 'type))
-	(setq anon-type-children
-	      (semantic-nonterminal-children type)))
-    (if anon-type-children
-	(append explicit-children anon-type-children)
-      explicit-children)))
-
-(defun semantic-nonterminal-external-member-parent (token)
-  "Return a parent for TOKEN when TOKEN is an external member.
-TOKEN is an external member if it is defined at a toplevel and
-has some sort of label defing a parent.  The parent return will
-be a string.
-
-The default behavior, if not overriden with
-`nonterminal-external-member-parent' is get the 'parent extra
-specifier of TOKEN.
-
-If this function is overriden, use
-`semantic-nonterminal-external-member-parent-default' to also
-include the default behavior, and merely extend your own."
-  (let* ((s (semantic-fetch-overload 'nonterminal-external-member-parent)))
-    (if s (funcall s token)
-      (semantic-nonterminal-external-member-parent-default token))
-    ))
-
-(defun semantic-nonterminal-external-member-parent-default (token)
-  "Return the name of TOKENs parent iff TOKEN is not defined in it's parent."
-  ;; Use only the extra spec because a type has a parent which
-  ;; means something completely different.
-  (let ((tp (semantic-token-extra-spec token 'parent)))
-    (when (stringp tp)
-      tp)
-    ))
-
-(defun semantic-nonterminal-external-member-p (parent token)
-  "Return non-nil if PARENT is the parent of TOKEN.
-TOKEN is an external member of PARENT when it is somehow tagged
-as having PARENT as it's parent.
-
-The default behavior, if not overriden with
-`nonterminal-external-member-p' is to match 'parent extra specifier in
-the name of TOKEN.
-
-If this function is overriden, use
-`semantic-nonterminal-external-member-children-p-default' to also
-include the default behavior, and merely extend your own."
-  (let* ((s (semantic-fetch-overload 'nonterminal-external-member-p)))
-    (if s (funcall s parent token)
-      (semantic-nonterminal-external-member-p-default parent token))
-    ))
-
-(defun semantic-nonterminal-external-member-p-default (parent token)
-  "Return non-nil if PARENT is the parent of TOKEN."
-  ;; Use only the extra spec because a type has a parent which
-  ;; means something completely different.
-  (let ((tp (semantic-nonterminal-external-member-parent token)))
-    (and (stringp tp)
-	 (string= (semantic-token-name parent) tp))
-    ))
-
-(defun semantic-nonterminal-external-member-children (token &optional usedb)
-  "Return the list of children which are not *in* TOKEN.
-If optional argument USEDB is non-nil, then also search files in
-the Semantic Database.  If USEDB is a list of databases, search those
-databases.
-
-Children in this case are functions or types which are members of
-TOKEN, such as the parts of a type, but which are not defined inside
-the class.  C++ and CLOS both permit methods of a class to be defined
-outside the bounds of the class' definition.
-
-The default behavior, if not overriden with
-`nonterminal-external-member-children' is to search using
-`semantic-nonterminal-external-member-p' in all top level definitions
-with a parent of TOKEN.
-
-If this function is overriden, use
-`semantic-nonterminal-external-member-children-default' to also
-include the default behavior, and merely extend your own."
-  (let* ((s (semantic-fetch-overload 'nonterminal-external-member-children)))
-    (if s (funcall s token usedb)
-      (semantic-nonterminal-external-member-children-default token usedb))
-    ))
-
-(defun semantic-nonterminal-external-member-children-db (token usedb)
-  "Return the list of external children for TOKEN found in semanticdb.
-USEDB is the list of databases to use, or t.
-The return value is in semanticdb output format."
-  (semanticdb-find-nonterminal-by-function
-   `(lambda (stream sp si)
-      (semantic-find-nonterminal-by-function
-       (lambda (tok)
-	 (semantic-nonterminal-external-member-p
-	  ',token tok))
-       stream sp si))
-   (if (listp usedb) usedb) nil nil t))
-
-(defun semantic-nonterminal-external-member-children-default (token &optional usedb)
-  "Return list of external children for TOKEN.
-Optional argument USEDB specifies if the semantic database is used.
-See `semantic-nonterminal-external-member-children' for details."
-  (if (and usedb
-	   (fboundp 'semanticdb-minor-mode-p)
-	   (semanticdb-minor-mode-p))
-      (let ((m (semantic-nonterminal-external-member-children-db token usedb)))
-	(if m (apply #'append (mapcar #'cdr m))))
-    (semantic-find-nonterminal-by-function
-     `(lambda (tok)
-	;; This bit of annoying backquote forces the contents of
-	;; token into the generated lambda.
-       (semantic-nonterminal-external-member-p ',token tok))
-     (current-buffer) nil nil)
-    ))
-
-(defun semantic-nonterminal-protection (token &optional parent)
-  "Return protection information about TOKEN with optional PARENT.
-This function returns on of the following symbols:
-   nil        - No special protection.  Language dependent.
-   'public    - Anyone can access this TOKEN.
-   'private   - Only methods in the local scope can access TOKEN.
-   'protected - Like private for outside scopes, like public for child
-                classes.
-Some languages may choose to provide additional return symbols specific
-to themselves.  Use of this function should allow for this.
-
-The default behavior (if not overriden with `nonterminal-protection'
-is to return a symbol based on type modifiers."
-  (let* ((s (semantic-fetch-overload 'nonterminal-protection)))
-    (if s (funcall s token parent)
-      (semantic-nonterminal-protection-default token parent))))
-
-(defun semantic-nonterminal-protection-default (token &optional parent)
-  "Return the protection of TOKEN as a child of PARENT default action.
-See `semantic-nonterminal-protection'."
-  (let ((mods (semantic-token-modifiers token))
-	(prot nil))
-    (while (and (not prot) mods)
-      (if (stringp (car mods))
-	  (let ((s (car mods)))
-	    (setq prot
-		  ;; A few silly defaults to get things started.
-		  (cond ((or (string= s "public")
-			     (string= s "extern")
-			     (string= s "export"))
-			 'public)
-			((string= s "private")
-			 'private)
-			((string= s "protected")
-			 'protected)))))
-      (setq mods (cdr mods)))
-    prot))
-
-(defun semantic-nonterminal-abstract (token &optional parent)
-  "Return non nil if TOKEN is abstract.
-Optional PARENT is the parent token of TOKEN.
-In UML, abstract methods and classes have special meaning and behavior
-in how methods are overriden.  In UML, abstract methods are italicized.
-
-The default behavior (if not overriden with `nonterminal-abstract'
-is to return true if `abstract' is in the type modifiers."
-  (let* ((s (semantic-fetch-overload 'nonterminal-abstract)))
-    (if s (funcall s token parent)
-      (semantic-nonterminal-abstract-default token parent))))
-
-(defun semantic-nonterminal-abstract-default (token &optional parent)
-  "Return non-nil if TOKEN is abstract as a child of PARENT default action.
-See `semantic-nonterminal-abstract'."
-  (let ((mods (semantic-token-modifiers token))
-	(abs nil))
-    (while (and (not abs) mods)
-      (if (stringp (car mods))
-	  (setq abs (or (string= (car mods) "abstract")
-			(string= (car mods) "virtual"))))
-      (setq mods (cdr mods)))
-    abs))
-
-(defun semantic-nonterminal-leaf (token &optional parent)
-  "Return non nil if TOKEN is leaf.
-Optional PARENT is the parent token of TOKEN.
-In UML, leaf methods and classes have special meaning and behavior.
-
-The default behavior (if not overriden with `nonterminal-leaf'
-is to return true if `leaf' is in the type modifiers."
-  (let* ((s (semantic-fetch-overload 'nonterminal-leaf)))
-    (if s (funcall s token parent)
-      (semantic-nonterminal-leaf-default token parent))))
-
-(defun semantic-nonterminal-leaf-default (token &optional parent)
-  "Return non-nil if TOKEN is leaf as a child of PARENT default action.
-See `semantic-nonterminal-leaf'."
-  (let ((mods (semantic-token-modifiers token))
-	(leaf nil))
-    (while (and (not leaf) mods)
-      (if (stringp (car mods))
-	  ;; Use java FINAL as example default.  There is none
-	  ;; for C/C++
-	  (setq leaf (string= (car mods) "final")))
-      (setq mods (cdr mods)))
-    leaf))
-
-(defun semantic-nonterminal-static (token &optional parent)
-  "Return non nil if TOKEN is static.
-Optional PARENT is the parent token of TOKEN.
-In UML, static methods and attributes mean that they are allocated
-in the parent class, and are not instance specific.
-UML notation specifies that STATIC entries are underlined.
-
-The default behavior (if not overriden with `nonterminal-static'
-is to return true if `static' is in the type modifiers."
-  (let* ((s (semantic-fetch-overload 'nonterminal-static)))
-    (if s (funcall s token parent)
-      (semantic-nonterminal-static-default token parent))))
-
-(defun semantic-nonterminal-static-default (token &optional parent)
-  "Return non-nil if TOKEN is static as a child of PARENT default action.
-See `semantic-nonterminal-static'."
-  (let ((mods (semantic-token-modifiers token))
-	(static nil))
-    (while (and (not static) mods)
-      (if (stringp (car mods))
-	  (setq static (string= (car mods) "static")))
-      (setq mods (cdr mods)))
-    static))
-
-(defun semantic-nonterminal-full-name (token &optional stream-or-buffer)
-  "Return the fully qualified name of TOKEN in the package hierarchy.
-STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream',
-but must be a toplevel semantic token stream that contains TOKEN.
-A Package Hierarchy is defined in UML by the way classes and methods
-are organized on disk.  Some language use this concept such that a
-class can be accessed via it's fully qualified name, (such as Java.)
-Other languages qualify names within a Namespace (such as C++) which
-result in a different package like structure.  Languages which do not
-override this function with `nonterminal-full-name' will use
-`semantic-token-name'.  Override functions only need to handle
-STREAM-OR-BUFFER with a token stream value, or nil."
-  (let* ((s (semantic-fetch-overload 'nonterminal-full-name))
-	 (stream (semantic-something-to-stream (or stream-or-buffer token))))
-    (if s (funcall s token stream)
-      (semantic-nonterminal-full-name-default token stream))))
-
-(defun semantic-nonterminal-full-name-default (token stream)
-  "Default method for `semantic-nonterminal-full-name'.
-Return the name of TOKEN found in the toplevel STREAM."
-  (semantic-token-name token))
-
-
-;;; Do some fancy stuff with overlays
+;;; Interactive Functions for
 ;;
-(defun semantic-highlight-token (token &optional face)
-  "Specify that TOKEN should be highlighted.
-Optional FACE specifies the face to use."
-  (let ((o (semantic-token-overlay token)))
-    (semantic-overlay-put o 'old-face
-			  (cons (semantic-overlay-get o 'face)
-				(semantic-overlay-get o 'old-face)))
-    (semantic-overlay-put o 'face (or face 'highlight))
-    ))
-
-(defun semantic-unhighlight-token (token)
-  "Unhighlight TOKEN, restoring it's previous face."
-  (let ((o (semantic-token-overlay token)))
-    (semantic-overlay-put o 'face (car (semantic-overlay-get o 'old-face)))
-    (semantic-overlay-put o 'old-face (cdr (semantic-overlay-get o 'old-face)))
-    ))
-
-(defun semantic-momentary-unhighlight-token (token)
-  "Unhighlight TOKEN, restoring it's previous face."
-  (semantic-unhighlight-token token)
-  (remove-hook 'pre-command-hook
-	       `(lambda () (semantic-momentary-unhighlight-token ',token))))
-
-(defun semantic-momentary-highlight-token (token &optional face)
-  "Highlight TOKEN, removing highlighting when the user hits a key.
-Optional argument FACE is the face to use for highlighting.
-If FACE is not specified, then `highlight' will be used."
-  (semantic-highlight-token token face)
-  (add-hook 'pre-command-hook
-	    `(lambda () (semantic-momentary-unhighlight-token ',token))))
-
-(defun semantic-set-token-face (token face)
-  "Specify that TOKEN should use FACE for display."
-  (semantic-overlay-put (semantic-token-overlay token) 'face face))
-
-(defun semantic-set-token-invisible (token &optional visible)
-  "Enable the text in TOKEN to be made invisible.
-If VISIBLE is non-nil, make the text visible."
-  (semantic-overlay-put (semantic-token-overlay token) 'invisible
-			(not visible)))
-
-(defun semantic-token-invisible-p (token)
-  "Return non-nil if TOKEN is invisible."
-  (semantic-overlay-get (semantic-token-overlay token) 'invisible))
-
-(defun semantic-set-token-intangible (token &optional tangible)