Source

semantic / semantic.el.upstream

Diff from to

File semantic.el.upstream

 ;;; semantic.el --- Semantic buffer evaluator.
 
-;;; Copyright (C) 1999, 2000, 2001 Eric M. Ludlam
+;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Eric M. Ludlam
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
 ;; X-RCS: $Id$
 
-(defvar semantic-version "1.4beta8"
-  "Current version of Semantic.")
+(eval-and-compile
+  ;; Other package depend on this value at compile time via inversion.
+
+  (defvar semantic-version "2.0pre4"
+    "Current version of Semantic.")
+
+  )
 
 ;; This file is not part of GNU Emacs.
 
 
 ;; 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 determining semantic content of a buffer.  The mode using
-;; semantic must be a deterministic programming language.
+;; API for providing the semantic content of a buffer.
 ;;
-;; The output of a semantic bovine parse is parse tree.  While it is
-;; possible to assign actions in the bovine-table in a similar fashion
-;; to bison, this is not it's end goal.
-
-;;; History:
-;; 
+;; The semantic API provides an interface to a series of different parser
+;; implementations.  Each parser outputs a parse tree in a similar format
+;; designed to handle typical functional and object oriented languages.
 
 (require 'working)
+(require 'assoc)
+(require 'semantic-tag)
+(require 'semantic-lex)
+(require 'inversion)
+
+(defun semantic-require-version (major minor &optional beta)
+  "Non-nil if this version of semantic does not satisfy a specific version.
+Arguments can be:
+
+  (MAJOR MINOR &optional BETA)
+
+  Values MAJOR and MINOR must be integers.  BETA can be an integer, or
+excluded if a released version is required.
+
+It is assumed that if the current version is newer than that specified,
+everything passes.  Exceptions occur when known incompatibilities are
+introduced."
+  (inversion-test 'semantic
+		  (concat major "." minor
+			  (when beta (concat "beta" beta)))))
 
 (defgroup semantic nil
   "Parser Generator/Parser."
-  )
+  :group 'lisp)
+
+(require 'semantic-fw)
 
 ;;; Code:
+;;
 
-;;; Compatibility
+;;; Variables and Configuration
 ;;
-(if (featurep 'xemacs)
-    (progn
-      (defalias 'semantic-overlay-live-p 'extent-live-p)
-      (defalias 'semantic-make-overlay 'make-extent)
-      (defalias 'semantic-overlay-put 'set-extent-property)
-      (defalias 'semantic-overlay-get 'extent-property)
-      (defalias 'semantic-overlay-delete 'delete-extent)
-      (defalias 'semantic-overlays-at
-        (lambda (pos) (extent-list nil pos pos)))
-      (defalias 'semantic-overlays-in 
-	(lambda (beg end) (extent-list nil beg end)))
-      (defalias 'semantic-overlay-buffer 'extent-buffer)
-      (defalias 'semantic-overlay-start 'extent-start-position)
-      (defalias 'semantic-overlay-end 'extent-end-position)
-      (defalias 'semantic-overlay-next-change 'next-extent-change)
-      (defalias 'semantic-overlay-previous-change 'previous-extent-change)
-      (defalias 'semantic-overlay-lists
-	(lambda () (list (extent-list))))
-      (defalias 'semantic-overlay-p 'extentp)
-      (defun semantic-read-event ()
-        (let ((event (next-command-event)))
-          (if (key-press-event-p event)
-              (let ((c (event-to-character event)))
-                (if (char-equal c (quit-char))
-                    (keyboard-quit)
-                  c)))
-          event))
-      )
-  (defalias 'semantic-overlay-live-p 'overlay-buffer)
-  (defalias 'semantic-make-overlay 'make-overlay)
-  (defalias 'semantic-overlay-put 'overlay-put)
-  (defalias 'semantic-overlay-get 'overlay-get)
-  (defalias 'semantic-overlay-delete 'delete-overlay)
-  (defalias 'semantic-overlays-at 'overlays-at)
-  (defalias 'semantic-overlays-in 'overlays-in)
-  (defalias 'semantic-overlay-buffer 'overlay-buffer)
-  (defalias 'semantic-overlay-start 'overlay-start)
-  (defalias 'semantic-overlay-end 'overlay-end)
-  (defalias 'semantic-overlay-next-change 'next-overlay-change)
-  (defalias 'semantic-overlay-previous-change 'previous-overlay-change)
-  (defalias 'semantic-overlay-lists 'overlay-lists)
-  (defalias 'semantic-overlay-p 'overlayp)
-  (defalias 'semantic-read-event 'read-event)
-  )
-
-(defvar semantic-edebug nil
-  "When non-nil, activate the interactive parsing debugger.
-Do not set this yourself.  Call `semantic-bovinate-buffer-debug'.")
-
-
-(defcustom semantic-dump-parse nil
-  "When non-nil, dump parsing information."
-  :group 'semantic
-  :type 'boolean)
-
-(defvar semantic-toplevel-bovine-table nil
-  "Variable that defines how to bovinate top level items in a buffer.
-Set this in your major mode to return function and variable semantic
-types.
-
-The format of a BOVINE-TABLE is:
-
- ( ( NONTERMINAL-SYMBOL1 MATCH-LIST1 )
-   ( NONTERMINAL-SYMBOL2 MATCH-LIST2 )
-   ...
-   ( NONTERMINAL-SYMBOLn MATCH-LISTn )
- 
-Where each NONTERMINAL-SYMBOL is an artificial symbol which can appear
-in any child state.  As a starting place, one of the NONTERMINAL-SYMBOLS
-must be `bovine-toplevel'.
-
-A MATCH-LIST is a list of possible matches of the form:
-
- ( STATE-LIST1
-   STATE-LIST2
-   ...
-   STATE-LISTN )
-
-where STATE-LIST is of the form:
-  ( TYPE1 [ \"VALUE1\" ] TYPE2 [ \"VALUE2\" ] ... LAMBDA )
-
-where TYPE is one of the returned types of the token stream.
-VALUE is a value, or range of values to match against.  For
-example, a SYMBOL might need to match \"foo\".  Some TYPES will not
-have matching criteria.
-
-LAMBDA is a lambda expression which is evaled with the text of the
-type when it is found.  It is passed the list of all buffer text
-elements found since the last lambda expression.  It should return a
-semantic element (see below.)
-
-For consistency between languages, always use the following symbol
-forms.  It is fine to create new symbols, or to exclude some if they
-do not exist, however by using these symbols, you can maximize the
-number of language-independent programs available for use with your
-language.
-
-GENERIC ENTRIES:
-
- Bovine table entry return elements are up to the table author.  It is
-recommended, however, that the following format be used.
-
- (\"NAME\" type-symbol [\"TYPE\"] ... \"DOCSTRING\" PROPERTIES OVERLAY)
-
-Where type-symbol is the type of return token found, and NAME is it's
-name.  If there is any typing information needed to describe this
-entry, make that come third.  Next, any additional information follows
-the optional type.  The last data entry can be the position in the buffer
-of DOCSTRING.  A docstring does not have to exist in the form used by
-Emacs Lisp.  It could be the text of a comment appearing just before a
-function call, or in line with a variable.
-
-PROPERTIES is a list of additional properties for this token.
-PRORPERTIES is not for details of the token.  It is used for
-additional tags needed by tools using the parse stream.  For example,
-the `dirty' property is used when a given token needs to be reparsed.
-
-PROPERTIES are automatically added to the token by the system when
-using BNF, or `semantic-lambda' in the table.
-
-The last element must be OVERLAY.  The OVERLAY is automatically
-created by the parsing system.  When programming with BNF, or using
-`semantic-lambda', no extra work needs to be done.  If you are
-building the parse table yourself, use START and END.
-
-It may seem odd to place NAME in slot 0, and the type-symbol in slot
-1, but this turns the returned elements into a list which can be used
-by alist based function.  This makes it ideal for passing into generic
-sorters, string completion functions, and list searching functions.
-
-In the below entry formats, \"NAME\" is a string which is the name of
-the object in question.  It is possible for this to be nil in some
-situations, and code dealing with entries should try to be aware of
-these situations.
-
-\"TYPE\" is a string representing the type of some objects.  For a
-variable, this could very well be another top level token representing
-a type nonterminal.
-
-TOP-LEVEL ENTRIES:
-
- (\"NAME\" variable \"TYPE\" DEFAULT-VALUE EXTRA-SPEC 
-         \"DOCSTRING\" PROPERTIES OVERLAY)
-   The definition of a variable, or constant.
-   DEFAULT-VALUE can be something apropriate such a a string,
-                 or list of parsed elements.
-   EXTRA-SPEC are details about a variable that are not covered in the TYPE.
-             See detail on EXTRA-SPEC after entries section.
-   DOCSTRING is optional.
-
- (\"NAME\" function \"TYPE\" ( ARG-LIST ) EXTRA-SPEC
-          \"DOCSTRING\" PROPERTIES OVERLAY)
-   A function/procedure definition.
-   ARG-LIST is a list of variable definitions.
-   DOCSTRING is optional.
-
- (\"NAME\" type \"TYPE\" ( PART-LIST ) ( PARENTS ) EXTRA-SPEC
-          \"DOCSTRING\" PROPERTIES OVERLAY)
-   A type definition.
-   TYPE of a type could be anything, such as (in C) struct, union, typedef,
-        or class.
-   PART-LIST is only useful for structs that have multiple individual parts.
-            (It is recommended that these be variables, functions or types).
-   PARENTS is strictly for classes where there is inheritance.
-           See `semantic-token-parent' for a description of this value.   
-
- (\"FILE\" include SYSTEM \"DOCSTRING\" PROPERTIES OVERLAY)
-   In C, an #include statement.  In elisp, a require statement.
-   Indicates additional locations of sources or definitions.
-   SYSTEM is true if this include is part of a set of system includes.
-
- (\"NAME\" package DETAIL \"DOCSTRING\" PROPERTIES OVERLAY)
-   In Emacs Lisp, a `provide' statement.  DETAIL might be an
-   associated file name.  In Java, this is a package statement.
-
-EXTRA-SPEC:
-
-  The EXTRA-SPEC section of variables, functions, and types provide a
-location to place language specific details which are not accounted
-for by the base token type.  Because there is an arbitrary number of
-things that could be associated in the EXTRA-SPEC section, this should
-be formatted as an association list.
-
-  Here are some typed extra specifiers that may exist.  Any arbitrary
-number of extra specifiers may be created, and specifiers not
-documented here are allowed.
-
-  (parent .  \"text\") - Name of a parent type/class.  C++ and CLOS allow
-     the creation of a function outside the body of that type/class.
-
-  (dereference .  INT) - Number of levels of dereference.  In C, the number
-     of `*' characters indicating pointers.
-
-  (typemodifiers .  \"text\") - Keyword modifiers for a type.  In C, such
-     words would include `register', and `volatile'.
-
-  (suffix . \"text\") - Suffix information for a variable.
-
-  (const .  t) - This exists if the variable or return value is constant.
-
-  (throws .  \"text\") - For functions or methods in languages that support
-     typed signal throwing.
-
-  (user-visible . t) - For functions in interpreted languages such as Emacs Lisp,
-     this signals that a function or variable is user visible.  In Emacs Lisp,
-     this means a function is `interactive'.")
-(make-variable-buffer-local 'semantic-toplevel-bovine-table)
-
-(defvar semantic-toplevel-bovine-table-source nil
-  "The .bnf source file the current table was created from.")
-(make-variable-buffer-local 'semantic-toplevel-bovine-table-source)
+(defvar semantic--parse-table nil
+  "Variable that defines how to parse top level items in a buffer.
+This variable is for internal use only, and its content depends on the
+external parser used.")
+(make-variable-buffer-local 'semantic--parse-table)
+(semantic-varalias-obsolete 'semantic-toplevel-bovine-table
+			    'semantic--parse-table)
 
 (defvar semantic-symbol->name-assoc-list
-  '((variable . "Variables")
+  '((type     . "Types")
+    (variable . "Variables")
     (function . "Functions")
-    (type     . "Types")
     (include  . "Dependencies")
     (package  . "Provides"))
   "Association between symbols returned, and a string.
 string can be replaced with `Imports'.")
 (make-variable-buffer-local 'semantic-symbol->name-assoc-list)
 
+(defvar semantic-symbol->name-assoc-list-for-type-parts nil
+  "Like `semantic-symbol->name-assoc-list' for type parts.
+Some tags that have children (see `semantic-tag-children-compatibility')
+will want to define the names of classes of tags differently than at
+the top level.  For example, in C++, a Function may be called a
+Method.  In addition, there may be new types of tags that exist only
+in classes, such as protection labels.")
+(make-variable-buffer-local 'semantic-symbol->name-assoc-list-for-type-parts)
+
 (defvar semantic-case-fold nil
   "Value for `case-fold-search' when parsing.")
 (make-variable-buffer-local 'semantic-case-fold)
 
-(defvar semantic-flex-depth 0
-  "Default flexing depth.
-This specifies how many lists to create tokens in.")
-(make-variable-buffer-local 'semantic-flex-depth)
-
-(defvar semantic-ignore-comments t
-  "Default comment handling.
-t means to strip comments when flexing.  Nil means to keep comments
-as part of the token stream.")
-(make-variable-buffer-local 'semantic-ignore-comments)
-
 (defvar semantic-expand-nonterminal nil
   "Function to call for each nonterminal production.
 Return a list of non-terminals derived from the first argument, or nil
 Languages with compound definitions should use this function to expand
 from one compound symbol into several.  For example, in C the definition
   int a, b;
-is easily parsed into one token.  This function should take this
-compound token and turn it into two tokens, one for A, and the other for B.")
+is easily parsed into one tag.  This function should take this
+compound tag and turn it into two tags, one for A, and the other for B.")
 (make-variable-buffer-local 'semantic-expand-nonterminal)
 
-(defvar semantic-toplevel-bovine-cache nil
-  "A cached copy of a recent bovination, plus state.
+(defvar semantic--buffer-cache nil
+  "A cache of the fully parsed buffer.
 If no significant changes have been made (based on the state) then
 this is returned instead of re-parsing the buffer.
  
   DO NOT USE THIS VARIABLE IN PROGRAMS.
 
-If you need a token list, use `semantic-bovinate-toplevel'.  If you
-need the cached values for some reason, chances are you can, add a
-hook to `semantic-after-toplevel-cache-change-hook'.")
-(make-variable-buffer-local 'semantic-toplevel-bovine-cache)
+If you need a tag list, use `semantic-fetch-tags'.  If you need the
+cached values for some reason, chances are you can, add a hook to
+`semantic-after-toplevel-cache-change-hook'.")
+(make-variable-buffer-local 'semantic--buffer-cache)
+(semantic-varalias-obsolete 'semantic-toplevel-bovine-cache
+			    'semantic--buffer-cache)
+
+(defvar semantic-unmatched-syntax-cache nil
+  "A cached copy of unmatched syntax tokens.")
+(make-variable-buffer-local 'semantic-unmatched-syntax-cache)
+
+(defvar semantic-unmatched-syntax-cache-check nil
+  "Non nil if the unmatched syntax cache is out of date.
+This is tracked with `semantic-change-function'.")
+(make-variable-buffer-local 'semantic-unmatched-syntax-cache-check)
 
 (defvar semantic-edits-are-safe nil
   "When non-nil, modifications do not require a reparse.
-This prevents tokens from being marked dirty, and it
-prevents top level edits from causing a cache check.
-Use this when writing programs that could cause a full
-reparse, but will not change the tag structure, such
-as adding or updating top-level comments.")
+This prevents tags from being marked dirty, and it prevents top level
+edits from causing a cache check.
+Use this when writing programs that could cause a full reparse, but
+will not change the tag structure, such as adding or updating
+`top-level' comments.")
 
-(defvar semantic-toplevel-bovine-cache-check nil
-  "Non nil if the bovine cache is out of date.
-This is tracked with `semantic-change-function'.")
-(make-variable-buffer-local 'semantic-toplevel-bovine-cache-check)
+(defvar semantic-unmatched-syntax-hook nil
+  "Hooks run when semantic detects syntax not matched in a grammar.
+Each individual piece of syntax (such as a symbol or punctuation
+character) is called with this hook when it doesn't match in the
+grammar, and multiple unmatched syntax elements are not grouped
+together.  Each hook is called with one argument, which is a list of
+syntax tokens created by the semantic lexer.  Use the functions
+`semantic-lex-token-start', `semantic-lex-token-end' and
+`semantic-lex-token-text' to get information about these tokens.  The
+current buffer is the buffer these tokens are derived from.")
 
-(defvar semantic-toplevel-bovine-force-reparse nil
-  "Non nil if the next token request forces a reparse.")
-(make-variable-buffer-local 'semantic-toplevel-bovine-force-reparse)
-
-(defvar semantic-dirty-tokens nil
-  "List of tokens in the current buffer which are dirty.
-Dirty functions can then be reparsed, and spliced back into the main list.")
-(make-variable-buffer-local 'semantic-dirty-tokens)
-
-(defvar semantic-bovinate-nonterminal-check-obarray nil
-  "Obarray of streams already parsed for nonterminal symbols.")
-(make-variable-buffer-local 'semantic-bovinate-nonterminal-check-obarray)
-
-(defvar semantic-dirty-token-hooks nil
-  "Hooks run after when a token is marked as dirty (edited by the user).
-The functions must take TOKEN, START, and END as a parameters.
-This hook will only be called once when a token is first made dirty,
-subsequent edits will not cause this to run a second time unless that
-token is first cleaned.  Any token marked as dirty will
-also be called with `semantic-clean-token-hooks', unless a full
-reprase is done instead.")
-
-(defvar semantic-clean-token-hooks nil
-  "Hooks run after a token is marked as clean (reparsed after user edits.)
-The functions must take a TOKEN as a parameter.
-Any token sent to this hook will have first been called with
-`semantic-dirty-token-hooks'.  This hook is not called for tokens
-marked dirty if the buffer is completely reparsed.  In that case, use
-`semantic-after-toplevel-bovinate-hook'.")
-
-(defvar semantic-change-hooks nil
-  "Hooks run when semantic detects a change in a buffer.
-Each hook function must take three arguments, identical to the
-common hook `after-change-function'.")
-
-(defvar semantic-bovinate-toplevel-override nil
-  "Local variable set by major modes which provide their own bovination.
-This function should behave as the function `semantic-bovinate-toplevel'.")
-(make-variable-buffer-local 'semantic-bovinate-toplevel-override)
+(defvar semantic--before-fetch-tags-hook nil
+  "Hooks run before a buffer is parses for tags.
+It is called before any request for tags is made via the function
+`semantic-fetch-tags' by an application.
+If any hook returns a nil value, the cached value is returned
+immediately, even if it is empty.")
+(semantic-varalias-obsolete 'semantic-before-toplevel-bovination-hook
+			    'semantic--before-fetch-tags-hook)
 
 (defvar semantic-after-toplevel-bovinate-hook nil
-  "Hooks run after a toplevel token parse.
+  "Hooks run after a toplevel parse.
 It is not run if the toplevel parse command is called, and buffer does
 not need to be fully reparsed.
-For language specific hooks, make sure you define this as a local hook.")
+For language specific hooks, make sure you define this as a local hook.
+
+This hook should not be used any more.
+Use `semantic-after-toplevel-cache-change-hook' instead.")
+(make-obsolete-variable 'semantic-after-toplevel-bovinate-hook nil)
 
 (defvar semantic-after-toplevel-cache-change-hook nil
-  "Hooks run after the buffer token list has changed.
-This list will change when a buffer is reparsed, or when the token
-list in a buffer is cleared.  It is *NOT* called if the current token
-list partially reparsed.
+  "Hooks run after the buffer tag list has changed.
+This list will change when a buffer is reparsed, or when the tag list
+in a buffer is cleared.  It is *NOT* called if the current tag list is
+partially reparsed.
 
-Hook functions must take one argument, which is the new list of
-tokens associated with this buffer.
+Hook functions must take one argument, which is the new list of tags
+associated with this buffer.
 
 For language specific hooks, make sure you define this as a local hook.")
 
 (defvar semantic-before-toplevel-cache-flush-hook nil
   "Hooks run before the toplevel nonterminal cache is flushed.
-For language specific hooks, make sure you define this as a local hook.
-This hook is called before a corresponding
-`semantic-after-toplevel-bovinate-hook' which is also called during a
-flush when the cache is given a new value of nil.")
+For language specific hooks, make sure you define this as a local
+hook.  This hook is called before a corresponding
+`semantic-after-toplevel-cache-change-hook' which is also called
+during a flush when the cache is given a new value of nil.")
 
-(defvar semantic-reparse-needed-change-hook nil
-  "Hooks run when a user edit is detected as needing a reparse.
-For language specific hooks, make sure you define this as a local
-hook.
-Not used yet; part of the next generation reparse mechanism")
+(defcustom semantic-dump-parse nil
+  "When non-nil, dump parsing information."
+  :group 'semantic
+  :type 'boolean)
 
-(defvar semantic-no-reparse-needed-change-hook nil
-  "Hooks run when a user edit is detected as not needing a reparse.
-If the hook returns non-nil, then declare that a reparse is needed.
-For language specific hooks, make sure you define this as a local
-hook.
-Not used yet; part of the next generation reparse mechanism.")
+(defvar semantic-parser-name "LL"
+  "Optional name of the parser used to parse input stream.")
+(make-variable-buffer-local 'semantic-parser-name)
+
+;;; Parse tree state management API
+;;
+(defvar semantic-parse-tree-state 'needs-rebuild
+  "State of the current parse tree.")
+(make-variable-buffer-local 'semantic-parse-tree-state)
 
-
-;;; Primitive Token access system:
-;;
-;; These are token level APIs (similar to some APIs in semantic-util)
-;; which are required for parsing operations.  Semantic.el should have
-;; no dependencies on other semantic files.
-;;
-;; TFE = Token From End
+(defmacro semantic-parse-tree-unparseable ()
+  "Indicate that the current buffer is unparseable.
+It is also true that the parse tree will need either updating or
+a rebuild.  This state will be changed when the user edits the buffer."
+  `(setq semantic-parse-tree-state 'unparseable))
 
-(defconst semantic-tfe-overlay 1
-  "Amount to subtract from the length of the token to get the overlay.")
-(defconst semantic-tfe-properties 2
-  "Amount to subtract from the length of the token to get the property list.")
-(defconst semantic-tfe-docstring 3
-  "Amount to subtract from the length of the token to get the doc string.")
-(defconst semantic-tfe-number 2
-  "The number of required end elements.")
+(defmacro semantic-parse-tree-unparseable-p ()
+  "Return non-nil if the current buffer has been marked unparseable."
+  `(eq semantic-parse-tree-state 'unparseable))
 
-(defmacro semantic-token-token (token)
-  "Retrieve from TOKEN the token identifier.
-ie, the symbol 'variable, 'function, 'type, or other."
-  `(nth 1 ,token))
+(defmacro semantic-parse-tree-set-needs-update ()
+  "Indicate that the current parse tree needs to be updated.
+The parse tree can be updated by `semantic-parse-changes'."
+  `(setq semantic-parse-tree-state 'needs-update))
 
-(defun semantic-token-name (token)
-  "Retrieve the name of TOKEN."
-  (car token))
+(defmacro semantic-parse-tree-needs-update-p ()
+  "Return non-nil if the current parse tree needs to be updated."
+  `(eq semantic-parse-tree-state 'needs-update))
 
-(defun semantic-token-docstring (token &optional buffer)
-  "Retrieve the documentation of TOKEN.
-Optional argument BUFFER indicates where to get the text from.
-If not provided, then only the POSITION can be provided."
-  (let ((p (nth (- (length token) semantic-tfe-docstring) token)))
-    (if (and p buffer)
-	(save-excursion
-	  (set-buffer buffer)
-	  (semantic-flex-text (car (semantic-flex p (1+ p)))))
-      p)))
+(defmacro semantic-parse-tree-set-needs-rebuild ()
+  "Indicate that the current parse tree needs to be rebuilt.
+The parse tree must be rebuilt by `semantic-parse-region'."
+  `(setq semantic-parse-tree-state 'needs-rebuild))
 
-(defmacro semantic-token-properties (token)
-  "Retrieve the PROPERTIES part of TOKEN.
-The returned item is an ALIST of (KEY . VALUE) pairs."
-  `(nth (- (length ,token) semantic-tfe-properties) ,token))
+(defmacro semantic-parse-tree-needs-rebuild-p ()
+  "Return non-nil if the current parse tree needs to be rebuilt."
+  `(eq semantic-parse-tree-state 'needs-rebuild))
 
-(defmacro semantic-token-properties-cdr (token)
-  "Retrieve the cons cell for the PROPERTIES part of TOKEN."
-  `(nthcdr (- (length ,token) semantic-tfe-properties) ,token))
+(defmacro semantic-parse-tree-set-up-to-date ()
+  "Indicate that the current parse tree is up to date."
+  `(setq semantic-parse-tree-state nil))
 
-(defun semantic-token-put (token key value)
-  "For TOKEN, put the property KEY on it with VALUE.
-If VALUE is nil, then remove the property from TOKEN."
-  (let* ((c (semantic-token-properties-cdr token))
-	 (al (car c))
-	 (a (assoc key (car c))))
-    (if a
-	(if value
-	    (setcdr a value)
-	  (adelete 'al key)
-	  (setcar c al))
-      (if value
-	  (setcar c (cons (cons key value) (car c)))))
-    ))
-
-(defun semantic-token-get (token key)
-  "For TOKEN, get the value for property KEY."
-  (cdr (assoc key (semantic-token-properties token))))
-
-(defmacro semantic-token-overlay (token)
-  "Retrieve the OVERLAY part of TOKEN.
-The returned item may be an overlay or an unloaded buffer representation."
-  `(nth (- (length ,token) semantic-tfe-overlay) ,token))
-
-(defmacro semantic-token-overlay-cdr (token)
-  "Retrieve the cons cell containing the OVERLAY part of TOKEN."
-  `(nthcdr (- (length ,token) semantic-tfe-overlay) ,token))
-
-(defmacro semantic-token-extent (token)
-  "Retrieve the extent (START END) of TOKEN."
-  `(let ((o (semantic-token-overlay ,token)))
-     (if (semantic-overlay-p o)
-	 (list (semantic-overlay-start o) (semantic-overlay-end o))
-       (list (aref o 0) (aref o 1)))))
-
-(defun semantic-token-start (token)
-  "Retrieve the start location of TOKEN."
-  (let ((o (semantic-token-overlay token)))
-    (if (semantic-overlay-p o) (semantic-overlay-start o) (aref o 0))))
-
-(defun semantic-token-end (token)
-  "Retrieve the end location of TOKEN."
-  (let ((o (semantic-token-overlay token)))
-    (if (semantic-overlay-p o) (semantic-overlay-end o) (aref o 1))))
-
-(defun semantic-token-buffer (token)
-  "Retrieve the buffer TOKEN resides in."
-  (let ((o (semantic-token-overlay token)))
-    (if (semantic-overlay-p o) (semantic-overlay-buffer o)
-      ;; We have no buffer for this token (It's not in Emacs right now.)
-      nil)))
-
-(defun semantic-token-p (token)
-  "Return non-nil if TOKEN is most likely a semantic token."
-  (and (listp token)
-       (stringp (car token))
-       (car (cdr token))
-       (symbolp (car (cdr token)))))
-
-(defun semantic-token-with-position-p (token)
-  "Return non-nil if TOKEN is a semantic token with positional information."
-  (and (listp token)
-       (stringp (car token))
-       (symbolp (car (cdr token)))
-       (let ((o (semantic-token-overlay token)))
-	 (or (semantic-overlay-p o)
-	     (arrayp o)))))
-
-
-;;; Overlay and error stacks.
-;;
-(defvar semantic-overlay-error-recovery-stack nil
-  "List of overlays used during error recovery.")
-
-(defun semantic-overlay-stack-add (o)
-  "Add overlay O to the error recovery stack."
-  (setq semantic-overlay-error-recovery-stack
-	(if (listp o)
-	    (append o semantic-overlay-error-recovery-stack)
-	  (cons o semantic-overlay-error-recovery-stack))))
-
-(defun semantic-overlay-stack-clear ()
-  "Clear the overlay error recovery stack."
-  (while semantic-overlay-error-recovery-stack
-    (semantic-overlay-delete (car semantic-overlay-error-recovery-stack))
-    (setq semantic-overlay-error-recovery-stack
-	  (cdr semantic-overlay-error-recovery-stack))))
-
-(defun semantic-delete-overlay-maybe (overlay)
-  "Delete OVERLAY if it is a semantic token overlay."
-  (if (semantic-overlay-get overlay 'semantic)
-      (semantic-overlay-delete overlay)))
+(defmacro semantic-parse-tree-up-to-date-p ()
+  "Return non-nil if the current parse tree is up to date."
+  `(null semantic-parse-tree-state))
 
 ;;; Interfacing with the system
 ;;
+(defcustom semantic-inhibit-functions nil
+  "List of functions to call with no arguments before to setup Semantic.
+If any of these functions returns non-nil, the current buffer is not
+setup to use Semantic."
+  :group 'semantic
+  :type 'hook)
+
 (defvar semantic-init-hooks nil
   "*Hooks run when a buffer is initialized with a parsing table.")
 
-(defun semantic-active-p ()
+(defvar semantic-init-db-hooks nil
+  "Hooks run when a buffer is initialized with a parsing table for DBs.
+This hook is for database functions which intend to swap in a tag table.
+This guarantees that the DB will go before other modes that require
+a parse of the buffer.")
+
+(defvar semantic-new-buffer-fcn-was-run nil
+  "Non nil after `semantic-new-buffer-fcn' has been executed.")
+(make-variable-buffer-local 'semantic-new-buffer-fcn-was-run)
+
+(defsubst semantic-active-p ()
   "Return non-nil if the current buffer was set up for parsing."
-  (or semantic-toplevel-bovine-table
-      semantic-bovinate-toplevel-override))
+  semantic-new-buffer-fcn-was-run)
+
+(defsubst semantic--umatched-syntax-needs-refresh-p  ()
+  "Return non-nil if the unmatched syntax cache needs a refresh.
+That is if it is dirty or if the current parse tree isn't up to date."
+  (or semantic-unmatched-syntax-cache-check
+      (not (semantic-parse-tree-up-to-date-p))))
 
 (defun semantic-new-buffer-fcn ()
-  "Setup Semantic in the current buffer.
-Runs `semantic-init-hook' if the major mode is setup to use Semantic."
-  (when (semantic-active-p)
+  "Setup the current buffer to use Semantic.
+If the major mode is ready for Semantic, and no
+`semantic-inhibit-functions' disabled it, the current buffer is setup
+to use Semantic, and `semantic-init-hook' is run."
+  ;; Do stuff if semantic was activated by a mode hook in this buffer,
+  ;; and not afterwards disabled.
+  (when (and semantic--parse-table
+             (not (semantic-active-p))
+             (not (run-hook-with-args-until-success
+                   'semantic-inhibit-functions)))
+    ;; Specify that this function has done it's work.  At this point
+    ;; we can consider that semantic is active in this buffer.
+    (setq semantic-new-buffer-fcn-was-run t)
+    ;; Here are some buffer local variables we can initialize ourselves
+    ;; of a mode does not choose to do so.
+    (semantic-lex-init)
+    ;; Force this buffer to have its cache refreshed.
     (semantic-clear-toplevel-cache)
-    (setq semantic-toplevel-bovine-force-reparse t)
-    (run-hooks 'semantic-init-hooks)))
+    ;; Call DB hooks before regular init hooks
+    (run-hooks 'semantic-init-db-hooks)
+    ;; Lastly, set up semantic modes
+    (run-hooks 'semantic-init-hooks)
+    ))
 
-(defvar semantic-changed-mode-buffers nil
-  "List of buffers whose `major-mode' has changed recently.")
-
-(defun semantic-post-change-major-mode-function ()
-  "`post-command-hook' run when there is a `major-mode' change.
-This makes sure semantic-init type stuff can occur."
-  (remove-hook 'post-command-hook
-               'semantic-post-change-major-mode-function)
-  (let (buf)
-    (while semantic-changed-mode-buffers
-      (setq buf (car semantic-changed-mode-buffers)
-            semantic-changed-mode-buffers
-            (cdr semantic-changed-mode-buffers))
-      (and (buffer-live-p buf)
-           (buffer-file-name buf)
-           (with-current-buffer buf
-             (semantic-new-buffer-fcn))))))
-
-(defun semantic-change-major-mode-hook-function ()
-  "Function called in `change-major-mode-hook'."
-  (add-to-list 'semantic-changed-mode-buffers (current-buffer))
-  (add-hook 'post-command-hook 'semantic-post-change-major-mode-function))
-
-(add-hook 'find-file-hooks
-          'semantic-post-change-major-mode-function)
-(add-hook 'change-major-mode-hook
-          'semantic-change-major-mode-hook-function)
+(add-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
 
 ;; Test the above hook.
 ;;(add-hook 'semantic-init-hooks (lambda () (message "init for semantic")))
 
-(defun semantic-rebovinate-quickly-hook ()
+(defun semantic-fetch-tags-fast ()
   "For use in a hook.  When only a partial reparse is needed, reparse."
   (condition-case nil
-      (if (semantic-bovine-toplevel-partial-reparse-needed-p nil)
-	  (semantic-bovinate-toplevel))
+      (if (semantic-parse-tree-needs-update-p)
+	  (semantic-fetch-tags))
     (error nil)))
 
 (if (boundp 'eval-defun-hooks)
-    (add-hook 'eval-defun-hooks 'semantic-rebovinate-quickly-hook))
-
+    (add-hook 'eval-defun-hooks 'semantic-fetch-tags-fast))
+
 ;;; Parsing Commands
 ;;
 (eval-when-compile
   (condition-case nil (require 'pp) (error nil)))
 
+(defvar semantic-edebug nil
+  "When non-nil, activate the interactive parsing debugger.
+Do not set this yourself.  Call `semantic-debug'.")
+
+(defun semantic-elapsed-time (start end)
+  "Copied from elp.el.  Was elp-elapsed-time.
+Argument START and END bound the time being calculated."
+  (+ (* (- (car end) (car start)) 65536.0)
+     (- (car (cdr end)) (car (cdr start)))
+     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+
 (defun bovinate (&optional clear)
-  "Bovinate the current buffer.  Show output in a temp buffer.
-Optional argument CLEAR will clear the cache before bovinating."
+  "Parse the current buffer.  Show output in a temp buffer.
+Optional argument CLEAR will clear the cache before parsing.
+If CLEAR is negative, it will do a full reparse, and also not display
+the output buffer."
   (interactive "P")
   (if clear (semantic-clear-toplevel-cache))
-  (let ((out (semantic-bovinate-toplevel t)))
-    (pop-to-buffer "*BOVINATE*")
-    (require 'pp)
-    (erase-buffer)
-    (insert (pp-to-string out))
-    (goto-char (point-min))))
+  (if (eq clear '-) (setq clear -1))
+  (let* ((start (current-time))
+	 (out (semantic-fetch-tags))
+	 (end (current-time)))
+    (message "Retrieving tags took %.2f seconds."
+	     (semantic-elapsed-time start end))
+    (when (or (null clear) (not (listp clear)))
+      (pop-to-buffer "*Parser Output*")
+      (require 'pp)
+      (erase-buffer)
+      (insert (pp-to-string out))
+      (goto-char (point-min)))))
+
+;;; Functions of the parser plug-in API
+;;
+;; Overload these functions to create new types of parsers.
+;;
+(define-overload semantic-parse-stream (stream nonterminal)
+  "Parse STREAM, starting at the first NONTERMINAL rule.
+For bovine and wisent based parsers, STREAM is from the output of
+`semantic-lex', and NONTERMINAL is a rule in the apropriate language
+specific rules file.
+The default parser table used for bovine or wisent based parsers is
+`semantic--parse-table'.
 
-(defun bovinate-debug ()
-  "Bovinate the current buffer and run in debug mode."
-  (interactive)
-  (let ((semantic-edebug t)
-	(out (semantic-bovinate-debug-buffer)))
-    (pop-to-buffer "*BOVINATE*")
-    (require 'pp)
-    (erase-buffer)
-    (insert (pp-to-string out))))
+Must return a list: (STREAM TAGS) where STREAM is the unused elements
+from STREAM, and TAGS is the list of semantic tags found, usually only
+one tag is returned with the exception of compound statements")
 
+(define-overload semantic-parse-changes ()
+  "Reparse changes in the current buffer.
+The list of changes are tracked as a series of overlays in the buffer.
+When overloading this function, use `semantic-changes-in-region' to
+analyze.")
+
+(define-overload semantic-parse-region
+  (start end &optional nonterminal depth returnonerror)
+  "Parse the area between START and END, and return any tags found.
+If END needs to be extended due to a lexical token being too large, it
+will be silently ignored.
+
+Optional arguments:
+NONTERMINAL is the rule to start parsing at.
+DEPTH specifies the lexical depth to decend for parser that use
+lexical analysis as their first step.
+RETURNONERROR specifies that parsing should stop on the first
+unmatched syntax encountered.  When nil, parsing skips the syntax,
+adding it to the unmatched syntax cache.
+
+Must return a list of semantic tags wich have been cooked
+\(repositioned properly) but which DO NOT HAVE OVERLAYS associated
+with them.  When overloading this function, use `semantic--tag-expand'
+to cook raw tags.")
+
+;;;###autoload
+(defun semantic-parse-region-default
+  (start end &optional nonterminal depth returnonerror)
+  "Parse the area between START and END, and return any tags found.
+If END needs to be extended due to a lexical token being too large, it
+will be silently ignored.
+Optional arguments:
+NONTERMINAL is the rule to start parsing at if it is known.
+DEPTH specifies the lexical depth to scan.
+RETURNONERROR specifies that parsing should end when encountering
+unterminated syntax."
+  (when (or (null semantic--parse-table) (eq semantic--parse-table t))
+    ;; If there is no table, or it was set to t, then we are here by
+    ;; some other mistake.  Do not throw an error deep in the parser.
+    (error "No support found to parse buffer %S" (buffer-name)))
+  (when (or (< end start) (> end (point-max)))
+    (error "Invalid parse region bounds %S, %S" start end))
+  (nreverse
+   (semantic-repeat-parse-whole-stream
+    (or (cdr (assq start semantic-lex-block-streams))
+        (semantic-lex start end depth))
+    nonterminal returnonerror)))
+
 ;;; Parsing functions
 ;;
+(defun semantic-set-unmatched-syntax-cache (unmatched-syntax)
+  "Set the unmatched syntax cache.
+Argument UNMATCHED-SYNTAX is the syntax to set into the cache."
+  ;; This function is not actually called by the main parse loop.
+  ;; This is intended for use by semanticdb.
+  (setq semantic-unmatched-syntax-cache unmatched-syntax
+	semantic-unmatched-syntax-cache-check nil)
+    ;; Refresh the display of unmatched syntax tokens if enabled
+  (run-hook-with-args 'semantic-unmatched-syntax-hook
+                      semantic-unmatched-syntax-cache))
+
+(defun semantic-clear-unmatched-syntax-cache ()
+  "Clear the cache of unmatched syntax tokens."
+  (setq semantic-unmatched-syntax-cache nil
+        semantic-unmatched-syntax-cache-check t))
+
+(defun semantic-unmatched-syntax-tokens ()
+  "Return the list of unmatched syntax tokens."
+  ;; If the cache need refresh then do a full re-parse.
+  (if (semantic--umatched-syntax-needs-refresh-p)
+      ;; To avoid a recursive call, temporarily disable
+      ;; `semantic-unmatched-syntax-hook'.
+      (let (semantic-unmatched-syntax-hook)
+        (condition-case nil
+            (progn
+              (semantic-clear-toplevel-cache)
+              (semantic-fetch-tags))
+          (quit
+           (message "semantic-unmatched-syntax-tokens:\
+ parsing of buffer canceled"))
+          )))
+    semantic-unmatched-syntax-cache)
+
 (defun semantic-clear-toplevel-cache ()
-  "Clear the toplevel bovin cache for the current buffer.
-Clearing the cache will force a complete reparse next time a token
-stream is requested."
+  "Clear the toplevel tag cache for the current buffer.
+Clearing the cache will force a complete reparse next time a tag list
+is requested."
   (interactive)
   (run-hooks 'semantic-before-toplevel-cache-flush-hook)
-  (setq semantic-toplevel-bovine-cache nil)
+  (setq semantic--buffer-cache nil)
+  (semantic-clear-unmatched-syntax-cache)
+  (semantic-clear-parser-warnings)
   ;; Nuke all semantic overlays.  This is faster than deleting based
   ;; on our data structure.
   (let ((l (semantic-overlay-lists)))
     (mapcar 'semantic-delete-overlay-maybe (car l))
     (mapcar 'semantic-delete-overlay-maybe (cdr l))
     )
-  ;; Clear the dirty tokens... no longer relevant
-  (setq semantic-dirty-tokens nil)
-  (setq semantic-toplevel-bovine-force-reparse t)
+  (semantic-parse-tree-set-needs-rebuild)
   ;; Remove this hook which tracks if a buffer is up to date or not.
   (remove-hook 'after-change-functions 'semantic-change-function t)
   ;; Old model.  Delete someday.
   ;;(run-hooks 'semantic-after-toplevel-bovinate-hook)
+
   (run-hook-with-args 'semantic-after-toplevel-cache-change-hook
-		      semantic-toplevel-bovine-cache)
+		      semantic--buffer-cache)
   )
 
-(defvar semantic-bovination-working-type 'percent
-  "*The type of working message to use when bovinating.
-'percent means we are doing a linear parse through the buffer.
-'dynamic means we are rebovinating specific tokens.")
-
-(defun semantic-bovine-toplevel-full-reparse-needed-p (&optional checkcache)
-  "Return non-nil if the current buffer needs a full reparse.
-Optional argument CHECKCACHE indicates if the cache check should be made."
-  (or semantic-toplevel-bovine-force-reparse
-      (and
-       checkcache
-       semantic-toplevel-bovine-cache-check)))
-
-(defun semantic-bovine-toplevel-partial-reparse-needed-p (&optional checkcache)
-  "Return non-nil if the current buffer needs a partial reparse.
-This only returns non-nil if `semantic-bovine-toplevel-full-reparse-needed-p'
-returns nil.
-Optional argument CHECKCACHE indicates if the cache check should be made
-when checking `semantic-bovine-toplevel-full-reparse-needed-p'."
-  (and semantic-toplevel-bovine-cache
-       semantic-dirty-tokens
-       (not (semantic-bovine-toplevel-full-reparse-needed-p checkcache))))
-
-;;;###autoload
-(defun semantic-bovinate-toplevel (&optional checkcache)
-  "Bovinate the entire current buffer.
-If the optional argument CHECKCACHE is non-nil, then make sure the
-cached token list is up to date.  If a partial reparse is possible, do
-that, otherwise, do a full reparse."
-  (cond
-   ((and semantic-bovinate-toplevel-override
-	 ;; We cannot predict partial reparsing for these parsers.  Let them
-	 ;; fend for themselves.  We can, however, handle the main cache for them.
-	 (or (semantic-bovine-toplevel-partial-reparse-needed-p checkcache)
-	     (semantic-bovine-toplevel-full-reparse-needed-p checkcache)))
-    (semantic-clear-toplevel-cache)
-    ;; Call a custom function
-    (let ((res (funcall semantic-bovinate-toplevel-override checkcache)))
-      (semantic-set-toplevel-bovine-cache res))
-    ;; Check: The below is not needed because of the -set- command above?
-    ;;(run-hooks 'semantic-after-toplevel-bovinate-hook)
-    semantic-toplevel-bovine-cache
-    )
-   ((semantic-bovine-toplevel-partial-reparse-needed-p checkcache)
-    ;; We have a cache, and some dirty tokens
-    (let ((semantic-bovination-working-type 'dynamic))
-      (working-status-forms (buffer-name) "done"
-	(while (and semantic-dirty-tokens
-		    (not (semantic-bovine-toplevel-full-reparse-needed-p
-			  checkcache)))
-	  (semantic-rebovinate-token (car semantic-dirty-tokens))
-	  (setq semantic-dirty-tokens (cdr semantic-dirty-tokens))
-	  (working-dynamic-status))
-	(working-dynamic-status t))
-      (setq semantic-dirty-tokens nil)
-      )
-    (if (semantic-bovine-toplevel-full-reparse-needed-p checkcache)
-	;; If the partial reparse fails, jump to a full reparse.
-	(semantic-bovinate-toplevel checkcache)
-      semantic-toplevel-bovine-cache)
-    )
-   ((semantic-bovine-toplevel-full-reparse-needed-p checkcache)
-    (semantic-clear-toplevel-cache)
-    ;; Reparse the whole system
-    (let ((ss (semantic-flex (point-min) (point-max)))
-	  (res nil)
-	  (semantic-overlay-error-recovery-stack nil))
-      ;; Init a dump
-      (if semantic-dump-parse (semantic-dump-buffer-init))
-      ;; Parse!
-      (working-status-forms (buffer-name) "done"
-	(setq res
-	      (semantic-bovinate-nonterminals
-	       ss 'bovine-toplevel semantic-flex-depth))
-	(working-status t))
-      (semantic-set-toplevel-bovine-cache (nreverse res))
-      semantic-toplevel-bovine-cache))
-   (t
-    ;; We have a cache with stuff in it, so return it
-    semantic-toplevel-bovine-cache
-    )))
-
-(defun semantic-set-toplevel-bovine-cache (tokenlist)
-  "Set the toplevel bovine cache to TOKENLIST."
-  (setq semantic-toplevel-bovine-cache tokenlist
-	semantic-toplevel-bovine-cache-check nil
-	semantic-toplevel-bovine-force-reparse nil
+(defun semantic--set-buffer-cache (tagtable)
+  "Set the toplevel cache cache to TAGTABLE."
+  (setq semantic--buffer-cache tagtable
+        semantic-unmatched-syntax-cache-check nil
+	;; This is specific to the bovine parser.
         semantic-bovinate-nonterminal-check-obarray nil)
+  (semantic-parse-tree-set-up-to-date)
+  (semantic-make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions 'semantic-change-function nil t)
   (run-hook-with-args 'semantic-after-toplevel-cache-change-hook
-		      semantic-toplevel-bovine-cache)
+		      semantic--buffer-cache)
+  ;; Refresh the display of unmatched syntax tokens if enabled
+  (run-hook-with-args 'semantic-unmatched-syntax-hook
+                      semantic-unmatched-syntax-cache)
   ;; Old Semantic 1.3 hook API.  Maybe useful forever?
   (run-hooks 'semantic-after-toplevel-bovinate-hook)
   )
 
-(defun semantic-change-function (start end length)
-  "Provide a mechanism for semantic token management.
-Argument START, END, and LENGTH specify the bounds of the change."
-  (run-hook-with-args 'semantic-change-hooks start end length))
+(defvar semantic-working-type 'percent
+  "*The type of working message to use when parsing.
+'percent means we are doing a linear parse through the buffer.
+'dynamic means we are reparsing specific tags.")
+(semantic-varalias-obsolete 'semantic-bovination-working-type
+			    'semantic-working-type)
+
+(defsubst semantic-parser-working-message (&optional arg)
+  "Return the message string displayed while parsing.
+If optional argument ARG is non-nil it is appended to the message
+string.  See also the function `working-status-forms'."
+  (if semantic-parser-name
+      (format "%s/%s" semantic-parser-name (or arg ""))
+    (format "%s" (or arg ""))))
 
-;;; Force token lists in and out of overlay mode.
+;;; Application Parser Entry Points
 ;;
-(defun semantic-deoverlay-token (token)
-  "Convert TOKEN from using an overlay to using an overlay proxy."
-  (when (semantic-token-p token)
-    (let ((c (semantic-token-overlay-cdr token))
-	  a)
-      (when (and c (semantic-overlay-p (car c)))
-	(setq a (vector (semantic-overlay-start (car c))
-			(semantic-overlay-end (car c))))
-	(semantic-overlay-delete (car c))
-	(setcar c a)
-	;; Fix the children of this token.
-	;; Semantic-util is required and the end of semantic, so this will
-	;; throw a warning
-	(semantic-deoverlay-list (semantic-nonterminal-children token)))
-      )))
+;; The best way to call the parser from programs is via
+;; `semantic-fetch-tags'.  This, in turn, uses other internal
+;; API functions which plug-in parsers can take advantage of.
 
-(defun semantic-overlay-token (token)
-  "Convert TOKEN from using an overlay proxy to using an overlay."
-  (when (semantic-token-p token)
-    (let ((c (semantic-token-overlay-cdr token))
-	  o)
-      (when (and c (vectorp (car c)) (= (length (car c)) 2))
-	(setq o (semantic-make-overlay (aref (car c) 0)
-				       (aref (car c) 1)
-				       (current-buffer)))
-	(setcar c o)
-	(semantic-overlay-put o 'semantic token)
-	;; Fix overlays in children of this token
-	;; Semantic-util is required and the end of semantic, so this will
-	;; throw a warning
-	(semantic-overlay-list (semantic-nonterminal-children token))
-	))))
+;;;###autoload
+(defun semantic-fetch-tags ()
+  "Fetch semantic tags from the current buffer.
+If the buffer cache is up to date, return that.
+If the buffer cache is out of date, attempt an incremental reparse.
+If the buffer has not been parsed before, or if the incremental reparse
+fails, then parse the entire buffer.
+If a lexcial error had been previously discovered and the buffer
+was marked unparseable, then do nothing, and return the cache."
+  (and
+   ;; Is this a semantic enabled buffer?
+   (semantic-active-p)
+   ;; Application hooks say the buffer is safe for parsing
+   (run-hook-with-args-until-failure
+    'semantic-before-toplevel-bovination-hook)
+   (run-hook-with-args-until-failure
+    'semantic--before-fetch-tags-hook)
+   ;; If the buffer was previously marked unparseable,
+   ;; then don't waste our time.
+   (not (semantic-parse-tree-unparseable-p))
+   ;; The parse tree actually needs to be refreshed
+   (not (semantic-parse-tree-up-to-date-p))
+   ;; So do it!
+   (let* ((gc-cons-threshold (max gc-cons-threshold 10000000))
+          (semantic-lex-block-streams nil)
+          (res nil))
+     (garbage-collect)
+     (cond
+   
+;;;; Try the incremental parser to do a fast update.
+     ((semantic-parse-tree-needs-update-p)
+      (setq res (semantic-parse-changes))
+      (if (semantic-parse-tree-needs-rebuild-p)
+          ;; If the partial reparse fails, jump to a full reparse.
+          (semantic-fetch-tags)
+        ;; Clear the cache of unmatched syntax tokens
+        ;;
+        ;; NOTE TO SELF:
+        ;;
+        ;; Move this into the incremental parser.  This is a bug.
+        ;;
+        (semantic-clear-unmatched-syntax-cache)
+        (run-hook-with-args ;; Let hooks know the updated tags
+         'semantic-after-partial-cache-change-hook res))
+      )
+   
+;;;; Parse the whole system.
+     ((semantic-parse-tree-needs-rebuild-p)
+      (working-status-forms
+          (semantic-parser-working-message (buffer-name)) "done"
+        (setq res (semantic-parse-region (point-min) (point-max)))
+        (working-status t))
+      ;; Clear the caches when we see there were no errors.
+      ;; But preserve the unmatched syntax cache and warnings!
+      (let (semantic-unmatched-syntax-cache
+            semantic-unmatched-syntax-cache-check
+	    semantic-parser-warnings)
+        (semantic-clear-toplevel-cache))
+      ;; Set up the new overlays
+      (semantic--tag-link-list-to-buffer res)
+      ;; Set up the cache with the new results
+      (semantic--set-buffer-cache res)
+      ))))
+  
+  ;; Always return the current parse tree.
+  semantic--buffer-cache)
 
-(defun semantic-deoverlay-list (l)
-  "Remove overlays from the list L."
-  (mapcar 'semantic-deoverlay-token l))
+;;;###autoload
+(defun semantic-refresh-tags-safe ()
+  "Refreshes the current buffer's tags safely.
 
-(defun semantic-overlay-list (l)
-  "Convert numbers to  overlays from the list L."
-  (mapcar 'semantic-overlay-token l))
+Return non-nil if the refresh was successful.
+Return nil if there is some sort of syntax error preventing a reparse.
 
-(defun semantic-deoverlay-cache ()
-  "Convert all tokens in the current cache to use overlay proxies."
-  (semantic-deoverlay-list (semantic-bovinate-toplevel)))
+Does nothing if the current buffer doesn't need reparsing."
 
-(defun semantic-overlay-cache ()
-  "Convert all tokens in the current cache to use overlays."
-  (condition-case nil
-      ;; In this unique case, we cannot call the usual toplevel fn.
-      ;; because we don't want a reparse, we want the old overlays.
-      (semantic-overlay-list semantic-toplevel-bovine-cache)
-    ;; Recover when there is an error restoring the cache.
-    (error (message "Error recovering token list.")
-	   (semantic-clear-toplevel-cache)
-	   nil)))
+  ;; These checks actually occur in `semantic-fetch-tags', but if we
+  ;; do them here, then all the bovination hooks are not run, and
+  ;; we save lots of time.
+  (cond
+   ;; If the buffer was previously marked unparseable,
+   ;; then don't waste our time.
+   ((semantic-parse-tree-unparseable-p)
+    nil)
+   ;; The parse tree is already ok.
+   ((semantic-parse-tree-up-to-date-p)
+    t)
+   (t
+    (let* ((inhibit-quit nil)
+	   (lexically-safe t)
+	   )
+
+      (unwind-protect
+	  ;; Perform the parsing.
+	  (progn
+	    (when (semantic-lex-catch-errors safe-refresh
+		    (save-excursion (semantic-fetch-tags))
+		    nil)
+	      ;; If we are here, it is because the lexical step failed,
+	      ;; proably due to unterminated lists or something like that.
+	    
+	      ;; We do nothing, and just wait for the next idle timer
+	      ;; to go off.  In the meantime, remember this, and make sure
+	      ;; no other idle services can get executed.
+	      (setq lexically-safe nil))
+	    )
+	)
+      ;; Return if we are lexically safe
+      lexically-safe))))
+
+;;;###autoload
+(defun semantic-bovinate-toplevel (&optional ignored)
+  "Backward Compatibility Function."
+  (semantic-fetch-tags))
+;;;###autoload
+(make-obsolete 'semantic-bovinate-toplevel 'semantic-fetch-tags)
+
+;; Another approach is to let Emacs call the parser on idle time, when
+;; needed, use `semantic-fetch-available-tags' to only retrieve
+;; available tags, and setup the `semantic-after-*-hook' hooks to
+;; synchronize with new tags when they become available.
+
+;;;###autoload
+(defsubst semantic-fetch-available-tags ()
+  "Fetch available semantic tags from the current buffer.
+That is, return tags currently in the cache without parsing the
+current buffer.
+Parse operations happen asynchronously when needed on Emacs idle time.
+Use the `semantic-after-toplevel-cache-change-hook' and
+`semantic-after-partial-cache-change-hook' hooks to synchronize with
+new tags when they become available."
+  semantic--buffer-cache)
 
-;;; Token parsing utilities
+;;; Iterative parser helper function
 ;;
-(defun semantic-raw-to-cooked-token (token)
-  "Convert TOKEN from a raw state to a cooked state.
-The parser returns raw tokens with positional data START/END.
-We convert it from that to a cooked state with a property list and an overlay.
-Change the token with side effects and returns TOKEN."
-  (let* ((result nil)
-	 (expandedtokens nil)
-	 (ncdr (- (length token) 2))
-	 (propcdr (if (natnump ncdr) (nthcdr ncdr token)))
-	 (overcdr (cdr propcdr))
-	 ;; propcdr is the CDR containing the START from the token.
-	 ;; overcdr is the CDR containing the END from the token.
-	 ;; PROPCDR will contain the property list after cooking.
-	 ;; OVERCDR will contain the overlay after cooking.
-	 (o (condition-case nil
-		(semantic-make-overlay (car propcdr)
-				       (car overcdr)
-				       (current-buffer)
-				       ;; Examin start/rear
-				       ;; advance flags.
-				       )
-	      (error (debug token)
-		     nil))))
-    ;; Convert START/END into PROPERTIES/OVERLAY.
-    (setcar overcdr o)
-    (setcar propcdr nil)
-    (semantic-overlay-put o 'semantic token)
-    ;; Expand based on local configuration
-    (if (not semantic-expand-nonterminal)
-	;; no expanders
-	(setq result (cons token result))
-      ;; Glom generated tokens
-      (setq expandedtokens (funcall semantic-expand-nonterminal token))
-      (if (not expandedtokens)
-	  (progn (setq result (cons token result))
-		 (semantic-overlay-stack-add o))
-	;; Fixup all overlays, start by deleting the old one
-	(let ((tokenloop expandedtokens) o start end)
-	  (while tokenloop
-	    (setq propcdr (nthcdr (- (length (car tokenloop)) 2)
-				   (car tokenloop))
-		  overcdr (nthcdr (- (length (car tokenloop)) 1)
-				   (car tokenloop))
-		  ;; this will support new overlays created by
-		  ;; the special function, or recycles
-		  start (if (semantic-overlay-live-p (car overcdr))
-			    (semantic-overlay-start (car overcdr))
-			  start)
-		  end (if (semantic-overlay-live-p (car overcdr))
-			  (semantic-overlay-end (car overcdr))
-			end)
-		  o (semantic-make-overlay start end
-					   (current-buffer)))
-	    (if (semantic-overlay-live-p (car overcdr))
-		(semantic-overlay-delete (semantic-token-overlay
-					  (car tokenloop))))
-	    (semantic-overlay-stack-add o)
-	    (setcar propcdr nil)
-	    (setcar overcdr o)
-	    (semantic-overlay-put o 'semantic (car tokenloop))
-	    (setq tokenloop (cdr tokenloop))))
-	(setq result (append expandedtokens result))))
+;; Iterative parsers are better than rule-based iterative functions
+;; in that they can handle obscure errors more cleanly.
+;;
+;; `semantic-repeat-parse-whole-stream' abstracts this action for
+;; other parser centric routines.
+;;
+(defun semantic-repeat-parse-whole-stream
+  (stream nonterm &optional returnonerror)
+  "Iteratively parse the entire stream STREAM starting with NONTERM.
+Optional argument RETURNONERROR indicates that the parser should exit
+with the current results on a parse error.
+This function returns semantic tags without overlays."
+  (let ((result nil)
+        (case-fold-search semantic-case-fold)
+        nontermsym tag)
+    (while stream
+      (setq nontermsym (semantic-parse-stream stream nonterm)
+            tag (car (cdr nontermsym)))
+      (if (not nontermsym)
+          (error "Parse error @ %d" (car (cdr (car stream)))))
+      (if (eq (car nontermsym) stream)
+	  (error "Parser error: Infinite loop?"))
+      (if tag
+          (if (car tag)
+              (setq tag (mapcar
+                         #'(lambda (tag)
+                             ;; Set the 'reparse-symbol property to
+                             ;; NONTERM unless it was already setup
+                             ;; by a tag expander
+                             (or (semantic--tag-get-property
+                                  tag 'reparse-symbol)
+                                 (semantic--tag-put-property
+                                  tag 'reparse-symbol nonterm))
+                             tag)
+                         (semantic--tag-expand tag))
+                    result (append tag result))
+            ;; No error in this case, a purposeful nil means don't
+            ;; store anything.
+            )
+        (if returnonerror
+            (setq stream nil)
+          ;; The current item in the stream didn't match, so add it to
+          ;; the list of syntax items which didn't match.
+          (setq semantic-unmatched-syntax-cache
+                (cons (car stream) semantic-unmatched-syntax-cache))
+          ))
+      ;; Designated to ignore.
+      (setq stream (car nontermsym))
+      (if stream
+          (if (eq semantic-working-type 'percent)
+              (working-status
+               (/ (* 100 (semantic-lex-token-start (car stream)))
+                  (point-max)))
+            (working-dynamic-status))))
     result))
+
+;;; Parsing Warnings:
+;;
+;; Parsing a buffer may result in non-critical things that we should
+;; alert the user to without interrupting the normal flow.
+;;
+;; Any parser can use this API to provide a list of warnings during a
+;; parse which a user may want to investigate.
+(defvar semantic-parser-warnings nil
+  "A list of parser warnings since the last full reparse.")
+(make-variable-buffer-local 'semantic-parser-warnings)
 
-(defun semantic-bovinate-nonterminals (stream nonterm &optional
-					      depth returnonerror)
-  "Bovinate the entire stream STREAM starting with NONTERM.
-DEPTH is optional, and defaults to 0.
-Optional argument RETURNONERROR indicates that the parser should exit with
-the current results on a parse error."
-  (if (not depth) (setq depth semantic-flex-depth))
-  (let ((result nil) (case-fold-search semantic-case-fold))
-    (while stream
-      (let* ((nontermsym
-	      (semantic-bovinate-nonterminal
-	       stream semantic-toplevel-bovine-table nonterm))
-	     (stream-overlays (car (cdr (cdr nontermsym))))
-	     (token (car (cdr nontermsym))))
-	(if (not nontermsym)
-	    (error "Parse error @ %d" (car (cdr (car stream)))))
-	(semantic-overlay-stack-add stream-overlays)
-	(if token
-	    (if (car token)
-		(progn
-		  (setq result (append (semantic-raw-to-cooked-token token)
-				       result))
-		  ;; Place the nonterm into the token.
-		  (if (not (eq nonterm 'bovine-toplevel))
-		      (semantic-token-put token 'reparse-symbol nonterm)))
-	      ;; No error in this case, a purposeful nil means don't store
-	      ;; anything.
-	      )
-	  (if returnonerror (setq stream nil))
-	  ;;(error "Parse error")
-	  )
-	;; Designated to ignore.
-	(setq stream (car nontermsym)))
-      (if stream
-	  (if (eq semantic-bovination-working-type 'percent)
-	      (working-status (floor
-			       (* 100.0 (/ (float (car (cdr (car stream))))
-					   (float (point-max))))))
-	    (working-dynamic-status))))
-    result))
+(defun semantic-clear-parser-warnings ()
+  "Clear the current list of parser warnings for this buffer."
+  (setq semantic-parser-warnings nil))
 
-(defun semantic-remove-dirty-children-internal (token dirties)
-  "Remove TOKEN children from DIRTIES.
-Return the new value of DIRTIES."
-  (if dirties
-      (let ((children (semantic-nonterminal-children token t))
-            child)
-        (while (and children dirties)
-          (setq child (car children)
-                children (cdr children)
-                dirties  (semantic-remove-dirty-children-internal
-                          child (delq child dirties))))))
-  dirties)
+(defun semantic-push-parser-warning (warning start end)
+  "Add a parser WARNING that covers text from START to END."
+  (setq semantic-parser-warnings
+	(cons (cons warning (cons start end))
+	      semantic-parser-warnings)))
 
-(defun semantic-remove-dirty-children (token)
-  "Remove TOKEN children from the list of dirty tokens.
-This must be done before deoverlaying TOKEN.  At this point (when
-called by `semantic-rebovinate-token') TOKEN is the first element of
-`semantic-dirty-tokens' so only the rest of `semantic-dirty-tokens' is
-considered."
-  (setq semantic-dirty-tokens
-        (cons (car semantic-dirty-tokens)
-              (semantic-remove-dirty-children-internal
-               token (cdr semantic-dirty-tokens)))))
+(defun semantic-dump-parser-warnings ()
+  "Dump any parser warnings."
+  (interactive)
+  (if semantic-parser-warnings
+      (let ((pw semantic-parser-warnings))
+	(pop-to-buffer "*Parser Warnings*")
+	(require 'pp)
+	(erase-buffer)
+	(insert (pp-to-string pw))
+	(goto-char (point-min)))
+    (message "No parser warnings.")))
 
-(defun semantic-rebovinate-token (token)
-  "Use TOKEN for extents, and reparse it, splicing it back into the cache."
-  (let* ((flexbits (semantic-flex (semantic-token-start token)
-				  (semantic-token-end token)))
-	 ;; For embeded tokens (type parts, for example) we need a
-	 ;; different symbol.  Come up with a plan to solve this.
-	 (nonterminal (or (semantic-token-get token 'reparse-symbol)
-			  'bovine-toplevel))
-	 (new (condition-case nil
-                  (semantic-bovinate-nonterminal
-                   flexbits
-                   semantic-toplevel-bovine-table
-                   nonterminal)
-                ;; Trap `read' errors which may temporarily occurs
-                ;; when re-parsing a dirty Elisp token.
-                (end-of-file 'delay)
-                (invalid-read-syntax 'delay)))
-	 (cooked nil)
-	 )
-    (if (eq new 'delay)
-        ;; If a `read' error occured during re-parsing of an Elisp
-        ;; token just delay rebovination.  Thus features like Semantic
-        ;; completion could continue to work until a clean syntax
-        ;; state is reached and re-parse succeeds.
-        nil
-      (setq new (car (cdr new)))
-      (if (not new)
-          ;; Clever reparse failed, queuing full reparse.
-          (setq semantic-toplevel-bovine-cache-check t)
-        (setq cooked (semantic-raw-to-cooked-token new))
-        (if (not (eq new (car cooked)))
-            (if (= (length cooked) 1)
-                ;; Cooking did a 1 to 1 replacement.  Use it.
-                (setq new (car cooked))
-	      ;; If cooking results in multiple things, do a full reparse.
-              (setq semantic-toplevel-bovine-cache-check t))))
-      ;; Don't do much if we have to do a full recheck.
-      (if semantic-toplevel-bovine-cache-check
-          nil
-        (let ((oo (semantic-token-overlay token))
-              (o (semantic-token-overlay new)))
-          ;; Copy all properties of the old overlay here.
-          ;; I think I can use plists in emacs, but not in XEmacs.
-          ;; Ack!
-          (semantic-overlay-put o 'face (semantic-overlay-get oo 'face))
-          (semantic-overlay-put o 'old-face (semantic-overlay-get oo 'old-face))
-          (semantic-overlay-put o 'intangible (semantic-overlay-get oo 'intangible))
-          (semantic-overlay-put o 'invisible (semantic-overlay-get oo 'invisible))
-          ;; Remove TOKEN children from `semantic-dirty-tokens'
-          (semantic-remove-dirty-children token)
-          ;; Free the old overlay(s)
-          (semantic-deoverlay-token token)
-          ;; Recover properties
-          (let ((p (semantic-token-properties token)))
-            (while p
-              (semantic-token-put new (car (car p)) (cdr (car p)))
-              (setq p (cdr p))))
-          (if (not (eq nonterminal 'bovine-toplevel))
-              (semantic-token-put new 'reparse-symbol nonterminal))
-          (semantic-token-put new 'dirty nil)
-          ;; Splice into the main list.
-          (setcdr token (cdr new))
-          (setcar token (car new))
-	  ;; This important bit is because the CONS cell representing TOKEN
-	  ;; is what we need here, even though the whole thing is the same.
-          (semantic-overlay-put o 'semantic token)
-          ;; Hooks
-          (run-hook-with-args 'semantic-clean-token-hooks token)
-          )
-        ))))
 
 
-;;; Semantic Bovination
+;;; Compatibility:
 ;;
-;; Take a semantic token stream, and convert it using the bovinator.
-;; The bovinator takes a state table, and converts the token stream
-;; into a new semantic stream defined by the bovination table.
+;; Semantic 1.x parser action helper functions, used by some parsers.
+;; Please move away from these functions, and try using semantic 2.x
+;; interfaces instead.
 ;;
-(defsubst semantic-bovinate-symbol-nonterminal-p (sym table)
-  "Return non-nil if SYM is in TABLE, indicating it is NONTERMINAL."
-  ;; sym is always a sym, so assq should be ok.
-  (if (assq sym table) t nil))
+(defsubst semantic-bovinate-region-until-error
+  (start end nonterm &optional depth)
+  "NOTE: Use `semantic-parse-region' instead.
 
-(defmacro semantic-bovinate-nonterminal-db-nt ()
-  "Return the current nonterminal symbol.
-Part of the BNF source debugger.  Depends on the existing environment
-of `semantic-bovinate-nonterminal'."
-  `(if nt-stack
-       (car (aref (car nt-stack) 2))
-     nonterminal))
-
-(defun semantic-bovinate-nonterminal-check (stream nonterminal)
-  "Check if STREAM not already parsed for NONTERMINAL.
-If so abort because an infinite recursive parse is suspected."
-  (or (vectorp semantic-bovinate-nonterminal-check-obarray)
-      (setq semantic-bovinate-nonterminal-check-obarray
-            (make-vector 13 nil)))
-  (let* ((nt (symbol-name nonterminal))
-         (vs (symbol-value
-              (intern-soft
-               nt semantic-bovinate-nonterminal-check-obarray))))
-    (if (memq stream vs)
-        ;; Always enter debugger to see the backtrace
-        (let ((debug-on-signal t)
-              (debug-on-error  t))
-          (setq semantic-bovinate-nonterminal-check-obarray nil)
-          (error "Infinite recursive parse suspected on %s" nt))
-      (set (intern nt semantic-bovinate-nonterminal-check-obarray)
-           (cons stream vs)))))
-
-(defun semantic-bovinate-nonterminal (stream table &optional nonterminal)
-  "Bovinate STREAM based on the TABLE of nonterminal symbols.
-Optional argument NONTERMINAL is the nonterminal symbol to start with.
-Use `bovine-toplevel' if it is not provided.
-This is the core routine for converting a stream into a table.
-Return the list (STREAM SEMANTIC-STREAM OVERLAYS) where STREAM are those
-elements of STREAM that have not been used.  SEMANTIC-STREAM is the
-list of semantic tokens found.  OVERLAYS is the list of overlays found
-so far, to be used in the error recovery stack."
-  (if (not nonterminal)
-      (setq nonterminal 'bovine-toplevel))
-
-  ;; Try to detect infinite recursive parse when doing a full reparse.
-  (or semantic-toplevel-bovine-cache
-      (semantic-bovinate-nonterminal-check stream nonterminal))
-
-  (let ((matchlist (cdr (assq nonterminal table)))
-	(starting-stream stream)
-        (nt-loop  t)             ;non-terminal loop condition
-        nt-popup                 ;non-nil if return from nt recursion
-        nt-stack                 ;non-terminal recursion stack
-        s                        ;Temp Stream Tracker
-        lse                      ;Local Semantic Element
-        lte                      ;Local matchlist element
-        tev                      ;Matchlist entry values from buffer
-        val                      ;Value found in buffer.
-        cvl                      ;collected values list.
-        out                      ;Output
-        end                      ;End of match
-        result
-        semantic-overlay-error-recovery-stack ;part of error recovery
-        )
-    (while nt-loop
-      (catch 'push-non-terminal
-        (setq semantic-overlay-error-recovery-stack nil
-              nt-popup nil
-              end (cdr (cdr (car stream))))
-        (while (or nt-loop nt-popup)
-          (setq nt-loop nil
-                out     nil)
-          (while (or nt-popup matchlist)
-            (if nt-popup
-                ;; End of a non-terminal recursion
-                (setq nt-popup nil)
-              ;; New matching process
-              (setq s   stream           ;init s from stream.
-                    cvl nil              ;re-init the collected value list.
-                    lte (car matchlist)  ;Get the local matchlist entry.
-                    )
-              (if (or (byte-code-function-p (car lte))
-                      (listp (car lte)))
-                  ;; In this case, we have an EMPTY match!  Make stuff
-                  ;; up.
-                  (setq cvl (list nil))))
-            
-            (while (and lte
-                        (not (byte-code-function-p (car lte)))
-                        (not (listp (car lte))))
-
-              ;; BNF SOURCE DEBUGGING!
-              (if semantic-edebug
-                  (let* ((db-nt   (semantic-bovinate-nonterminal-db-nt))
-                         (db-ml   (cdr (assq db-nt table)))
-                         (db-mlen (length db-ml))
-                         (db-midx (- db-mlen (length matchlist)))
-                         (db-tlen (length (nth db-midx db-ml)))
-                         (db-tidx (- db-tlen (length lte))))
-                    (if (eq 'fail
-                            (semantic-bovinate-show
-                             (car s) db-nt db-midx db-tidx cvl))
-                        (setq lte '(trash 0 . 0)))))
-              ;; END BNF SOURCE DEBUGGING!
-              
-              (cond
-               ;; We have a nonterminal symbol.  Recurse inline.
-               ((setq nt-loop (assq (car lte) table))
-          
-                (setq
-                 ;; push state into the nt-stack
-                 nt-stack (cons (vector matchlist cvl lte stream end
-                                        ;; error recovery
-                                        semantic-overlay-error-recovery-stack
-                                        )
-                                nt-stack)
-                 ;; new non-terminal matchlist
-                 matchlist   (cdr nt-loop)
-                 ;; new non-terminal stream
-                 stream      s)
-               
-                (throw 'push-non-terminal t)
-
-                )
-               ;; Default case
-               (t
-                (setq lse (car s)       ;Get the local stream element
-                      s   (cdr s))      ;update stream.
-                ;; Do the compare
-                (if (eq (car lte) (car lse)) ;syntactic match
-                    (let ((valdot (cdr lse)))
-                      (setq val (semantic-flex-text lse))
-                      ;; DEBUG SECTION
-                      (if semantic-dump-parse
-                          (semantic-dump-detail
-                           (if (stringp (car (cdr lte)))
-                               (list (car (cdr lte)) (car lte))
-                             (list (car lte)))
-                           (semantic-bovinate-nonterminal-db-nt)
-                           val
-                           (if (stringp (car (cdr lte)))
-                               (if (string-match (car (cdr lte)) val)
-                                   "Term Match" "Term Fail")
-                             "Term Type=")))
-                      ;; END DEBUG SECTION
-                      (setq lte (cdr lte))
-                      (if (stringp (car lte))
-                          (progn
-                            (setq tev (car lte)
-                                  lte (cdr lte))
-                            (if (string-match tev val)
-                                (setq cvl (cons
-                                           (if (memq (car lse)
-                                                     '(comment semantic-list))
-                                               valdot val)
-                                           cvl)) ;append this value
-                              (semantic-overlay-stack-clear)
-                              (setq lte nil cvl nil))) ;clear the entry (exit)
-                        (setq cvl (cons
-                                   (if (memq (car lse)
-                                             '(comment semantic-list))
-                                       valdot val) cvl))) ;append unchecked value.
-                      (setq end (cdr (cdr lse)))
-                      )
-                  (if (and semantic-dump-parse nil)
-                      (semantic-dump-detail (car lte)
-                                            (semantic-bovinate-nonterminal-db-nt)
-                                            (semantic-flex-text lse)
-                                            "Term Type Fail"))
-                  (semantic-overlay-stack-clear)
-                  (setq lte nil cvl nil)) ;No more matches, exit
-                )))
-            (if (not cvl)               ;lte=nil;  there was no match.
-                (setq matchlist (cdr matchlist)) ;Move to next matchlist entry
-              (let ((start (car (cdr (car stream)))))
-                (setq out (cond
-                           ((car lte)
-                        
-                            ;; REMOVE THIS TO USE THE REFERENCE/COMPARE CODE
-                            ;;(let ((o (apply (car lte) ;call matchlist fn on values
-                            ;;                (nreverse cvl) start (list end))))
-                            ;;  (if semantic-bovinate-create-reference
-                            ;;      (semantic-bovinate-add-reference o))
-                            ;;  (if semantic-bovinate-compare-reference
-                            ;;      (semantic-bovinate-compare-against-reference o))
-                            ;;  o
-                            ;;  )
-                            
-                            (funcall (car lte) ;call matchlist fn on values
-                                     (nreverse cvl) start end))
-                           ((and (= (length cvl) 1)
-                                 (listp (car cvl))
-                                 (not (numberp (car (car cvl)))))
-                            (append (car cvl) (list start end)))
-                           (t
-                            ;;(append (nreverse cvl) (list start end))))
-                            ;; MAYBE THE FOLLOWING NEEDS LESS CONS
-                            ;; CELLS THAN THE ABOVE?
-                            (nreverse (cons end (cons start cvl)))))
-                      matchlist nil) ;;generate exit condition
-                (if (not end)
-                    (setq out nil)))
-              ;; Nothin?
-              ))
-	  (setq result
-		(if (eq s starting-stream)
-		    (list (cdr s) nil
-			  semantic-overlay-error-recovery-stack)
-		  (list s out
-			semantic-overlay-error-recovery-stack)))
-          (if nt-stack
-              ;; pop previous state from the nt-stack
-              (let ((state (car nt-stack))
-                    (ov semantic-overlay-error-recovery-stack))
-
-                (setq nt-popup    t
-                      ;; pop actual parser state
-                      matchlist   (aref state 0)
-                      cvl         (aref state 1)
-                      lte         (aref state 2)
-                      stream      (aref state 3)
-                      end         (aref state 4)
-                      ;; pop error recovery state
-                      semantic-overlay-error-recovery-stack (aref state 5)
-                      ;; update the stack
-                      nt-stack    (cdr nt-stack))
-                
-                (if ov
-                    (semantic-overlay-stack-add ov))
-                
-                (if out
-                    (let ((len (length out))
-                          (strip (nreverse (cdr (cdr (reverse out))))))
-                      (if semantic-dump-parse
-                          (semantic-dump-detail (cdr result)
-                                                (car lte)
-                                                ""
-                                                "NonTerm Match"))
-                      (setq end (nth (1- len) out) ;reset end to the end of exp
-                            cvl (cons strip cvl) ;prepend value of exp
-                            lte (cdr lte)) ;update the local table entry
-                      )
-                  ;; No value means that we need to terminate this
-                  ;; match.
-                  (semantic-overlay-stack-clear)
-                  (setq lte nil cvl nil)) ;No match, exit
-                )))))
-    result))
-
-
-;;; Bovine table functions
-;;
-;; These are functions that can be called from within a bovine table.
-;; Most of these have code auto-generated from other construct in the BNF.
-(defmacro semantic-lambda (&rest return-val)
-  "Create a lambda expression to return a list including RETURN-VAL.
-The return list is a lambda expression to be used in a bovine table."
-  `(lambda (vals start end)
-     (append ,@return-val (list start end))))
-
-(defun semantic-bovinate-from-nonterminal (start end nonterm
-						 &optional depth length)
-  "Bovinate from within a nonterminal lambda from START to END.
-Depends on the existing environment created by `semantic-bovinate-stream'.
-Argument NONTERM is the nonterminal symbol to start with.
-Optional argument DEPTH is the depth of lists to dive into.
-Whan used in a `lambda' of a MATCH-LIST, there is no need to include
-a START and END part.
-Optional argument LENGTH specifies we are only interested in LENGTH tokens."
-  (car-safe (cdr (semantic-bovinate-nonterminal
-		  (semantic-flex start end (or depth 1) length)
-		  ;; the byte compiler will complain about TABLE
-		  table
-		  nonterm))))
-
-(defun semantic-bovinate-from-nonterminal-full (start end nonterm
-						      &optional depth)
-  "Bovinate from within a nonterminal lambda from START to END.
-Iterates until all the space between START and END is exhausted.
-Depends on the existing environment created by `semantic-bovinate-stream'.
-Argument NONTERM is the nonterminal symbol to start with.
-If NONTERM is nil, use `bovine-block-toplevel'.
-Optional argument DEPTH is the depth of lists to dive into.
-Whan used in a `lambda' of a MATCH-LIST, there is no need to include
-a START and END part."
-  (nreverse
-   (semantic-bovinate-nonterminals (semantic-flex start end (or depth 1))
-				   nonterm
-				   depth)))
-
-(defun semantic-bovinate-region-until-error (start end nonterm &optional depth)
-  "Bovinate between START and END starting with NONTERM.
-Optinal DEPTH specifies how many levels of parenthesis to enter.
+Bovinate between START and END starting with NONTERM.
+Optional DEPTH specifies how many levels of parenthesis to enter.
 This command will parse until an error is encountered, and return
 the list of everything found until that moment.
 This is meant for finding variable definitions at the beginning of
 code blocks in methods.  If `bovine-inner-scope' can also support
 commands, use `semantic-bovinate-from-nonterminal-full'."
-  (nreverse
-   (semantic-bovinate-nonterminals (semantic-flex start end depth)
-				   nonterm
-				   depth
-				   ;; This says stop on an error.
-				   t)))
+  (semantic-parse-region start end nonterm depth t))
+(make-obsolete 'semantic-bovinate-region-until-error
+               'semantic-parse-region)
 
-(defun semantic-bovinate-make-assoc-list (&rest args)
-  "Create an association list with ARGS.
-Args are of the form (KEY1 VALUE1 ... KEYN VALUEN).
-The return value will be of the form: ((KEY1 .  VALUE1) ... (KEYN . VALUEN))
-Where KEY is a symbol, and VALUE is the value for that symbol.
-If VALUE is nil, then KEY is excluded from the return association list."
-  (let ((ret nil))
-    (while args
-      (let ((value (car-safe (cdr args))))
-	(if (and value
-		 (or (not (stringp value))
-		     (not (string= value "")))
-		 (or (not (numberp value))
-		     (not (= value 0))))
-	    (setq ret (cons (cons (car args) (car (cdr args))) ret)))
-	(setq args (cdr (cdr args)))))
-    (nreverse ret)))
-
-;;; Debugging in bovine tables
-;;
-(defun semantic-dump-buffer-init ()
-  "Initialize the semantic dump buffer."
-  (save-excursion
-    (let ((obn (buffer-name)))
-      (set-buffer (get-buffer-create "*Semantic Dump*"))
-      (erase-buffer)
-      (insert "Parse dump of " obn "\n\n")
-      (insert (format "%-15s %-15s %10s %s\n\n"
-		      "Nonterm" "Comment" "Text" "Context"))
-      )))
+(defsubst semantic-bovinate-from-nonterminal
+  (start end nonterm &optional depth length)
+  "Bovinate from within a nonterminal lambda from START to END.
+Argument NONTERM is the nonterminal symbol to start with.
+Optional argument DEPTH is the depth of lists to dive into.  When used
+in a `lambda' of a MATCH-LIST, there is no need to include a START and
+END part.
+Optional argument LENGTH specifies we are only interested in LENGTH
+tokens."
+  (car-safe (cdr (semantic-parse-stream
+		  (semantic-lex start end (or depth 1) length)
+		  nonterm))))
 
-(defun semantic-dump-detail (lse nonterminal text comment)
-  "Dump info about this match.
-Argument LSE is the current syntactic element.
-Argument NONTERMINAL is the nonterminal matched.
-Argument TEXT is the text to match.
-Argument COMMENT is additional description."
-  (save-excursion
-    (set-buffer "*Semantic Dump*")
-    (goto-char (point-max))
-    (insert (format "%-15S %-15s %10s %S\n" nonterminal comment text lse)))
-  )
+(defsubst semantic-bovinate-from-nonterminal-full
+  (start end nonterm &optional depth)
+  "NOTE: Use `semantic-parse-region' instead.
 
-(defvar semantic-bovinate-debug-table nil
-  "A marker where the current table we are debugging is.")
-
-(defun semantic-bovinate-debug-set-table ()
-  "Set the table for the next debug to be here."
-  (interactive)
-  (if (not (eq major-mode 'emacs-lisp-mode))
-      (error "Not an Emacs Lisp file"))
-  (beginning-of-defun)
-  (setq semantic-bovinate-debug-table (point-marker)))
-
-;; We will get warnings in here about semantic-bnf-* fns.
-;; We cannot require semantic-bnf due to compile eerrors.
-(defun semantic-bovinate-debug-buffer ()
-  "Bovinate the current buffer in debug mode."
-  (interactive)
-  (if (and (not semantic-toplevel-bovine-table-source)
-	   (not semantic-bovinate-debug-table))
-      (error
-       "Call `semantic-bovinate-debug-set-table' from your semantic table"))
-  (delete-other-windows)
-  (split-window-vertically)
-  (if semantic-bovinate-debug-table
-      (switch-to-buffer (marker-buffer semantic-bovinate-debug-table))
-    (if (not semantic-toplevel-bovine-table-source)
-        (error "No debuggable BNF source found"))
-    (require 'semantic-bnf)
-    (switch-to-buffer (semantic-bnf-find-source-on-load-path
-                       semantic-toplevel-bovine-table-source)))
-  (other-window 1)
-  (semantic-clear-toplevel-cache)
-  (let ((semantic-edebug t))
-    (semantic-bovinate-toplevel)))
-
-(defun semantic-bovinate-show (lse nonterminal matchlen tokenlen collection)
-  "Display some info about the current parse.
-Returns 'fail if the user quits, nil otherwise.
-LSE is the current listed syntax element.
-NONTERMINAL is the current nonterminal being parsed.
-MATCHLEN is the number of match lists tried.
-TOKENLEN is the number of match tokens tried.
-COLLECTION is the list of things collected so far."
-  (let* ((semantic-edebug nil)
-         (ol1 nil) (ol2 nil) (ret nil)
-         (bnf-buffer (semantic-bnf-find-source-on-load-path
-                      semantic-toplevel-bovine-table-source)))
-    (unwind-protect
-	(progn
-	  (goto-char (car (cdr lse)))
-	  (setq ol1 (semantic-make-overlay (car (cdr lse)) (cdr (cdr lse))))
-	  (semantic-overlay-put ol1 'face 'highlight)
-	  (goto-char (car (cdr lse)))
-	  (if window-system nil (sit-for 1))
-	  (other-window 1)
-	  (let (s e)
-	    (if semantic-bovinate-debug-table
-		(progn
-		  (set-buffer (marker-buffer semantic-bovinate-debug-table))
-		  (goto-char semantic-bovinate-debug-table)
-		  (re-search-forward
-		   (concat "^\\s-*\\((\\|['`]((\\)\\(" (symbol-name nonterminal)
-			   "\\)[ \t\n]+(")
-		   nil t)
-		  (setq s (match-beginning 2)
-			e (match-end 2))
-		  (forward-char -2)
-		  (forward-list matchlen)
-		  (skip-chars-forward " \t\n(")
-		  (forward-sexp tokenlen)
-		  )
-	      ;; The user didn't specify a lisp level table.
-	      ;; go to the source...
-	      (set-buffer bnf-buffer)
-	      (semantic-bnf-find-state-position
-	       nonterminal matchlen tokenlen)
-	      (save-excursion
-		(goto-char (semantic-token-start (semantic-current-nonterminal)))
-		(setq s (point)
-		      e (progn (forward-sexp 1) (point))))
-	      )
-	    (setq ol2 (semantic-make-overlay s e))
-	    (semantic-overlay-put ol2 'face 'highlight)
-	    )
-	  (message "%s: %S" lse collection)
-	  (let ((e (semantic-read-event)))
-	    (cond ((eq e ?f)		;force a failure on this symbol.
-		   (setq ret 'fail))
-		  (t nil)))
-	  (other-window 1)
-	  )
-      (semantic-overlay-delete ol1)
-      (semantic-overlay-delete ol2))
-    ret))
-
-;;; Reference Debugging
-;;
-(defvar semantic-bovinate-create-reference nil
-  "Non nil to create a reference.")
-
-(defvar semantic-bovinate-reference-token-list nil
-  "A list generated as a referece (assumed valid).
-A second pass comares return values against this list.")
-
-(defun semantic-bovinate-add-reference (ref)
-  "Add REF to the reference list."
-  (setq semantic-bovinate-reference-token-list
-	(cons ref semantic-bovinate-reference-token-list)))
-
-(defvar semantic-bovinate-compare-reference nil
-  "Non nil to compare against a reference list.")
-
-(defvar semantic-bovinate-reference-temp-list nil
-  "List used when doing a compare.")
-
-(defun semantic-bovinate-compare-against-reference (ref)
-  "Compare REF against what was returned last time."
-  (if (not (equal ref (car semantic-bovinate-reference-temp-list)))
-      (let ((debug-on-error t))
-	(error "Stop: %d %S != %S"
-	       (- (length semantic-bovinate-reference-token-list)
-		  (length semantic-bovinate-reference-temp-list))
-	       (car semantic-bovinate-reference-temp-list)
-	       ref))
-    (setq semantic-bovinate-reference-temp-list
-	  (cdr semantic-bovinate-reference-temp-list))))
-	   
-(defun bovinate-create-reference ()
-  "Create a reference list."
-  (interactive)
-  (condition-case nil
-      (progn
-	(semantic-clear-toplevel-cache)
-	(setq semantic-bovinate-create-reference t
-	      semantic-bovinate-reference-token-list nil)
-	(bovinate)
-	(setq semantic-bovinate-reference-token-list
-	      (nreverse semantic-bovinate-reference-token-list)))
-    (error nil))
-  (setq semantic-bovinate-create-reference nil))
-
-(defun bovinate-reference-compare ()
-  "Compare the current parsed output to the reference list.
-Create a reference with `bovinate-create-reference'."
-  (interactive)
-  (let ((semantic-bovinate-compare-reference t))
-    (semantic-clear-toplevel-cache)
-    (setq semantic-bovinate-reference-temp-list
-	  semantic-bovinate-reference-token-list)
-    (bovinate)))
-
-
-;;; Semantic Flexing
-;;
-;; This is a simple scanner which uses the syntax table to generate
-;; a stream of simple tokens.
-;;
-;; A flex element is of the form:
-;;  (SYMBOL START . END)
-;; Where symbol is the type of thing it is.  START and END mark that
-;; objects boundary.
-
-(eval-and-compile (if (not (fboundp 'with-syntax-table))
-
-;; Copied from Emacs 21 for compatibility with released Emacses.
-(defmacro with-syntax-table (table &rest body)
-  "Evaluate BODY with syntax table of current buffer set to a copy of TABLE.
-The syntax table of the current buffer is saved, BODY is evaluated, and the
-saved table is restored, even in case of an abnormal exit.
-Value is what BODY returns."
-  (let ((old-table (make-symbol "table"))
-	(old-buffer (make-symbol "buffer")))
-    `(let ((,old-table (syntax-table))
-	   (,old-buffer (current-buffer)))
-       (unwind-protect
-	   (progn
-	     (set-syntax-table (copy-syntax-table ,table))
-	     ,@body)
-	 (save-current-buffer
-	   (set-buffer ,old-buffer)
-	   (set-syntax-table ,old-table))))))
-
-))
-
-;;; Keyword Table Handling.
-;;
-(defvar semantic-flex-keywords-obarray nil
-  "Buffer local keyword obarray for the lexical analyzer.
-These keywords are matched explicitly, and converted into special symbols.")
-(make-variable-buffer-local 'semantic-flex-keywords-obarray)
-
-(defun semantic-flex-make-keyword-table (keywords &optional propertyalist)
-  "Convert a list of KEYWORDS into an obarray.
-Save the obarry into `semantic-flex-keywords-obarray'.
-If optional argument PROPERTYALIST is non nil, then interpret it, and
-apply those properties"
-  ;; Create the symbol hash table
-  (let ((obarray (make-vector 13 nil)))
-    ;; fill it with stuff
-    (while keywords
-      (set (intern (car (car keywords)) obarray)
-	   (cdr (car keywords)))
-      (setq keywords (cdr keywords)))
-    ;; Apply all properties
-    (let ((semantic-flex-keywords-obarray obarray))
-      (while propertyalist
-	(semantic-flex-keyword-put (car (car propertyalist))
-				   (nth 1 (car propertyalist))
-				   (nth 2 (car propertyalist)))
-	(setq propertyalist (cdr propertyalist))))
-    obarray))
-
-(defun semantic-flex-keyword-p (text)
-  "Return a symbol if TEXT is a keyword in the keyword table.
-Return nil if TEXT is not in the symbol table."
-  (let ((sym (intern-soft text semantic-flex-keywords-obarray)))
-    (if sym (symbol-value sym))))
-
-(defun semantic-flex-keyword-put (text property value)
-  "For keyword TEXT, set PROPERTY to have VALUE."
-  (let ((sym (intern-soft text semantic-flex-keywords-obarray)))
-    (if (not sym) (signal 'wrong-type-argument (list text 'keyword)))
-    (put sym property value)))
-
-(defun semantic-flex-keyword-get (text property)
-  "For keyword TEXT, get the value of PROPERTY."
-  (let ((sym (intern-soft text semantic-flex-keywords-obarray)))
-    (if (not sym) (signal 'wrong-type-argument (list text 'keyword)))
-    (get sym property)))
-
-;; David Ponce
-(defun semantic-flex-map-keywords (fun &optional property)
-  "Call function FUN on every semantic keyword.
-If optional PROPERTY is non-nil call FUN only on every keyword which
-have a PROPERTY value.  FUN receives a semantic keyword as argument."
-  (if (arrayp semantic-flex-keywords-obarray)
-      (mapatoms
-       (function
-        (lambda (keyword)
-          (and keyword
-               (or (null property) (get keyword property))
-               (funcall fun keyword))))
-       semantic-flex-keywords-obarray)))
-
-;; David Ponce
-(defun semantic-flex-keywords (&optional property)
-  "Return a list of semantic keywords.
-If optional PROPERTY is non-nil return only keyword which have a
-PROPERTY value."
-  (let (keywords)
-    (semantic-flex-map-keywords
-     (function
-      (lambda (keyword)
-        (setq keywords (cons keyword keywords))))
-     property)
-    keywords))
-
-;;; Lexical Analysis
-;;
-(defvar semantic-flex-extensions nil
-  "Buffer local extensions to the lexical analyzer.
-This should contain an alist with a key of a regex and a data element of
-a function.  The function should both move point, and return a lexical
-token of the form:
-  ( TYPE START .  END)
-nil is also a valid return.
-TYPE can be any type of symbol, as long as it doesn't occur as a
-nonterminal in the language definition.")
-(make-variable-buffer-local 'semantic-flex-extensions)
-
-(defvar semantic-flex-syntax-modifications nil
-  "Updates to the syntax table for this buffer.
-These changes are active only while this file is being flexed.
-This is a list where each element is of the form:
-  (CHAR CLASS)
-Where CHAR is the char passed to `modify-syntax-entry',
-and CLASS is the string also passed to `modify-syntax-entry' to define
-what class of syntax CHAR is.")
-(make-variable-buffer-local 'semantic-flex-syntax-modifications)
-
-(defvar semantic-flex-enable-newlines nil
-  "When flexing, report 'newlines as syntactic elements.
-Useful for languages where the newline is a special case terminator.
-Only set this on a per mode basis, not globally.")
-(make-variable-buffer-local 'semantic-flex-enable-newlines)
-
-(defun semantic-flex-buffer (&optional depth)
-  "Sematically flex the current buffer.
-Optional argument DEPTH is the depth to scan into lists."
-  (semantic-flex (point-min) (point-max) depth))
-
-(defun semantic-flex (start end &optional depth length)
-  "Using the syntax table, do something roughly equivalent to flex.
-Semantically check between START and END.  Optional argument DEPTH
-indicates at what level to scan over entire lists.
-The return value is a token stream.  Each element being a list, such
-as (symbol start-expression .  end-expresssion).
-END does not mark the end of text scanned, only the end of the beginning
-of text scanned.  Thus, if a string extended past END, the end of the
-return token will be larger than END.  To truly restrict scanning, using
-narrow-to-region'.
-The last argument, LENGTH specifies that `semantic-flex' should only return
-LENGTH tokens."
-  ;(message "Flexing muscles...")
-  (if (not semantic-flex-keywords-obarray)
-      (setq semantic-flex-keywords-obarray [ nil ]))
-  (let ((ts nil)
-	(sym nil)
-	(pos (point))
-	(ep nil)
-	(curdepth 0)
-	(cs (if comment-start-skip
-		(concat "\\(\\s<\\|" comment-start-skip "\\)")
-	      (concat "\\(\\s<\\)")))
-	(newsyntax (copy-syntax-table (syntax-table)))
-	(mods semantic-flex-syntax-modifications)
-	;; Use the default depth if it is not specified.
-	(depth (or depth semantic-flex-depth)))
-    ;; Update the syntax table
-    (while mods
-      (modify-syntax-entry (car (car mods)) (car (cdr (car mods))) newsyntax)
-      (setq mods (cdr mods)))
-    (with-syntax-table newsyntax
-      (goto-char start)
-      (while (and (< (point) end) (or (not length) (<= (length ts) length)))
-	(cond (;; catch newlines when needed
-	       (and semantic-flex-enable-newlines
-		    (looking-at "\\s-*\\(\n\\)"))
-	       (setq ep (match-end 1)
-		     ts (cons (cons 'newline
-				    (cons (match-beginning 1) ep))
-			      ts)))
-	      ;; special extentions, sometimes includes some whitespace.
-	      ((and semantic-flex-extensions
-		    (let ((fe semantic-flex-extensions)
-			  (r nil))
-		      (while fe
-			(if (looking-at (car (car fe)))
-			    (setq ts (cons (funcall (cdr (car fe))) ts)
-				  r t
-				  fe nil
-				  ep (point)))
-			(setq fe (cdr fe)))
-		      (if (and r (not (car ts))) (setq ts (cdr ts)))
-		      r)))
-	      ;; comment end is also EOL for some languages.
-	      ((looking-at "\\(\\s-\\|\\s>\\)+"))
-	      ;; symbols
-	      ((looking-at "\\(\\sw\\|\\s_\\)+")
-	       (setq ts (cons (cons
-			       ;; Get info on if this is a keyword or not
-			       (or (semantic-flex-keyword-p (match-string 0))
-				   'symbol)
-			       (cons (match-beginning 0) (match-end 0)))
-			      ts)))