Mercurial > emacs
view lisp/progmodes/ada-stmt.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 | 5df8e547a422 |
children | 280c8ae2476d 376148b31b5e |
line wrap: on
line source
;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates ;; Copyright (C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Authors: Daniel Pfeiffer ;; Markus Heritsch ;; Rolf Ebert <ebert@waporo.muc.de> ;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org> ;; Keywords: languages, ada ;; 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: ;; This file is now automatically loaded from ada-mode.el, and creates a submenu ;; in Ada/ on the menu bar. ;;; History: ;; Created May 1987. ;; Original version from V. Bowman as in ada.el of Emacs-18 ;; (borrowed heavily from Mick Jordan's Modula-2 package for GNU, ;; as modified by Peter Robinson, Michael Schmidt, and Tom Perrine.) ;; ;; Sep 1993. Daniel Pfeiffer <pfeiffer@cict.fr> (DP) ;; Introduced statement.el for smaller code and user configurability. ;; ;; Nov 1993. Rolf Ebert <ebert@enpc.fr> (RE) Moved the ;; skeleton generation into this separate file. The code still is ;; essentially written by DP ;; ;; Adapted Jun 1994. Markus Heritsch ;; <Markus.Heritsch@studbox.uni-stuttgart.de> (MH) ;; added menu bar support for templates ;; ;; 1994/12/02 Christian Egli <cegli@hcsd.hac.com> ;; General cleanup and bug fixes. ;; ;; 1995/12/20 John Hutchison <hutchiso@epi.syr.ge.com> ;; made it work with skeleton.el from Emacs-19.30. Several ;; enhancements and bug fixes. ;; BUGS: ;;;> I have the following suggestions for the function template: 1) I ;;;> don't want it automatically assigning it a name for the return variable. I ;;;> never want it to be called "Result" because that is nondescriptive. If you ;;;> must define a variable, give me the ability to specify its name. ;;;> ;;;> 2) You do not provide a type for variable 'Result'. Its type is the same ;;;> as the function's return type, which the template knows, so why force me ;;;> to type it in? ;;;> ;;;It would be nice if one could configure such layout details separately ;;;without patching the LISP code. Maybe the metalanguage used in ada-stmt.el ;;;could be taken even further, providing the user with some nice syntax ;;;for describing layout. Then my own hacks would survive the next ;;;update of the package :-) ;;; Code: (require 'skeleton nil t) (require 'easymenu) (require 'ada-mode) (defun ada-func-or-proc-name () "Return the name of the current function or procedure." (save-excursion (let ((case-fold-search t)) (if (re-search-backward ada-procedure-start-regexp nil t) (match-string 5) "NAME?")))) ;;; ---- statement skeletons ------------------------------------------ (define-skeleton ada-array "Insert array type definition. Prompt for component type and index subtypes." () "array (" ("index definition: " str ", " ) -2 ") of " _ ?\;) (define-skeleton ada-case "Build skeleton case statement. Prompt for the selector expression. Also builds the first when clause." "[selector expression]: " "case " str " is" \n > "when " ("discrete choice: " str " | ") -3 " =>" \n > _ \n < < "end case;") (define-skeleton ada-when "Start a case statement alternative with a when clause." () < "when " ("discrete choice: " str " | ") -3 " =>" \n >) (define-skeleton ada-declare-block "Insert a block with a declare part. Indent for the first declaration." "[block name]: " < str & ?: & \n > "declare" \n > _ \n < "begin" \n > \n < "end " str | -1 ?\;) (define-skeleton ada-exception-block "Insert a block with an exception part. Indent for the first line of code." "[block name]: " < str & ?: & \n > "begin" \n > _ \n < "exception" \n > \n < "end " str | -1 ?\;) (define-skeleton ada-exception "Insert an indented exception part into a block." () < "exception" \n >) (define-skeleton ada-exit-1 "Insert then exit condition of the exit statement, prompting for condition." "[exit condition]: " "when " str | -5) (define-skeleton ada-exit "Insert an exit statement, prompting for loop name and condition." "[name of loop to exit]: " "exit " str & ?\ (ada-exit-1) | -1 ?\;) ;;;###autoload (defun ada-header () "Insert a descriptive header at the top of the file." (interactive "*") (save-excursion (goto-char (point-min)) (if (fboundp 'make-header) (funcall (symbol-function 'make-header)) (ada-header-tmpl)))) (define-skeleton ada-header-tmpl "Insert a comment block containing the module title, author, etc." "[Description]: " "-- -*- Mode: Ada -*-" "\n" ada-fill-comment-prefix "Filename : " (buffer-name) "\n" ada-fill-comment-prefix "Description : " str "\n" ada-fill-comment-prefix "Author : " (user-full-name) "\n" ada-fill-comment-prefix "Created On : " (current-time-string) "\n" ada-fill-comment-prefix "Last Modified By: ." "\n" ada-fill-comment-prefix "Last Modified On: ." "\n" ada-fill-comment-prefix "Update Count : 0" "\n" ada-fill-comment-prefix "Status : Unknown, Use with caution!" "\n") (define-skeleton ada-display-comment "Inserts three comment lines, making a display comment." () "--\n" ada-fill-comment-prefix _ "\n--") (define-skeleton ada-if "Insert skeleton if statement, prompting for a boolean-expression." "[condition]: " "if " str " then" \n > _ \n < "end if;") (define-skeleton ada-elsif "Add an elsif clause to an if statement, prompting for the boolean-expression." "[condition]: " < "elsif " str " then" \n >) (define-skeleton ada-else "Add an else clause inside an if-then-end-if clause." () < "else" \n >) (define-skeleton ada-loop "Insert a skeleton loop statement. The exit statement is added by hand." "[loop name]: " < str & ?: & \n > "loop" \n > _ \n < "end loop " str | -1 ?\;) (define-skeleton ada-for-loop-prompt-variable "Prompt for the loop variable." "[loop variable]: " str) (define-skeleton ada-for-loop-prompt-range "Prompt for the loop range." "[loop range]: " str) (define-skeleton ada-for-loop "Build a skeleton for-loop statement, prompting for the loop parameters." "[loop name]: " < str & ?: & \n > "for " (ada-for-loop-prompt-variable) " in " (ada-for-loop-prompt-range) " loop" \n > _ \n < "end loop " str | -1 ?\;) (define-skeleton ada-while-loop-prompt-entry-condition "Prompt for the loop entry condition." "[entry condition]: " str) (define-skeleton ada-while-loop "Insert a skeleton while loop statement." "[loop name]: " < str & ?: & \n > "while " (ada-while-loop-prompt-entry-condition) " loop" \n > _ \n < "end loop " str | -1 ?\;) (define-skeleton ada-package-spec "Insert a skeleton package specification." "[package name]: " "package " str " is" \n > _ \n < "end " str ?\;) (define-skeleton ada-package-body "Insert a skeleton package body -- includes a begin statement." "[package name]: " "package body " str " is" \n > _ \n ; < "begin" \n < "end " str ?\;) (define-skeleton ada-private "Undent and start a private section of a package spec. Reindent." () < "private" \n >) (define-skeleton ada-function-spec-prompt-return "Prompts for function result type." "[result type]: " str) (define-skeleton ada-function-spec "Insert a function specification. Prompts for name and arguments." "[function name]: " "function " str " (" ("[parameter_specification]: " str "; " ) -2 ")" " return " (ada-function-spec-prompt-return) ";" \n ) (define-skeleton ada-procedure-spec "Insert a procedure specification, prompting for its name and arguments." "[procedure name]: " "procedure " str " (" ("[parameter_specification]: " str "; " ) -2 ")" ";" \n ) (define-skeleton ada-subprogram-body "Insert frame for subprogram body. Invoke right after `ada-function-spec' or `ada-procedure-spec'." () ;; Remove `;' from subprogram decl (save-excursion (let ((pos (1+ (point)))) (ada-search-ignore-string-comment ada-subprog-start-re t nil) (when (ada-search-ignore-string-comment "(" nil pos t 'search-forward) (backward-char 1) (forward-sexp 1))) (if (looking-at ";") (delete-char 1))) " is" \n _ \n < "begin" \n \n < "exception" \n "when others => null;" \n < < "end " (ada-func-or-proc-name) ";" \n) (define-skeleton ada-separate "Finish a body stub with `separate'." () > "separate;" \n <) ;(define-skeleton ada-with ; "Inserts a with clause, prompting for the list of units depended upon." ; "[list of units depended upon]: " ; "with " str ?\;) ;(define-skeleton ada-use ; "Inserts a use clause, prompting for the list of packages used." ; "[list of packages used]: " ; "use " str ?\;) (define-skeleton ada-record "Insert a skeleton record type declaration." () "record" \n > _ \n < "end record;") (define-skeleton ada-subtype "Start insertion of a subtype declaration, prompting for the subtype name." "[subtype name]: " "subtype " str " is " _ ?\; (not (message "insert subtype indication."))) (define-skeleton ada-type "Start insertion of a type declaration, prompting for the type name." "[type name]: " "type " str ?\( ("[discriminant specs]: " str " ") | (backward-delete-char 1) | ?\) " is " (not (message "insert type definition."))) (define-skeleton ada-task-body "Insert a task body, prompting for the task name." "[task name]: " "task body " str " is\n" "begin\n" > _ \n < "end " str ";" ) (define-skeleton ada-task-spec "Insert a task specification, prompting for the task name." "[task name]: " "task " str " (" ("[discriminant]: " str "; ") ") is\n" > "entry " _ \n <"end " str ";" ) (define-skeleton ada-get-param1 "Prompt for arguments and if any enclose them in brackets." () ("[parameter_specification]: " str "; " ) & -2 & ")") (define-skeleton ada-get-param "Prompt for arguments and if any enclose them in brackets." () " (" (ada-get-param1) | -2) (define-skeleton ada-entry "Insert a task entry, prompting for the entry name." "[entry name]: " "entry " str (ada-get-param) ";" \n) (define-skeleton ada-entry-family-prompt-discriminant "Insert a entry specification, prompting for the entry name." "[discriminant name]: " str) (define-skeleton ada-entry-family "Insert a entry specification, prompting for the entry name." "[entry name]: " "entry " str " (" (ada-entry-family-prompt-discriminant) ")" (ada-get-param) ";" \n) (define-skeleton ada-select "Insert a select block." () "select\n" > _ \n < "end select;") (define-skeleton ada-accept-1 "Insert a condition statement, prompting for the condition name." "[condition]: " "when " str | -5 ) (define-skeleton ada-accept-2 "Insert an accept statement, prompting for the name and arguments." "[accept name]: " > "accept " str (ada-get-param) " do" \n > _ \n < "end " str ";" ) (define-skeleton ada-accept "Insert an accept statement (prompt for condition, name and arguments)." () > (ada-accept-1) & " =>\n" (ada-accept-2)) (define-skeleton ada-or-accept "Insert an accept alternative, prompting for the condition name." () < "or\n" (ada-accept)) (define-skeleton ada-or-delay "Insert a delay alternative, prompting for the delay value." "[delay value]: " < "or\n" > "delay " str ";") (define-skeleton ada-or-terminate "Insert a terminate alternative." () < "or\n" > "terminate;") (provide 'ada-stmt) ;; arch-tag: 94f51555-cc0e-44e5-8865-8788aae8ecd3 ;;; ada-stmt.el ends here