-;;; ada-stmt.el - An extension to Ada mode for inserting statement templates.
+;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
-;; Copyright (C) 1987, 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
;; Authors: Daniel Pfeiffer, Markus Heritsch, Rolf Ebert <ebert@waporo.muc.de>
-;; Maintainer: Rolf Ebert <ebert@waporo.muc.de>
+;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
;; Keywords: languages, ada
-;; Rolf Ebert's version: 2.26
;;; Commentary:
-
-;;
-;; put the following statement in your .emacs:
-;; (require 'ada-stmt)
-;;
+;; This file is now automatically loaded from ada-mode.el, and creates a submenu
+;; in Ada/ on the menu bar.
;;; History:
;; 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
;; 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
+;; made it work with skeleton.el from Emacs-19.30. Several
;; enhancements and bug fixes.
;; BUGS:
\f
;;; Code:
-(require 'ada-mode)
-(require 'skeleton)
+(require 'skeleton nil t)
(require 'easymenu)
+(require 'ada-mode)
-(defgroup ada-stmt nil
- "Extension to Ada mode for inserting statement templates"
- :group 'ada)
-
-(defcustom ada-stmt-use-debug t
- "*Toggle to insert ada debug code parts."
- :type 'boolean
- :group 'ada-stmt)
-
-
-(defcustom ada-debug-call-str "pragma Debug (%s);"
- "*Debug call code to insert."
- :type 'string
- :group 'ada-stmt)
-
-
-(defcustom ada-debug-exception-str "pragma Debug (%s);"
- "*Debug exception code to insert."
- :type 'string
- :group 'ada-stmt)
-
-
-\f
(defun ada-func-or-proc-name ()
- ;; Get the name of the current function or procedure."
+ "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)
- (buffer-substring (match-beginning 2) (match-end 2))
+ (match-string 5)
"NAME?"))))
-
-(defun ada-toggle-debugging ()
- "Toggles behaviour of `ada-debug-info-insertion'."
- (interactive)
- (setq ada-stmt-use-debug (not ada-stmt-use-debug))
- (if ada-stmt-use-debug
- (message "Debugging enabled")
- (message "Debugging disabled")))
-
-
-(defvar ada-template-map nil
- "Keymap used in Ada mode for smart template operations.")
-
-
-(let ((ada-mp (make-sparse-keymap)))
- (define-key ada-mp "h" 'ada-header)
-; (define-key ada-mp "p" 'ada-toggle-prompt-pseudo)
- (define-key ada-mp "(" 'insert-parentheses)
- (define-key ada-mp "\C-a" 'ada-array)
- (define-key ada-mp "b" 'ada-exception-block)
- (define-key ada-mp "d" 'ada-declare-block)
- (define-key ada-mp "c" 'ada-case)
- (define-key ada-mp "\C-e" 'ada-elsif)
- (define-key ada-mp "e" 'ada-else)
- (define-key ada-mp "\C-k" 'ada-package-spec)
- (define-key ada-mp "k" 'ada-package-body)
- (define-key ada-mp "\C-p" 'ada-procedure-spec)
- (define-key ada-mp "\C-f" 'ada-function-spec)
- (define-key ada-mp "p" 'ada-subprogram-body)
- (define-key ada-mp "f" 'ada-for-loop)
- (define-key ada-mp "i" 'ada-if)
- (define-key ada-mp "l" 'ada-loop)
- (define-key ada-mp "\C-r" 'ada-record)
- (define-key ada-mp "\C-s" 'ada-subtype)
- (define-key ada-mp "S" 'ada-tabsize)
- (define-key ada-mp "\C-t" 'ada-task-spec)
- (define-key ada-mp "t" 'ada-task-body)
- (define-key ada-mp "\C-y" 'ada-type)
- (define-key ada-mp "\C-v" 'ada-private)
- (define-key ada-mp "u" 'ada-use)
- (define-key ada-mp "\C-u" 'ada-with)
- (define-key ada-mp "\C-w" 'ada-when)
- (define-key ada-mp "w" 'ada-while-loop)
- (define-key ada-mp "\C-x" 'ada-exception)
- (define-key ada-mp "x" 'ada-exit)
- (setq ada-template-map ada-mp))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Place the templates into Ada Mode. They may be inserted under any key.
-;; C-c C-t will be the default. If you use templates alot, you
-;; may want to consider moving the binding to another key in your .emacs
-;; file. Be sure to (require 'ada-stmt) first.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;(define-key ada-mode-map "\C-ct" ada-template-map)
-(define-key ada-mode-map "\C-c\C-t" ada-template-map)
-
;;; ---- statement skeletons ------------------------------------------
(define-skeleton ada-array
- "Insert array type definition. Uses the minibuffer to prompt
-for component type and index subtypes."
+ "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, prompting for the selector expression.
-Also builds the first when clause."
+ "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
(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 ?\;)
-
+ "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)
- (make-header)
+ (funcall (symbol-function 'make-header))
(ada-header-tmpl))))
"Insert a comment block containing the module title, author, etc."
"[Description]: "
"-- -*- Mode: Ada -*-"
- "\n-- Filename : " (buffer-name)
- "\n-- Description : " str
- "\n-- Author : " (user-full-name)
- "\n-- Created On : " (current-time-string)
- "\n-- Last Modified By: ."
- "\n-- Last Modified On: ."
- "\n-- Update Count : 0"
- "\n-- Status : Unknown, Use with caution!"
+ "\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-- " _ "\n--")
+ "--\n" ada-fill-comment-prefix _ "\n--")
(define-skeleton ada-if
(define-skeleton ada-elsif
- "Add an elsif clause to an if statement,
+ "Add an elsif clause to an if statement,
prompting for the boolean-expression."
"[condition]: "
< "elsif " str " then" \n
(define-skeleton ada-function-spec
"Insert a function specification. Prompts for name and arguments."
"[function name]: "
- "function " str
+ "function " str
" (" ("[parameter_specification]: " str "; " ) -2 ")"
" return "
(ada-function-spec-prompt-return)
(define-skeleton ada-procedure-spec
"Insert a procedure specification, prompting for its name and arguments."
"[procedure name]: "
- "procedure " str
+ "procedure " str
" (" ("[parameter_specification]: " str "; " ) -2 ")"
";" \n )
()
;; Remove `;' from subprogram decl
(save-excursion
- (ada-search-ignore-string-comment ada-subprog-start-re t nil)
- (ada-search-ignore-string-comment "(" nil nil t)
- (backward-char 1)
- (forward-sexp 1)
+ (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
- > (if ada-stmt-use-debug
- (format ada-debug-call-str (ada-func-or-proc-name))) \n
- > \n
- < (if ada-stmt-use-debug
- "exception") & \n
- > (if ada-stmt-use-debug
- "when others =>") & \n
- > (if ada-stmt-use-debug
- (format ada-debug-exception-str (ada-func-or-proc-name))) \n
- < < "end "
+ (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
; "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."
(define-skeleton ada-task-spec
"Insert a task specification, prompting for the task name."
"[task name]: "
- "task " str
+ "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 & ")"
- )
+ ("[parameter_specification]: " str "; " ) & -2 & ")")
(define-skeleton ada-get-param
"Prompt for arguments and if any enclose them in brackets."
()
- " ("
- (ada-get-param1) | -2
- )
+ " ("
+ (ada-get-param1) | -2)
(define-skeleton ada-entry
"Insert a task entry, prompting for the entry name."
"[entry name]: "
- "entry " str
+ "entry " str
(ada-get-param)
- ";" \n
-; (ada-indent-current)
-)
+ ";" \n)
(define-skeleton ada-entry-family-prompt-discriminant
"entry " str
" (" (ada-entry-family-prompt-discriminant) ")"
(ada-get-param)
- ";" \n
- ;(ada-indent-current)
-)
+ ";" \n)
(define-skeleton ada-select
(define-skeleton ada-accept-1
"Insert a condition statement, prompting for the condition name."
- "[condition]: "
+ "[condition]: "
"when " str | -5 )
(define-skeleton ada-accept-2
"Insert an accept statement, prompting for the name and arguments."
- "[accept name]: "
- > "accept " str
+ "[accept name]: "
+ > "accept " str
(ada-get-param)
-; " (" ("[parameter_specification]: " str "; ") -2 ")"
" do" \n
> _ \n
< "end " str ";" )
"Insert an accept statement (prompt for condition, name and arguments)."
()
> (ada-accept-1) & " =>\n"
- (ada-accept-2)
-)
+ (ada-accept-2))
(define-skeleton ada-or-accept
- "Insert a or statement, prompting for the condition name."
+ "Insert an accept alternative, prompting for the condition name."
()
< "or\n"
- (ada-accept)
-)
+ (ada-accept))
(define-skeleton ada-or-delay
- "Insert a delay statement, prompting for the delay value."
- "[delay value]: "
+ "Insert a delay alternative, prompting for the delay value."
+ "[delay value]: "
< "or\n"
> "delay " str ";")
-
+
(define-skeleton ada-or-terminate
- "Insert a terminate statement."
+ "Insert a terminate alternative."
()
< "or\n"
> "terminate;")
-;; ----
-(defun ada-adjust-case-skeleton ()
- "Adjusts the case of the text inserted by a skeleton."
- (save-excursion
- (let ((aa-end (point)))
- (ada-adjust-case-region
- (progn (goto-char beg) (forward-word -1) (point))
- (goto-char aa-end))
- )))
-
-
-;; ---- add menu 'Statements' in Ada mode (MH)
-(defun ada-add-statement-menu ()
- "Adds the menu 'Statements' to the menu bar in Ada mode."
- (easy-menu-define ada-stmt-menu ada-mode-map
- "Menu for statement templates in Ada."
- '("Statements"
-; ["Toggle Prompt/Pseudo Code" toggle-skeleton-no-prompt t]
- ["Toggle: Debugging" ada-toggle-debugging t]
-; ["-------" nil nil]
- ["Header" (ada-header) t]
- ["-------" nil nil]
- ["package Body" (ada-package-body) t]
- ["package Spec" (ada-package-spec) t]
- ["function Spec" (ada-function-spec) t]
- ["procedure Spec" (ada-procedure-spec) t]
- ["proc/func Body" (ada-subprogram-body) t]
- ["task Body" (ada-task-body) t]
- ["task Spec" (ada-task-spec) t]
- ["declare Block" (ada-declare-block) t]
- ["exception Block" (ada-exception-block) t]
- ["------" nil nil]
- ["entry" (ada-entry) t]
- ["entry family" (ada-entry-family) t]
- ["select" (ada-select) t]
- ["accept" (ada-accept) t]
- ["or accept" (ada-or-accept) t]
- ["or delay" (ada-or-delay) t]
- ["or terminate" (ada-or-terminate) t]
- ["-----" nil nil]
- ["type" (ada-type) t]
- ["private" (ada-private) t]
- ["subtype" (ada-subtype) t]
- ["record" (ada-record) t]
- ["array" (ada-array) t]
- ["------" nil nil]
- ["if" (ada-if) t]
- ["else" (ada-else) t]
- ["elsif" (ada-elsif) t]
- ["case" (ada-case) t]
- ["-----" nil nil]
- ["while Loop" (ada-while-loop) t]
- ["for Loop" (ada-for-loop) t]
- ["loop" (ada-loop) t]
- ["---" nil nil]
- ["exception" (ada-exception) t]
- ["exit" (ada-exit) t]
- ["when" (ada-when) t]
- ))
- (if (ada-xemacs)
- (progn
- (easy-menu-add ada-stmt-menu)
- (setq mode-popup-menu (cons "Ada Mode" ada-stmt-menu)))))
-
-
-
-(add-hook 'ada-mode-hook 'ada-add-statement-menu)
-(add-hook 'ada-mode-hook '(lambda ()
- (setq skeleton-further-elements
- '((< '(backward-delete-char-untabify
- (min ada-indent (current-column))))))
- (add-hook 'skeleton-end-hook
- 'ada-adjust-case-skeleton)))
-
(provide 'ada-stmt)
+;;; arch-tag: 94f51555-cc0e-44e5-8865-8788aae8ecd3
;;; ada-stmt.el ends here