Mercurial > emacs
view lisp/nxml/nxml-parse.el @ 110523:a5ad4f188e19
Synch Semantic to CEDET 1.0.
Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog.
* semantic.el (semantic-version): Update to 2.0.
(semantic-mode-map): Add "," and "m" bindings.
(navigate-menu): Update.
* semantic/symref.el (semantic-symref-calculate-rootdir):
New function.
(semantic-symref-detect-symref-tool): Use it.
* semantic/symref/grep.el (semantic-symref-grep-shell): New var.
(semantic-symref-perform-search): Use it. Calculate root dir with
semantic-symref-calculate-rootdir.
(semantic-symref-derive-find-filepatterns): Improve error message.
* semantic/symref/list.el
(semantic-symref-results-mode-map): New bindings.
(semantic-symref-auto-expand-results): New option.
(semantic-symref-results-dump): Obey auto-expand.
(semantic-symref-list-expand-all, semantic-symref-regexp)
(semantic-symref-list-contract-all)
(semantic-symref-list-map-open-hits)
(semantic-symref-list-update-open-hits)
(semantic-symref-list-create-macro-on-open-hit)
(semantic-symref-list-call-macro-on-open-hits): New functions.
(semantic-symref-list-menu-entries)
(semantic-symref-list-menu): New vars.
(semantic-symref-list-map-open-hits): Move cursor to beginning of
match before calling the mapped function.
* semantic/doc.el
(semantic-documentation-comment-preceeding-tag): Do nothing if the
mode doesn't provide comment-start-skip.
* semantic/scope.el
(semantic-analyze-scope-nested-tags-default): Strip duplicates.
(semantic-analyze-scoped-inherited-tag-map): Take the tag we are
looking for as part of the scoped tags list.
* semantic/html.el (semantic-default-html-setup): Add
senator-step-at-tag-classes.
* semantic/decorate/include.el
(semantic-decoration-on-unknown-includes): Change light bgcolor.
(semantic-decoration-on-includes-highlight-default): Check that
the include tag has a postion.
* semantic/complete.el (semantic-collector-local-members):
(semantic-complete-read-tag-local-members)
(semantic-complete-jump-local-members): New class and functions.
(semantic-complete-self-insert): Save excursion before completing.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): If no completions
are found, return the raw by-name-only completion list. Add FLAGS
arguments. Add support for 'no-tc (type constraint) and
'no-unique, or no stripping duplicates.
(semantic-analyze-possible-completions-default): Add FLAGS arg.
* semantic/util-modes.el
(semantic-stickyfunc-show-only-functions-p): New option.
(semantic-stickyfunc-fetch-stickyline): Don't show stickytext for
the very first line in a buffer.
* semantic/util.el (semantic-hack-search)
(semantic-recursive-find-nonterminal-by-name)
(semantic-current-tag-interactive): Deleted.
(semantic-describe-buffer): Fix expand-nonterminal. Add
lex-syntax-mods, type relation separator char, and command
separation char.
(semantic-sanity-check): Only message if called interactively.
* semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the
:filename property and the tag position.
* semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
Add recursion limit.
* semantic/imenu.el (semantic-imenu-bucketize-type-members):
Make this buffer local, not the obsoleted variable.
* semantic/idle.el: Add breadcrumbs support.
(semantic-idle-summary-current-symbol-info-default)
(semantic-idle-tag-highlight)
(semantic-idle-completion-list-default): Use
semanticdb-without-unloaded-file-searches for speed, and to
conform to the controls that specify if the idle timer is supposed
to be parsing unparsed includes.
(semantic-idle-symbol-highlight-face)
(semantic-idle-symbol-maybe-highlight): Rename from *-summary-*.
Callers changed.
(semantic-idle-work-parse-neighboring-files-flag): Default to nil.
(semantic-idle-work-update-headers-flag): New var.
(semantic-idle-work-for-one-buffer): Use it.
(semantic-idle-local-symbol-highlight): Rename from
semantic-idle-tag-highlight.
(semantic-idle-truncate-long-summaries): New option.
* semantic/ia.el (semantic-ia-cache)
(semantic-ia-get-completions): Deleted. Callers changed.
(semantic-ia-show-variants): New command.
(semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
(semantic-ia-show-summary): If there isn't anything to show, say so.
* semantic/grammar.el (semantic-grammar-create-package):
Save the buffer even in batch mode.
* semantic/fw.el
(semanticdb-without-unloaded-file-searches): New macro.
* semantic/dep.el (semantic-dependency-find-file-on-path):
Fix case dereferencing ede-object when it is a list.
* semantic/db-typecache.el (semanticdb-expand-nested-tag)
(semanticdb-typecache-faux-namespace): New functions.
(semanticdb-typecache-file-tags)
(semanticdb-typecache-merge-streams): Use them.
(semanticdb-typecache-file-tags): When deriving tags from a file,
give the mode a chance to monkey with the tag copy.
(semanticdb-typecache-find-default): Wrap find in save-excursion.
(semanticdb-typecache-find-by-name-helper): Merge found names down.
* semantic/db-global.el
(semanticdb-enable-gnu-global-in-buffer): Don't show messages if
GNU Global is not available and we don't want to throw an error.
* semantic/db-find.el (semanticdb-find-result-nth-in-buffer):
When trying to normalize the tag to a buffer, don't error if
set-buffer method doesn't exist.
* semantic/db-file.el (semanticdb-save-db): Simplify msg.
* semantic/db.el (semanticdb-refresh-table): If forcing a
refresh on a file not in a buffer, use semantic-find-file-noselect
and delete the buffer after use.
(semanticdb-current-database-list): When calculating root via
hooks, force it through true-filename and skip the list of
possible roots.
* semantic/ctxt.el (semantic-ctxt-imported-packages): New.
* semantic/analyze/debug.el
(semantic-analyzer-debug-insert-tag): Reset standard output to
current buffer.
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype): Change "prefix" to
"symbol" in messages.
* semantic/analyze/refs.el: (semantic-analyze-refs-impl)
(semantic-analyze-refs-proto): When calculating value, make sure
the found tag is 'similar' to the originating tag.
(semantic--analyze-refs-find-tags-with-parent): Attempt to
identify matches via imported symbols of parents.
(semantic--analyze-refs-full-lookup-with-parents): Do a deep
search during the brute search.
* semantic/analyze.el
(semantic-analyze-find-tag-sequence-default): Be robust to
calculated scopes being nil.
* semantic/bovine/c.el (semantic-c-describe-environment): Add
project macro symbol array.
(semantic-c-parse-lexical-token): Add recursion limit.
(semantic-ctxt-imported-packages, semanticdb-expand-nested-tag):
New overrides.
(semantic-expand-c-tag-namelist): Split a full type from a typedef
out to its own tag.
(semantic-expand-c-tag-namelist): Do not split out a typedef'd
inline type if it is an anonymous type.
(semantic-c-reconstitute-token): Use the optional initializers as
a clue that some function is probably a constructor. When
defining the type of these constructors, split the parent name,
and use only the class part, if applicable.
* semantic/bovine/c-by.el:
* semantic/wisent/python-wy.el: Regenerate.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 18 Sep 2010 22:49:54 -0400 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; nxml-parse.el --- XML parser, sharing infrastructure with nxml-mode ;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: XML ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Entry point is `nxml-parse-file'. ;;; Code: (require 'nxml-util) (require 'xmltok) (require 'nxml-enc) (require 'nxml-ns) (defvar nxml-parse-file-name nil) (defvar nxml-validate-function nil "Either nil or a function called by `nxml-parse-file' to perform validation. The function will be called once for each start-tag or end-tag. The function is passed two arguments TEXT and START-TAG. For a start-tag, START-TAG is a list (NAME ATTRIBUTES) where NAME and ATTRIBUTES are in the same form as returned by `nxml-parse-file'. For an end-tag, START-TAG is nil. TEXT is a string containing the text immediately preceding the tag, or nil if there was no such text. An empty element is treated as a start-tag followed by an end-tag. For a start-tag, the namespace state will be the state after processing the namespace declarations in the start-tag. For an end-tag, the namespace state will be the state before popping the namespace declarations for the corresponding start-tag. The function must return nil if no error is detected or a cons (MESSAGE . LOCATION) where MESSAGE is a string containing an error message and LOCATION indicates what caused the error as follows: - nil indicates the tag as whole caused it; this is always allowed; - text indicates the text caused it; this is allowed only if TEXT is non-nil; - tag-close indicates the close of the tag caused it; this is allowed only if START-TAG is non-nil; - (attribute-name . N) indicates that the name of the Nth attribute caused it; N counts from 0; this is allowed only if START-TAG is non-nil and N must be less than the number of attributes; - (attribute-value . N) indicates that the value of the Nth attribute caused it; N counts from 0; this is allowed only if START-TAG is non-nil and N must be less than the number of attributes.") (defun nxml-parse-file (file) "Parse the XML document in FILE and return it as a list. An XML element is represented as a list (NAME ATTRIBUTES . CHILDREN). NAME is either a string, in the case where the name does not have a namespace, or a cons (NAMESPACE . LOCAL-NAME), where NAMESPACE is a symbol and LOCAL-NAME is a string, in the case where the name does have a namespace. NAMESPACE is a keyword whose name is `:URI', where URI is the namespace name. ATTRIBUTES is an alist of attributes where each attribute has the form (NAME . VALUE), where NAME has the same form as an element name, and VALUE is a string. A namespace declaration is represented as an attribute whose name is \(:http://www.w3.org/2000/xmlns/ . LOCAL-NAME). CHILDREN is a list containing strings and child elements; CHILDREN never contains two consecutive strings and never contains an empty string. Processing instructions and comments are not represented. The return value is a list representing the document element. If the XML document is not well-formed, an error having the condition `nxml-file-parse-error' will be signaled; the error data will be a list of the form \(FILE POSITION MESSAGE), where POSITION is an integer specifying the position where the error was detected, and MESSAGE is a string describing the error. The current contents of FILE will be parsed even if there is a modified buffer currently visiting FILE. If the variable `nxml-validate-function' is non-nil, it will be called twice for each element, and any reported error will be signaled in the same way as well-formedness error." (with-current-buffer (nxml-parse-find-file file) (unwind-protect (let ((nxml-parse-file-name file)) (nxml-parse-instance)) (kill-buffer nil)))) (defun nxml-parse-find-file (file) (with-current-buffer (get-buffer-create " *nXML Parse*") (erase-buffer) (let ((set-auto-coding-function 'nxml-set-xml-coding)) (insert-file-contents file)) (current-buffer))) (defun nxml-parse-instance () (let (xmltok-dtd) (xmltok-save (xmltok-forward-prolog) (nxml-check-xmltok-errors) (nxml-ns-save (nxml-parse-instance-1))))) (defun nxml-parse-instance-1 () (let* ((top (cons nil nil)) ;; tail is a cons cell, whose cdr is nil ;; additional elements will destructively appended to tail (tail top) ;; stack of tails one for each open element tail-stack ;; list of QNames of open elements open-element-tags ;; list of strings buffering a text node, in reverse order text ;; position of beginning of first (in buffer) string in text text-pos) (while (xmltok-forward) (nxml-check-xmltok-errors) (cond ((memq xmltok-type '(start-tag end-tag empty-element)) (when text (setq text (apply 'concat (nreverse text))) (setcdr tail (cons text nil)) (setq tail (cdr tail))) (when (not (eq xmltok-type 'end-tag)) (when (and (not open-element-tags) (not (eq tail top))) (nxml-parse-error nil "Multiple top-level elements")) (setq open-element-tags (cons (xmltok-start-tag-qname) open-element-tags)) (nxml-ns-push-state) (let ((tag (nxml-parse-start-tag))) (nxml-validate-tag text text-pos tag) (setq text nil) (setcdr tail (cons tag nil)) (setq tail (cdr tail)) (setq tail-stack (cons tail tail-stack)) (setq tail (last tag)))) (when (not (eq xmltok-type 'start-tag)) (or (eq xmltok-type 'empty-element) (equal (car open-element-tags) (xmltok-end-tag-qname)) (if open-element-tags (nxml-parse-error nil "Unbalanced end-tag; expected </%s>" (car open-element-tags)) (nxml-parse-error nil "Extra end-tag"))) (nxml-validate-tag text text-pos nil) (setq text nil) (nxml-ns-pop-state) (setq open-element-tags (cdr open-element-tags)) (setq tail (car tail-stack)) (setq tail-stack (cdr tail-stack))) (setq text-pos nil)) ((memq xmltok-type '(space data entity-ref char-ref cdata-section)) (cond (open-element-tags (unless text-pos (setq text-pos xmltok-start)) (setq text (cons (nxml-current-text-string) text))) ((not (eq xmltok-type 'space)) (nxml-parse-error nil "%s at top-level" (cdr (assq xmltok-type '((data . "Text characters") (entity-ref . "Entity reference") (char-ref . "Character reference") (cdata-section . "CDATA section")))))))))) (unless (cdr top) (nxml-parse-error (point-max) "Missing document element")) (cadr top))) (defun nxml-parse-start-tag () (let (parsed-attributes parsed-namespace-attributes atts att prefixes prefix ns value name) (setq atts xmltok-namespace-attributes) (while atts (setq att (car atts)) (setq value (or (xmltok-attribute-value att) (nxml-parse-error nil "Invalid attribute value"))) (setq ns (nxml-make-namespace value)) (setq prefix (and (xmltok-attribute-prefix att) (xmltok-attribute-local-name att))) (cond ((member prefix prefixes) (nxml-parse-error nil "Duplicate namespace declaration")) ((not prefix) (nxml-ns-set-default ns)) (ns (nxml-ns-set-prefix prefix ns)) (t (nxml-parse-error nil "Cannot undeclare namespace prefix"))) (setq prefixes (cons prefix prefixes)) (setq parsed-namespace-attributes (cons (cons (nxml-make-name nxml-xmlns-namespace-uri (xmltok-attribute-local-name att)) value) parsed-namespace-attributes)) (setq atts (cdr atts))) (setq name (nxml-make-name (let ((prefix (xmltok-start-tag-prefix))) (if prefix (or (nxml-ns-get-prefix prefix) (nxml-parse-error (1+ xmltok-start) "Prefix `%s' undeclared" prefix)) (nxml-ns-get-default))) (xmltok-start-tag-local-name))) (setq atts xmltok-attributes) (while atts (setq att (car atts)) (setq ns (let ((prefix (xmltok-attribute-prefix att))) (and prefix (or (nxml-ns-get-prefix prefix) (nxml-parse-error (xmltok-attribute-name-start att) "Prefix `%s' undeclared" prefix))))) (setq parsed-attributes (let ((nm (nxml-make-name ns (xmltok-attribute-local-name att)))) (when (assoc nm parsed-attributes) (nxml-parse-error (xmltok-attribute-name-start att) "Duplicate attribute")) (cons (cons nm (or (xmltok-attribute-value att) (nxml-parse-error nil "Invalid attribute value"))) parsed-attributes))) (setq atts (cdr atts))) ;; We want to end up with the attributes followed by the ;; the namespace attributes in the same order as ;; xmltok-attributes and xmltok-namespace-attributes respectively. (when parsed-namespace-attributes (setq parsed-attributes (nconc parsed-namespace-attributes parsed-attributes))) (list name (nreverse parsed-attributes)))) (defun nxml-validate-tag (text text-pos tag) (when nxml-validate-function (let ((err (funcall nxml-validate-function text tag)) pos) (when err (setq pos (nxml-validate-error-position (cdr err) (and text text-pos) tag)) (or pos (error "Incorrect return value from %s" nxml-validate-function)) (nxml-parse-error pos (car err)))))) (defun nxml-validate-error-position (location text-pos tag) (cond ((null location) xmltok-start) ((eq location 'text) text-pos) ((eq location 'tag-close) (and tag (- (point) (if (eq xmltok-type 'empty-element ) 2 1)))) ((consp location) (let ((att (nth (cdr location) xmltok-attributes))) (when (not att) (setq att (nth (- (cdr location) (length xmltok-attributes)) xmltok-namespace-attributes))) (cond ((not att)) ((eq (car location) 'attribute-name) (xmltok-attribute-name-start att)) ((eq (car location) 'attribute-value) (xmltok-attribute-value-start att))))))) (defun nxml-make-name (ns local-name) (if ns (cons ns local-name) local-name)) (defun nxml-current-text-string () (cond ((memq xmltok-type '(space data)) (buffer-substring-no-properties xmltok-start (point))) ((eq xmltok-type 'cdata-section) (buffer-substring-no-properties (+ xmltok-start 9) (- (point) 3))) ((memq xmltok-type '(char-ref entity-ref)) (unless xmltok-replacement (nxml-parse-error nil (if (eq xmltok-type 'char-ref) "Reference to unsupported Unicode character" "Unresolvable entity reference"))) xmltok-replacement))) (defun nxml-parse-error (position &rest args) (nxml-signal-file-parse-error nxml-parse-file-name (or position xmltok-start) (apply 'format args))) (defun nxml-check-xmltok-errors () (when xmltok-errors (let ((err (car (last xmltok-errors)))) (nxml-signal-file-parse-error nxml-parse-file-name (xmltok-error-start err) (xmltok-error-message err))))) (provide 'nxml-parse) ;; arch-tag: fc19639b-1bff-4673-9992-f539da89ba1e ;;; nxml-parse.el ends here