annotate lisp/progmodes/ada-mode.el @ 106815:1d1d5d9bd884

Add 2010 to copyright years.
author Glenn Morris <rgm@gnu.org>
date Wed, 13 Jan 2010 00:35:10 -0800
parents bd2966850aac
children e9774faca8a4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38422
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38401
diff changeset
1 ;;; ada-mode.el --- major-mode for editing Ada sources
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2
64699
629afbe74e61 Update copyright for release of 22.1 for progmodes directory.
Nick Roberts <nickrob@snap.net.nz>
parents: 64434
diff changeset
3 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105372
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
6 ;; Author: Rolf Ebert <ebert@inf.enst.fr>
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
7 ;; Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
8 ;; Emmanuel Briot <briot@gnat.com>
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
9 ;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
10 ;; Keywords: languages ada
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
11
38422
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38401
diff changeset
12 ;; This file is part of GNU Emacs.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
13
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92148
diff changeset
14 ;; GNU Emacs is free software: you can redistribute it and/or modify
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 ;; it under the terms of the GNU General Public License as published by
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92148
diff changeset
16 ;; the Free Software Foundation, either version 3 of the License, or
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92148
diff changeset
17 ;; (at your option) any later version.
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18
38401
64d8d90d180d Fix license commentary.
Gerd Moellmann <gerd@gnu.org>
parents: 38361
diff changeset
19 ;; GNU Emacs is distributed in the hope that it will be useful,
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 ;; GNU General Public License for more details.
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24 ;; You should have received a copy of the GNU General Public License
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92148
diff changeset
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
26
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
27 ;;; Commentary:
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
28 ;; This mode is a major mode for editing Ada code. This is a major
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
29 ;; rewrite of the file packaged with Emacs-20. The Ada mode is
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
30 ;; composed of four Lisp files: ada-mode.el, ada-xref.el, ada-prj.el
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
31 ;; and ada-stmt.el. Only this file (ada-mode.el) is completely
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
32 ;; independent from the GNU Ada compiler GNAT, distributed by Ada
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
33 ;; Core Technologies. All the other files rely heavily on features
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
34 ;; provided only by GNAT.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
35 ;;
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
36 ;; Note: this mode will not work with Emacs 19. If you are on a VMS
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
37 ;; system, where the latest version of Emacs is 19.28, you will need
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
38 ;; another file, called ada-vms.el, that provides some required
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
39 ;; functions.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
40
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
41 ;;; Usage:
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
42 ;; Emacs should enter Ada mode automatically when you load an Ada file.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
43 ;; By default, the valid extensions for Ada files are .ads, .adb or .ada
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
44 ;; If the ada-mode does not start automatically, then simply type the
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
45 ;; following command :
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
46 ;; M-x ada-mode
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
47 ;;
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
48 ;; By default, ada-mode is configured to take full advantage of the GNAT
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
49 ;; compiler (the menus will include the cross-referencing features,...).
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
50 ;; If you are using another compiler, you might want to set the following
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
51 ;; variable in your .emacs (Note: do not set this in the ada-mode-hook, it
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
52 ;; won't work) :
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
53 ;; (setq ada-which-compiler 'generic)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
54 ;;
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
55 ;; This mode requires find-file.el to be present on your system.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
56
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
57 ;;; History:
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
58 ;; The first Ada mode for GNU Emacs was written by V. Broman in
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
59 ;; 1985. He based his work on the already existing Modula-2 mode.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
60 ;; This was distributed as ada.el in versions of Emacs prior to 19.29.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
61 ;;
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
62 ;; Lynn Slater wrote an extensive Ada mode in 1989. It consisted of
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
63 ;; several files with support for dired commands and other nice
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
64 ;; things. It is currently available from the PAL
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
65 ;; (wuarchive.wustl.edu:/languages/ada) as ada-mode-1.06a.tar.Z.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
66 ;;
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
67 ;; The probably very first Ada mode (called electric-ada.el) was
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
68 ;; written by Steven D. Litvintchouk and Steven M. Rosen for the
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
69 ;; Gosling Emacs. L. Slater based his development on ada.el and
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
70 ;; electric-ada.el.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
71 ;;
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
72 ;; A complete rewrite by M. Heritsch and R. Ebert has been done.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
73 ;; Some ideas from the Ada mode mailing list have been
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
74 ;; added. Some of the functionality of L. Slater's mode has not
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
75 ;; (yet) been recoded in this new mode. Perhaps you prefer sticking
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
76 ;; to his version.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
77 ;;
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
78 ;; A complete rewrite for Emacs-20 / GNAT-3.11 has been done by Ada Core
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
79 ;; Technologies.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
80
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
81 ;;; Credits:
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
82 ;; Many thanks to John McCabe <john@assen.demon.co.uk> for sending so
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
83 ;; many patches included in this package.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
84 ;; Christian Egli <Christian.Egli@hcsd.hac.com>:
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
85 ;; ada-imenu-generic-expression
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
86 ;; Many thanks also to the following persons that have contributed
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
87 ;; to the ada-mode
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
88 ;; Philippe Waroquiers (PW) <philippe@cfmu.eurocontrol.be> in particular,
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
89 ;; woodruff@stc.llnl.gov (John Woodruff)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
90 ;; jj@ddci.dk (Jesper Joergensen)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
91 ;; gse@ocsystems.com (Scott Evans)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
92 ;; comar@gnat.com (Cyrille Comar)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
93 ;; stephen.leake@gsfc.nasa.gov (Stephen Leake)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
94 ;; robin-reply@reagans.org
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
95 ;; and others for their valuable hints.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
96
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
97 ;;; Code:
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
98 ;; Note: Every function in this package is compiler-independent.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
99 ;; The names start with ada-
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
100 ;; The variables that the user can edit can all be modified through
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
101 ;; the customize mode. They are sorted in alphabetical order in this
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
102 ;; file.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
103
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
104 ;; Supported packages.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
105 ;; This package supports a number of other Emacs modes. These other modes
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
106 ;; should be loaded before the ada-mode, which will then setup some variables
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
107 ;; to improve the support for Ada code.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
108 ;; Here is the list of these modes:
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
109 ;; `which-function-mode': Display the name of the subprogram the cursor is
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
110 ;; in in the mode line.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
111 ;; `outline-mode': Provides the capability to collapse or expand the code
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
112 ;; for specific language constructs, for instance if you want to hide the
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
113 ;; code corresponding to a subprogram
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
114 ;; `align': This mode is now provided with Emacs 21, but can also be
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
115 ;; installed manually for older versions of Emacs. It provides the
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
116 ;; capability to automatically realign the selected region (for instance
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
117 ;; all ':=', ':' and '--' will be aligned on top of each other.
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
118 ;; `imenu': Provides a menu with the list of entities defined in the current
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
119 ;; buffer, and an easy way to jump to any of them
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
120 ;; `speedbar': Provides a separate file browser, and the capability for each
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
121 ;; file to see the list of entities defined in it and to jump to them
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
122 ;; easily
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
123 ;; `abbrev-mode': Provides the capability to define abbreviations, which
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
124 ;; are automatically expanded when you type them. See the Emacs manual.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
125
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
126 (require 'find-file nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
127 (require 'align nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
128 (require 'which-func nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
129 (require 'compile nil t)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
130
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
131 (defvar ispell-check-comments)
65223
554ac3736464 (compile-auto-highlight, skeleton-further-elements): Add defvars.
Juanma Barranquero <lekktu@gmail.com>
parents: 64717
diff changeset
132 (defvar skeleton-further-elements)
554ac3736464 (compile-auto-highlight, skeleton-further-elements): Add defvars.
Juanma Barranquero <lekktu@gmail.com>
parents: 64717
diff changeset
133
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
134 (defun ada-mode-version ()
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
135 "Return Ada mode version."
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
136 (interactive)
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
137 (let ((version-string "4.00"))
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 104543
diff changeset
138 (if (called-interactively-p 'interactive)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
139 (message version-string)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
140 version-string)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
141
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
142 (defvar ada-mode-hook nil
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
143 "*List of functions to call when Ada mode is invoked.
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
144 This hook is automatically executed after the `ada-mode' is
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
145 fully loaded.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
146 This is a good place to add Ada environment specific bindings.")
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
147
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
148 (defgroup ada nil
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
149 "Major mode for editing and compiling Ada source in Emacs."
66963
a11fdee52c05 Add :link (custom-group-link font-lock-faces) to defgroup.
Juri Linkov <juri@jurta.org>
parents: 65584
diff changeset
150 :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
151 :group 'languages)
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
152
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
153 (defcustom ada-auto-case t
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
154 "*Non-nil means automatically change case of preceding word while typing.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
155 Casing is done according to `ada-case-keyword', `ada-case-identifier'
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
156 and `ada-case-attribute'."
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
157 :type 'boolean :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
158
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
159 (defcustom ada-broken-decl-indent 0
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
160 "*Number of columns to indent a broken declaration.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
161
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
162 An example is :
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
163 declare
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
164 A,
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
165 >>>>>B : Integer;"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
166 :type 'integer :group 'ada)
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
167
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
168 (defcustom ada-broken-indent 2
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
169 "*Number of columns to indent the continuation of a broken line.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
170
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
171 An example is :
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
172 My_Var : My_Type := (Field1 =>
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
173 >>>>>>>>>Value);"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
174 :type 'integer :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
175
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
176 (defcustom ada-continuation-indent ada-broken-indent
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
177 "*Number of columns to indent the continuation of broken lines in parenthesis.
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
178
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
179 An example is :
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
180 Func (Param1,
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
181 >>>>>Param2);"
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
182 :type 'integer :group 'ada)
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
183
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
184 (defcustom ada-case-attribute 'ada-capitalize-word
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
185 "*Function to call to adjust the case of Ada attributes.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
186 It may be `downcase-word', `upcase-word', `ada-loose-case-word',
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
187 `ada-capitalize-word' or `ada-no-auto-case'."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
188 :type '(choice (const downcase-word)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
189 (const upcase-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
190 (const ada-capitalize-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
191 (const ada-loose-case-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
192 (const ada-no-auto-case))
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
193 :group 'ada)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
194
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
195 (defcustom ada-case-exception-file
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
196 (list (convert-standard-filename' "~/.emacs_case_exceptions"))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
197 "*List of special casing exceptions dictionaries for identifiers.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
198 The first file is the one where new exceptions will be saved by Emacs
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
199 when you call `ada-create-case-exception'.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
200
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
201 These files should contain one word per line, that gives the casing
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
202 to be used for that word in Ada files. If the line starts with the
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
203 character *, then the exception will be used for substrings that either
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
204 start at the beginning of a word or after a _ character, and end either
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
205 at the end of the word or at a _ character. Each line can be terminated
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
206 by a comment."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
207 :type '(repeat (file))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
208 :group 'ada)
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
209
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
210 (defcustom ada-case-keyword 'downcase-word
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
211 "*Function to call to adjust the case of an Ada keywords.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
212 It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
213 `ada-capitalize-word'."
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
214 :type '(choice (const downcase-word)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
215 (const upcase-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
216 (const ada-capitalize-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
217 (const ada-loose-case-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
218 (const ada-no-auto-case))
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
219 :group 'ada)
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
220
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
221 (defcustom ada-case-identifier 'ada-loose-case-word
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
222 "*Function to call to adjust the case of an Ada identifier.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
223 It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
224 `ada-capitalize-word'."
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
225 :type '(choice (const downcase-word)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
226 (const upcase-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
227 (const ada-capitalize-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
228 (const ada-loose-case-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
229 (const ada-no-auto-case))
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
230 :group 'ada)
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
231
104543
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 103989
diff changeset
232 ;; FIXME If this is not something required by the ada language, this
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 103989
diff changeset
233 ;; should be removed.
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
234 (defcustom ada-clean-buffer-before-saving t
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
235 "*Non-nil means remove trailing spaces and untabify the buffer before saving."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
236 :type 'boolean :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
237
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
238 (defcustom ada-indent 3
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
239 "*Size of Ada indentation.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
240
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
241 An example is :
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
242 procedure Foo is
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
243 begin
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
244 >>>>>>>>>>null;"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
245 :type 'integer :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
246
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
247 (defcustom ada-indent-after-return t
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
248 "*Non-nil means automatically indent after RET or LFD."
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
249 :type 'boolean :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
250
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
251 (defcustom ada-indent-align-comments t
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
252 "*Non-nil means align comments on previous line comments, if any.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
253 If nil, indentation is calculated as usual.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
254 Note that indentation is calculated only if `ada-indent-comment-as-code' is t.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
255
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
256 For instance:
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
257 A := 1; -- A multi-line comment
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
258 -- aligned if ada-indent-align-comments is t"
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
259 :type 'boolean :group 'ada)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
260
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
261 (defcustom ada-indent-comment-as-code t
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
262 "*Non-nil means indent comment lines as code.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
263 A nil value means do not auto-indent comments."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
264 :type 'boolean :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
265
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
266 (defcustom ada-indent-handle-comment-special nil
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
267 "*Non-nil if comment lines should be handled specially inside parenthesis.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
268 By default, if the line that contains the open parenthesis has some
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
269 text following it, then the following lines will be indented in the
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
270 same column as this text. This will not be true if the first line is
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
271 a comment and `ada-indent-handle-comment-special' is t.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
272
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
273 type A is
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
274 ( Value_1, -- common behavior, when not a comment
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
275 Value_2);
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
276
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
277 type A is
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
278 ( -- `ada-indent-handle-comment-special' is nil
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
279 Value_1,
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
280 Value_2);
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
281
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
282 type A is
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
283 ( -- `ada-indent-handle-comment-special' is non-nil
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
284 Value_1,
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
285 Value_2);"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
286 :type 'boolean :group 'ada)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
287
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
288 (defcustom ada-indent-is-separate t
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
289 "*Non-nil means indent 'is separate' or 'is abstract' if on a single line."
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
290 :type 'boolean :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
291
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
292 (defcustom ada-indent-record-rel-type 3
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
293 "*Indentation for 'record' relative to 'type' or 'use'.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
294
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
295 An example is:
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
296 type A is
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
297 >>>>>>>>>>>record"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
298 :type 'integer :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
299
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
300 (defcustom ada-indent-renames ada-broken-indent
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
301 "*Indentation for renames relative to the matching function statement.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
302 If `ada-indent-return' is null or negative, the indentation is done relative to
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
303 the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used).
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
304
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
305 An example is:
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
306 function A (B : Integer)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
307 return C;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
308 >>>renames Foo;"
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
309 :type 'integer :group 'ada)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
310
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
311 (defcustom ada-indent-return 0
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
312 "*Indentation for 'return' relative to the matching 'function' statement.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
313 If `ada-indent-return' is null or negative, the indentation is done relative to
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
314 the open parenthesis (if there is no parenthesis, `ada-broken-indent' is used).
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
315
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
316 An example is:
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
317 function A (B : Integer)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
318 >>>>>return C;"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
319 :type 'integer :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
320
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
321 (defcustom ada-indent-to-open-paren t
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
322 "*Non-nil means indent according to the innermost open parenthesis."
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
323 :type 'boolean :group 'ada)
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
324
41012
39ee7e7e2200 (ada-fill-comment-prefix): GNAT wants 2 spaces.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38446
diff changeset
325 (defcustom ada-fill-comment-prefix "-- "
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
326 "*Text inserted in the first columns when filling a comment paragraph.
41036
aaa6f44a1b96 (ada-fill-comment-prefix): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 41012
diff changeset
327 Note: if you modify this variable, you will have to invoke `ada-mode'
aaa6f44a1b96 (ada-fill-comment-prefix): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 41012
diff changeset
328 again to take account of the new value."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
329 :type 'string :group 'ada)
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
330
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
331 (defcustom ada-fill-comment-postfix " --"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
332 "*Text inserted at the end of each line when filling a comment paragraph.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
333 Used by `ada-fill-comment-paragraph-postfix'."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
334 :type 'string :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
335
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
336 (defcustom ada-label-indent -4
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
337 "*Number of columns to indent a label.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
338
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
339 An example is:
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
340 procedure Foo is
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
341 begin
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
342 >>>>Label:
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
343
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
344 This is also used for <<..>> labels"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
345 :type 'integer :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
346
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
347 (defcustom ada-language-version 'ada95
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
348 "*Ada language version; one of `ada83', `ada95', `ada2005'."
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
349 :type '(choice (const ada83) (const ada95) (const ada2005)) :group 'ada)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
350
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
351 (defcustom ada-move-to-declaration nil
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
352 "*Non-nil means `ada-move-to-start' moves to the subprogram declaration, not to 'begin'."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
353 :type 'boolean :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
354
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
355 (defcustom ada-popup-key '[down-mouse-3]
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
356 "*Key used for binding the contextual menu.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
357 If nil, no contextual menu is available."
35959
c49a286df476 (ada-popup-key): Fix :type.
Dave Love <fx@gnu.org>
parents: 35263
diff changeset
358 :type '(restricted-sexp :match-alternatives (stringp vectorp))
35263
9d5252e923a3 (ada-popup-key): Fix last change.
Dave Love <fx@gnu.org>
parents: 35182
diff changeset
359 :group 'ada)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
360
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
361 (defcustom ada-search-directories
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
362 (append '(".")
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
363 (split-string (or (getenv "ADA_INCLUDE_PATH") "") ":")
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
364 '("/usr/adainclude" "/usr/local/adainclude"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
365 "/opt/gnu/adainclude"))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
366 "*Default list of directories to search for Ada files.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
367 See the description for the `ff-search-directories' variable. This variable
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
368 is the initial value of `ada-search-directories-internal'."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
369 :type '(repeat (choice :tag "Directory"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
370 (const :tag "default" nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
371 (directory :format "%v")))
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
372 :group 'ada)
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
373
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
374 (defvar ada-search-directories-internal ada-search-directories
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
375 "Internal version of `ada-search-directories'.
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
376 Its value is the concatenation of the search path as read in the project file
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
377 and the standard runtime location, and the value of the user-defined
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
378 `ada-search-directories'.")
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
379
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
380 (defcustom ada-stmt-end-indent 0
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
381 "*Number of columns to indent the end of a statement on a separate line.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
382
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
383 An example is:
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
384 if A = B
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
385 >>>>then"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
386 :type 'integer :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
387
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
388 (defcustom ada-tab-policy 'indent-auto
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
389 "*Control the behavior of the TAB key.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
390 Must be one of :
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
391 `indent-rigidly' : always adds `ada-indent' blanks at the beginning of the line.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
392 `indent-auto' : use indentation functions in this file.
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
393 `always-tab' : do `indent-relative'."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
394 :type '(choice (const indent-auto)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
395 (const indent-rigidly)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
396 (const always-tab))
18120
112bc3055da6 Customize.
Richard M. Stallman <rms@gnu.org>
parents: 17996
diff changeset
397 :group 'ada)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
398
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
399 (defcustom ada-use-indent ada-broken-indent
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
400 "*Indentation for the lines in a 'use' statement.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
401
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
402 An example is:
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
403 use Ada.Text_IO,
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
404 >>>>Ada.Numerics;"
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
405 :type 'integer :group 'ada)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
406
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
407 (defcustom ada-when-indent 3
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
408 "*Indentation for 'when' relative to 'exception' or 'case'.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
409
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
410 An example is:
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
411 case A is
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
412 >>>>when B =>"
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
413 :type 'integer :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
414
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
415 (defcustom ada-with-indent ada-broken-indent
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
416 "*Indentation for the lines in a 'with' statement.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
417
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
418 An example is:
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
419 with Ada.Text_IO,
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
420 >>>>Ada.Numerics;"
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
421 :type 'integer :group 'ada)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
422
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
423 (defcustom ada-which-compiler 'gnat
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
424 "*Name of the compiler to use.
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
425 This will determine what features are made available through the Ada mode.
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
426 The possible choices are:
74202
abb4062752c5 (ada-which-compiler): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 74073
diff changeset
427 `gnat': Use Ada Core Technologies' GNAT compiler. Add some cross-referencing
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
428 features.
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
429 `generic': Use a generic compiler."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
430 :type '(choice (const gnat)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
431 (const generic))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
432 :group 'ada)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
433
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
434
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
435 ;;; ---- end of user configurable variables
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
436
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
437
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
438 (defvar ada-body-suffixes '(".adb")
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
439 "List of possible suffixes for Ada body files.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
440 The extensions should include a `.' if needed.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
441
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
442 (defvar ada-spec-suffixes '(".ads")
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
443 "List of possible suffixes for Ada spec files.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
444 The extensions should include a `.' if needed.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
445
32300
5acb191f2a15 (ada-mode-menu): Add name to menu map.
Dave Love <fx@gnu.org>
parents: 30411
diff changeset
446 (defvar ada-mode-menu (make-sparse-keymap "Ada")
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
447 "Menu for Ada mode.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
448
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
449 (defvar ada-mode-map (make-sparse-keymap)
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
450 "Local keymap used for Ada mode.")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
451
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
452 (defvar ada-mode-extra-map (make-sparse-keymap)
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
453 "Keymap used for non-standard keybindings.")
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
454
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
455 ;; default is C-c C-q because it's free in ada-mode-map
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
456 (defvar ada-mode-extra-prefix "\C-c\C-q"
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
457 "Prefix key to access `ada-mode-extra-map' functions.")
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
458
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
459 (defvar ada-mode-abbrev-table nil
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
460 "Local abbrev table for Ada mode.")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
461
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
462 (defvar ada-mode-syntax-table nil
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
463 "Syntax table to be used for editing Ada source code.")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
464
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
465 (defvar ada-mode-symbol-syntax-table nil
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
466 "Syntax table for Ada, where `_' is a word constituent.")
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
467
73935
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
468 (eval-when-compile
74002
5909c257c4ea (ada-mode-version): Bump version.
Juanma Barranquero <lekktu@gmail.com>
parents: 73935
diff changeset
469 ;; These values are used in eval-when-compile expressions.
73935
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
470 (defconst ada-83-string-keywords
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
471 '("abort" "abs" "accept" "access" "all" "and" "array" "at" "begin"
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
472 "body" "case" "constant" "declare" "delay" "delta" "digits" "do"
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
473 "else" "elsif" "end" "entry" "exception" "exit" "for" "function"
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
474 "generic" "goto" "if" "in" "is" "limited" "loop" "mod" "new"
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
475 "not" "null" "of" "or" "others" "out" "package" "pragma" "private"
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
476 "procedure" "raise" "range" "record" "rem" "renames" "return"
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
477 "reverse" "select" "separate" "subtype" "task" "terminate" "then"
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
478 "type" "use" "when" "while" "with" "xor")
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
479 "List of Ada 83 keywords.
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
480 Used to define `ada-*-keywords'.")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
481
73935
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
482 (defconst ada-95-string-keywords
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
483 '("abstract" "aliased" "protected" "requeue" "tagged" "until")
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
484 "List of keywords new in Ada 95.
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
485 Used to define `ada-*-keywords'.")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
486
73935
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
487 (defconst ada-2005-string-keywords
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
488 '("interface" "overriding" "synchronized")
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
489 "List of keywords new in Ada 2005.
a1e6ec065b4f (ada-83-string-keywords, ada-95-string-keywords, ada-2005-string-keywords):
Juanma Barranquero <lekktu@gmail.com>
parents: 73932
diff changeset
490 Used to define `ada-*-keywords.'"))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
491
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
492 (defvar ada-ret-binding nil
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
493 "Variable to save key binding of RET when casing is activated.")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
494
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
495 (defvar ada-case-exception '()
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
496 "Alist of words (entities) that have special casing.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
497
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
498 (defvar ada-case-exception-substring '()
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
499 "Alist of substrings (entities) that have special casing.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
500 The substrings are detected for word constituant when the word
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
501 is not itself in `ada-case-exception', and only for substrings that
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
502 either are at the beginning or end of the word, or start after '_'.")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
503
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
504 (defvar ada-lfd-binding nil
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
505 "Variable to save key binding of LFD when casing is activated.")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
506
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
507 (defvar ada-other-file-alist nil
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
508 "Variable used by `find-file' to find the name of the other package.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
509 See `ff-other-file-alist'.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
510
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
511 (defvar ada-align-list
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
512 '(("[^:]\\(\\s-*\\):[^:]" 1 t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
513 ("[^=]\\(\\s-+\\)=[^=]" 1 t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
514 ("\\(\\s-*\\)use\\s-" 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
515 ("\\(\\s-*\\)--" 1))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
516 "Ada support for align.el <= 2.2.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
517 This variable provides regular expressions on which to align different lines.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
518 See `align-mode-alist' for more information.")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
519
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
520 (defvar ada-align-modes
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
521 '((ada-declaration
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
522 (regexp . "[^:]\\(\\s-*\\):[^:]")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
523 (valid . (lambda() (not (ada-in-comment-p))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
524 (modes . '(ada-mode)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
525 (ada-assignment
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
526 (regexp . "[^=]\\(\\s-+\\)=[^=]")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
527 (valid . (lambda() (not (ada-in-comment-p))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
528 (modes . '(ada-mode)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
529 (ada-comment
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
530 (regexp . "\\(\\s-*\\)--")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
531 (modes . '(ada-mode)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
532 (ada-use
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
533 (regexp . "\\(\\s-*\\)use\\s-")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
534 (valid . (lambda() (not (ada-in-comment-p))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
535 (modes . '(ada-mode)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
536 )
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
537 "Ada support for align.el >= 2.8.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
538 This variable defines several rules to use to align different lines.")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
539
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
540 (defconst ada-align-region-separate
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
541 (eval-when-compile
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
542 (concat
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
543 "^\\s-*\\($\\|\\("
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
544 "begin\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
545 "declare\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
546 "else\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
547 "end\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
548 "exception\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
549 "for\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
550 "function\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
551 "generic\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
552 "if\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
553 "is\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
554 "procedure\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
555 "record\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
556 "return\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
557 "type\\|"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
558 "when"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
559 "\\)\\>\\)"))
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
560 "See the variable `align-region-separate' for more information.")
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
561
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
562 ;;; ---- Below are the regexp used in this package for parsing
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
563
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
564 (defconst ada-83-keywords
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
565 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
566 (concat "\\<" (regexp-opt ada-83-string-keywords t) "\\>"))
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
567 "Regular expression matching Ada83 keywords.")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
568
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
569 (defconst ada-95-keywords
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
570 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
571 (concat "\\<" (regexp-opt
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
572 (append
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
573 ada-95-string-keywords
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
574 ada-83-string-keywords) t) "\\>"))
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
575 "Regular expression matching Ada95 keywords.")
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
576
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
577 (defconst ada-2005-keywords
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
578 (eval-when-compile
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
579 (concat "\\<" (regexp-opt
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
580 (append
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
581 ada-2005-string-keywords
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
582 ada-83-string-keywords
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
583 ada-95-string-keywords) t) "\\>"))
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
584 "Regular expression matching Ada2005 keywords.")
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
585
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
586 (defvar ada-keywords ada-2005-keywords
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
587 "Regular expression matching Ada keywords.")
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
588 ;; FIXME: make this customizable
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
589
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
590 (defconst ada-ident-re
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
591 "\\(\\sw\\|[_.]\\)+"
12586
f8bbc7a3b87a (ada-ident-re): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 12053
diff changeset
592 "Regexp matching Ada (qualified) identifiers.")
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
593
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
594 ;; "with" needs to be included in the regexp, to match generic subprogram parameters
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
595 ;; Similarly, we put '[not] overriding' on the same line with 'procedure' etc.
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
596 (defvar ada-procedure-start-regexp
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
597 (concat
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
598 "^[ \t]*\\(with[ \t]+\\)?\\(\\(not[ \t]+\\)?overriding[ \t]+\\)?\\(procedure\\|function\\|task\\)[ \t\n]+"
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
599
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
600 ;; subprogram name: operator ("[+/=*]")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
601 "\\("
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
602 "\\(\"[^\"]+\"\\)"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
603
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
604 ;; subprogram name: name
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
605 "\\|"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
606 "\\(\\(\\sw\\|[_.]\\)+\\)"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
607 "\\)")
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
608 "Regexp matching Ada subprogram start.
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
609 The actual start is at (match-beginning 4). The name is in (match-string 5).")
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
610
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
611 (defconst ada-name-regexp
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
612 "\\([a-zA-Z][a-zA-Z0-9_.']*[a-zA-Z0-9]\\)"
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
613 "Regexp matching a fully qualified name (including attribute).")
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
614
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
615 (defconst ada-package-start-regexp
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
616 (concat "^[ \t]*\\(private[ \t]+\\)?\\(package\\)[ \t\n]+\\(body[ \t]*\\)?" ada-name-regexp)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
617 "Regexp matching start of package.
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
618 The package name is in (match-string 4).")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
619
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
620 (defconst ada-compile-goto-error-file-linenr-re
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
621 "\\([-_.a-zA-Z0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
622 "Regexp matching filename:linenr[:column].")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
623
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
624
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
625 ;;; ---- regexps for indentation functions
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
626
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
627 (defvar ada-block-start-re
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
628 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
629 (concat "\\<\\(" (regexp-opt '("begin" "declare" "else"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
630 "exception" "generic" "loop" "or"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
631 "private" "select" ))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
632 "\\|\\(\\(limited\\|abstract\\|tagged\\)[ \t\n]+\\)*record\\)\\>"))
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
633 "Regexp for keywords starting Ada blocks.")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
634
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
635 (defvar ada-end-stmt-re
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
636 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
637 (concat "\\("
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
638 ";" "\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
639 "=>[ \t]*$" "\\|"
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
640 "=>[ \t]*--.*$" "\\|"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
641 "^[ \t]*separate[ \t]*(\\(\\sw\\|[_.]\\)+)" "\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
642 "\\<" (regexp-opt '("begin" "declare" "is" "do" "else" "generic"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
643 "loop" "private" "record" "select"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
644 "then abort" "then") t) "\\>" "\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
645 "^[ \t]*" (regexp-opt '("function" "package" "procedure")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
646 t) "\\>\\(\\sw\\|[ \t_.]\\)+\\<is\\>" "\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
647 "^[ \t]*exception\\>"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
648 "\\)") )
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
649 "Regexp of possible ends for a non-broken statement.
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
650 A new statement starts after these.")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
651
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
652 (defvar ada-matching-start-re
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
653 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
654 (concat "\\<"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
655 (regexp-opt
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
656 '("end" "loop" "select" "begin" "case" "do" "declare"
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
657 "if" "task" "package" "procedure" "function" "record" "protected") t)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
658 "\\>"))
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
659 "Regexp used in `ada-goto-matching-start'.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
660
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
661 (defvar ada-matching-decl-start-re
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
662 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
663 (concat "\\<"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
664 (regexp-opt
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
665 '("is" "separate" "end" "declare" "if" "new" "begin" "generic" "when") t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
666 "\\>"))
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
667 "Regexp used in `ada-goto-matching-decl-start'.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
668
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
669 (defvar ada-loop-start-re
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
670 "\\<\\(for\\|while\\|loop\\)\\>"
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
671 "Regexp for the start of a loop.")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
672
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
673 (defvar ada-subprog-start-re
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
674 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
675 (concat "\\<" (regexp-opt '("accept" "entry" "function" "package" "procedure"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
676 "protected" "task") t) "\\>"))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
677 "Regexp for the start of a subprogram.")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
678
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
679 (defvar ada-named-block-re
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
680 "[ \t]*\\(\\sw\\|_\\)+[ \t]*:[^=]"
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
681 "Regexp of the name of a block or loop.")
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
682
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
683 (defvar ada-contextual-menu-on-identifier nil
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
684 "Set to true when the right mouse button was clicked on an identifier.")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
685
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
686 (defvar ada-contextual-menu-last-point nil
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
687 "Position of point just before displaying the menu.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
688 This is a list (point buffer).
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
689 Since `ada-popup-menu' moves the point where the user clicked, the region
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
690 is modified. Therefore no command from the menu knows what the user selected
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
691 before displaying the contextual menu.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
692 To get the original region, restore the point to this position before
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
693 calling `region-end' and `region-beginning'.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
694 Modify this variable if you want to restore the point to another position.")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
695
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
696 (easy-menu-define ada-contextual-menu nil
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
697 "Menu to use when the user presses the right mouse button.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
698 The variable `ada-contextual-menu-on-identifier' will be set to t before
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
699 displaying the menu if point was on an identifier."
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
700 '("Ada"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
701 ["Goto Declaration/Body" ada-point-and-xref
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
702 :included ada-contextual-menu-on-identifier]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
703 ["Goto Body" ada-point-and-xref-body
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
704 :included ada-contextual-menu-on-identifier]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
705 ["Goto Previous Reference" ada-xref-goto-previous-reference]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
706 ["List References" ada-find-references
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
707 :included ada-contextual-menu-on-identifier]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
708 ["List Local References" ada-find-local-references
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
709 :included ada-contextual-menu-on-identifier]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
710 ["-" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
711 ["Other File" ff-find-other-file]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
712 ["Goto Parent Unit" ada-goto-parent]))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
713
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
714
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
715 ;;------------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
716 ;; Support for imenu (see imenu.el)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
717 ;;------------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
718
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
719 (defconst ada-imenu-comment-re "\\([ \t]*--.*\\)?")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
720
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
721 (defconst ada-imenu-subprogram-menu-re
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
722 (concat "^[ \t]*\\(procedure\\|function\\)[ \t\n]+"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
723 "\\(\\(\\sw\\|_\\)+\\)[ \t\n]*\\([ \t\n]\\|([^)]+)"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
724 ada-imenu-comment-re
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
725 "\\)[ \t\n]*"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
726 "\\(return[ \t\n]+\\(\\sw\\|[_.]\\)+[ \t\n]*\\)?is[ \t\n]"))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
727
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
728 (defvar ada-imenu-generic-expression
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
729 (list
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
730 (list nil ada-imenu-subprogram-menu-re 2)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
731 (list "*Specs*"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
732 (concat
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
733 "^[ \t]*\\(procedure\\|function\\)[ \t\n]+\\(\\(\\sw\\|_\\)+\\)"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
734 "\\("
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
735 "\\(" ada-imenu-comment-re "[ \t\n]+\\|[ \t\n]*([^)]+)"
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
736 ada-imenu-comment-re "\\)";; parameter list or simple space
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
737 "\\([ \t\n]*return[ \t\n]+\\(\\sw\\|[_.]\\)+[ \t\n]*\\)?"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
738 "\\)?;") 2)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
739 '("*Tasks*" "^[ \t]*task[ \t]+\\(type[ \t]+\\)?\\(\\(body[ \t]+\\)?\\(\\sw\\|_\\)+\\)" 2)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
740 '("*Type Defs*" "^[ \t]*\\(sub\\)?type[ \t]+\\(\\(\\sw\\|_\\)+\\)" 2)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
741 '("*Protected*"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
742 "^[ \t]*protected[ \t]+\\(type[ \t]+\\)?\\(\\(body[ \t]+\\)?\\(\\sw\\|_\\)+\\)" 2)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
743 '("*Packages*" "^[ \t]*package[ \t]+\\(\\(body[ \t]+\\)?\\(\\sw\\|[_.]\\)+\\)" 1))
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
744 "Imenu generic expression for Ada mode.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
745 See `imenu-generic-expression'. This variable will create several submenus for
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
746 each type of entity that can be found in an Ada file.")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
747
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
748
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
749 ;;------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
750 ;; Support for compile.el
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
751 ;;------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
752
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
753 (defun ada-compile-mouse-goto-error ()
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
754 "Mouse interface for `ada-compile-goto-error'."
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
755 (interactive)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
756 (mouse-set-point last-input-event)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
757 (ada-compile-goto-error (point))
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
758 )
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
759
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
760 (defun ada-compile-goto-error (pos)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
761 "Replace `compile-goto-error' from compile.el.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
762 If POS is on a file and line location, go to this position. It adds
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
763 to compile.el the capacity to go to a reference in an error message.
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
764 For instance, on these lines:
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
765 foo.adb:61:11: [...] in call to size declared at foo.ads:11
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
766 foo.adb:61:11: [...] in call to local declared at line 20
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
767 the 4 file locations can be clicked on and jumped to."
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
768 (interactive "d")
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
769 (goto-char pos)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
770
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
771 (skip-chars-backward "-a-zA-Z0-9_:./\\")
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
772 (cond
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
773 ;; special case: looking at a filename:line not at the beginning of a line
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
774 ;; or a simple line reference "at line ..."
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
775 ((and (not (bolp))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
776 (or (looking-at ada-compile-goto-error-file-linenr-re)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
777 (and
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
778 (save-excursion
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
779 (beginning-of-line)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
780 (looking-at ada-compile-goto-error-file-linenr-re))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
781 (save-excursion
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
782 (if (looking-at "\\([0-9]+\\)") (backward-word 1))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
783 (looking-at "line \\([0-9]+\\)"))))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
784 )
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
785 (let ((line (if (match-beginning 2) (match-string 2) (match-string 1)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
786 (file (if (match-beginning 2) (match-string 1)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
787 (save-excursion (beginning-of-line)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
788 (looking-at ada-compile-goto-error-file-linenr-re)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
789 (match-string 1))))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
790 (error-pos (point-marker))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
791 source)
74202
abb4062752c5 (ada-which-compiler): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 74073
diff changeset
792
abb4062752c5 (ada-which-compiler): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 74073
diff changeset
793 ;; set source marker
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
794 (save-excursion
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
795 (compilation-find-file (point-marker) (match-string 1) "./")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
796 (set-buffer file)
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
797
104543
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 103989
diff changeset
798 (when (stringp line)
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 103989
diff changeset
799 (goto-char (point-min))
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 103989
diff changeset
800 (forward-line (1- (string-to-number line))))
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
801
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
802 (setq source (point-marker)))
74202
abb4062752c5 (ada-which-compiler): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 74073
diff changeset
803
abb4062752c5 (ada-which-compiler): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 74073
diff changeset
804 (compilation-goto-locus error-pos source nil)
abb4062752c5 (ada-which-compiler): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 74073
diff changeset
805
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
806 ))
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
807
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
808 ;; otherwise, default behavior
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
809 (t
74202
abb4062752c5 (ada-which-compiler): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 74073
diff changeset
810 (compile-goto-error))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
811 )
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
812 (recenter))
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
813
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
814
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
815 ;;-------------------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
816 ;; Grammar related function
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
817 ;; The functions below work with the syntax class of the characters in an Ada
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
818 ;; buffer. Two syntax tables are created, depending on whether we want '_'
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
819 ;; to be considered as part of a word or not.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
820 ;; Some characters may have multiple meanings depending on the context:
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
821 ;; - ' is either the beginning of a constant character or an attribute
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
822 ;; - # is either part of a based litteral or a gnatprep statement.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
823 ;; - " starts a string, but not if inside a constant character.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
824 ;; - ( and ) should be ignored if inside a constant character.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
825 ;; Thus their syntax property is changed automatically, and we can still use
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
826 ;; the standard Emacs functions for sexp (see `ada-in-string-p')
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
827 ;;
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
828 ;; On Emacs, this is done through the `syntax-table' text property. The
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
829 ;; corresponding action is applied automatically each time the buffer
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
830 ;; changes. If `font-lock-mode' is enabled (the default) the action is
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
831 ;; set up by `font-lock-syntactic-keywords'. Otherwise, we do it
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
832 ;; manually in `ada-after-change-function'. The proper method is
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
833 ;; installed by `ada-handle-syntax-table-properties'.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
834 ;;
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
835 ;; on XEmacs, the `syntax-table' property does not exist and we have to use a
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
836 ;; slow advice to `parse-partial-sexp' to do the same thing.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
837 ;; When executing parse-partial-sexp, we simply modify the strings before and
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
838 ;; after, so that the special constants '"', '(' and ')' do not interact
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
839 ;; with parse-partial-sexp.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
840 ;; Note: this code is slow and needs to be rewritten as soon as something
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
841 ;; better is available on XEmacs.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
842 ;;-------------------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
843
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
844 (defun ada-create-syntax-table ()
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
845 "Create the two syntax tables use in the Ada mode.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
846 The standard table declares `_' as a symbol constituent, the second one
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
847 declares it as a word constituent."
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
848 (interactive)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
849 (setq ada-mode-syntax-table (make-syntax-table))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
850
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
851 ;; define string brackets (`%' is alternative string bracket, but
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
852 ;; almost never used as such and throws font-lock and indentation
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
853 ;; off the track.)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
854 (modify-syntax-entry ?% "$" ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
855 (modify-syntax-entry ?\" "\"" ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
856
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
857 (modify-syntax-entry ?: "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
858 (modify-syntax-entry ?\; "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
859 (modify-syntax-entry ?& "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
860 (modify-syntax-entry ?\| "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
861 (modify-syntax-entry ?+ "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
862 (modify-syntax-entry ?* "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
863 (modify-syntax-entry ?/ "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
864 (modify-syntax-entry ?= "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
865 (modify-syntax-entry ?< "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
866 (modify-syntax-entry ?> "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
867 (modify-syntax-entry ?$ "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
868 (modify-syntax-entry ?\[ "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
869 (modify-syntax-entry ?\] "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
870 (modify-syntax-entry ?\{ "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
871 (modify-syntax-entry ?\} "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
872 (modify-syntax-entry ?. "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
873 (modify-syntax-entry ?\\ "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
874 (modify-syntax-entry ?\' "." ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
875
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
876 ;; a single hyphen is punctuation, but a double hyphen starts a comment
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
877 (modify-syntax-entry ?- ". 12" ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
878
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
879 ;; See the comment above on grammar related function for the special
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
880 ;; setup for '#'.
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
881 (if (featurep 'xemacs)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
882 (modify-syntax-entry ?# "<" ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
883 (modify-syntax-entry ?# "$" ada-mode-syntax-table))
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
884
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
885 ;; and \f and \n end a comment
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
886 (modify-syntax-entry ?\f "> " ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
887 (modify-syntax-entry ?\n "> " ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
888
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
889 ;; define what belongs in Ada symbols
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
890 (modify-syntax-entry ?_ "_" ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
891
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
892 ;; define parentheses to match
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
893 (modify-syntax-entry ?\( "()" ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
894 (modify-syntax-entry ?\) ")(" ada-mode-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
895
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
896 (setq ada-mode-symbol-syntax-table (copy-syntax-table ada-mode-syntax-table))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
897 (modify-syntax-entry ?_ "w" ada-mode-symbol-syntax-table)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
898 )
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
899
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
900 ;; Support of special characters in XEmacs (see the comments at the beginning
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
901 ;; of the section on Grammar related functions).
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
902
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
903 (if (featurep 'xemacs)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
904 (defadvice parse-partial-sexp (around parse-partial-sexp-protect-constants)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
905 "Handles special character constants and gnatprep statements."
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
906 (let (change)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
907 (if (< to from)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
908 (let ((tmp from))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
909 (setq from to to tmp)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
910 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
911 (goto-char from)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
912 (while (re-search-forward "'\\([(\")#]\\)'" to t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
913 (setq change (cons (list (match-beginning 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
914 1
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
915 (match-string 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
916 change))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
917 (replace-match "'A'"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
918 (goto-char from)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
919 (while (re-search-forward "\\(#[0-9a-fA-F]*#\\)" to t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
920 (setq change (cons (list (match-beginning 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
921 (length (match-string 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
922 (match-string 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
923 change))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
924 (replace-match (make-string (length (match-string 1)) ?@))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
925 ad-do-it
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
926 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
927 (while change
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
928 (goto-char (caar change))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
929 (delete-char (cadar change))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
930 (insert (caddar change))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
931 (setq change (cdr change)))))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
932
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
933 (defun ada-set-syntax-table-properties ()
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
934 "Assign `syntax-table' properties in accessible part of buffer.
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
935 In particular, character constants are said to be strings, #...#
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
936 are treated as numbers instead of gnatprep comments."
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
937 (let ((modified (buffer-modified-p))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
938 (buffer-undo-list t)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
939 (inhibit-read-only t)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
940 (inhibit-point-motion-hooks t)
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
941 (inhibit-modification-hooks t))
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
942 (remove-text-properties (point-min) (point-max) '(syntax-table nil))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
943 (goto-char (point-min))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
944 (while (re-search-forward
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
945 ;; The following regexp was adapted from
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
946 ;; `ada-font-lock-syntactic-keywords'.
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
947 "^[ \t]*\\(#\\(?:if\\|else\\|elsif\\|end\\)\\)\\|[^a-zA-Z0-9)]\\('\\)[^'\n]\\('\\)"
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
948 nil t)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
949 (if (match-beginning 1)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
950 (put-text-property
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
951 (match-beginning 1) (match-end 1) 'syntax-table '(11 . ?\n))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
952 (put-text-property
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
953 (match-beginning 2) (match-end 2) 'syntax-table '(7 . ?'))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
954 (put-text-property
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
955 (match-beginning 3) (match-end 3) 'syntax-table '(7 . ?'))))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
956 (unless modified
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
957 (restore-buffer-modified-p nil))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
958
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
959 (defun ada-after-change-function (beg end old-len)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
960 "Called when the region between BEG and END was changed in the buffer.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
961 OLD-LEN indicates what the length of the replaced text was."
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
962 (save-excursion
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
963 (save-restriction
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
964 (let ((from (progn (goto-char beg) (line-beginning-position)))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
965 (to (progn (goto-char end) (line-end-position))))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
966 (narrow-to-region from to)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
967 (save-match-data
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
968 (ada-set-syntax-table-properties))))))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
969
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
970 (defun ada-initialize-syntax-table-properties ()
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
971 "Assign `syntax-table' properties in current buffer."
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
972 (save-excursion
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
973 (save-restriction
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
974 (widen)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
975 (save-match-data
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
976 (ada-set-syntax-table-properties))))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
977 (add-hook 'after-change-functions 'ada-after-change-function nil t))
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
978
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
979 (defun ada-handle-syntax-table-properties ()
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
980 "Handle `syntax-table' properties."
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
981 (if font-lock-mode
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
982 ;; `font-lock-mode' will take care of `syntax-table' properties.
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
983 (remove-hook 'after-change-functions 'ada-after-change-function t)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
984 ;; Take care of `syntax-table' properties manually.
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
985 (ada-initialize-syntax-table-properties)))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
986
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
987 ;;------------------------------------------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
988 ;; Testing the grammatical context
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
989 ;;------------------------------------------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
990
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
991 (defsubst ada-in-comment-p (&optional parse-result)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
992 "Return t if inside a comment.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
993 If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
994 (nth 4 (or parse-result
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
995 (parse-partial-sexp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
996 (line-beginning-position) (point)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
997
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
998 (defsubst ada-in-string-p (&optional parse-result)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
999 "Return t if point is inside a string.
73434
3586ad4a01a1 (ada-in-string-p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73422
diff changeset
1000 If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1001 (nth 3 (or parse-result
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1002 (parse-partial-sexp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1003 (line-beginning-position) (point)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1004
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1005 (defsubst ada-in-string-or-comment-p (&optional parse-result)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1006 "Return t if inside a comment or string.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1007 If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'."
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1008 (setq parse-result (or parse-result
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1009 (parse-partial-sexp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1010 (line-beginning-position) (point))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1011 (or (ada-in-string-p parse-result) (ada-in-comment-p parse-result)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1012
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1013
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1014 ;;------------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1015 ;; Contextual menus
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
1016 ;; The Ada mode comes with contextual menus, bound by default to the right
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1017 ;; mouse button.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1018 ;; Add items to this menu by modifying `ada-contextual-menu'. Note that the
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1019 ;; variable `ada-contextual-menu-on-identifier' is set automatically to t
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1020 ;; if the mouse button was pressed on an identifier.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1021 ;;------------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1022
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1023 (defun ada-call-from-contextual-menu (function)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1024 "Execute FUNCTION when called from the contextual menu.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1025 It forces Emacs to change the cursor position."
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1026 (interactive)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1027 (funcall function)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1028 (setq ada-contextual-menu-last-point
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1029 (list (point) (current-buffer))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1030
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1031 (defun ada-popup-menu (position)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1032 "Pops up a contextual menu, depending on where the user clicked.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1033 POSITION is the location the mouse was clicked on.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1034 Sets `ada-contextual-menu-last-point' to the current position before
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1035 displaying the menu. When a function from the menu is called, the
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1036 point is where the mouse button was clicked."
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1037 (interactive "e")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1038
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1039 ;; declare this as a local variable, so that the function called
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1040 ;; in the contextual menu does not hide the region in
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1041 ;; transient-mark-mode.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1042 (let ((deactivate-mark nil))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1043 (setq ada-contextual-menu-last-point
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1044 (list (point) (current-buffer)))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1045 (mouse-set-point last-input-event)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1046
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1047 (setq ada-contextual-menu-on-identifier
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1048 (and (char-after)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1049 (or (= (char-syntax (char-after)) ?w)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1050 (= (char-after) ?_))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1051 (not (ada-in-string-or-comment-p))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1052 (save-excursion (skip-syntax-forward "w")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1053 (not (ada-after-keyword-p)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1054 ))
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1055 (if (fboundp 'popup-menu)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1056 (funcall (symbol-function 'popup-menu) ada-contextual-menu)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1057 (let (choice)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1058 (setq choice (x-popup-menu position ada-contextual-menu))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1059 (if choice
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1060 (funcall (lookup-key ada-contextual-menu (vector (car choice)))))))
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1061
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1062 (set-buffer (cadr ada-contextual-menu-last-point))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1063 (goto-char (car ada-contextual-menu-last-point))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1064 ))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1065
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1066
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1067 ;;------------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1068 ;; Misc functions
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1069 ;;------------------------------------------------------------------
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1070
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1071 ;;;###autoload
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1072 (defun ada-add-extensions (spec body)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1073 "Define SPEC and BODY as being valid extensions for Ada files.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1074 Going from body to spec with `ff-find-other-file' used these
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1075 extensions.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1076 SPEC and BODY are two regular expressions that must match against
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1077 the file name."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1078 (let* ((reg (concat (regexp-quote body) "$"))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1079 (tmp (assoc reg ada-other-file-alist)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1080 (if tmp
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1081 (setcdr tmp (list (cons spec (cadr tmp))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1082 (add-to-list 'ada-other-file-alist (list reg (list spec)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1083
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1084 (let* ((reg (concat (regexp-quote spec) "$"))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1085 (tmp (assoc reg ada-other-file-alist)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1086 (if tmp
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1087 (setcdr tmp (list (cons body (cadr tmp))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1088 (add-to-list 'ada-other-file-alist (list reg (list body)))))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1089
41082
6204eb16d008 (ada-add-extensions): Quote regexp special
Andreas Schwab <schwab@suse.de>
parents: 41036
diff changeset
1090 (add-to-list 'auto-mode-alist
6204eb16d008 (ada-add-extensions): Quote regexp special
Andreas Schwab <schwab@suse.de>
parents: 41036
diff changeset
1091 (cons (concat (regexp-quote spec) "\\'") 'ada-mode))
6204eb16d008 (ada-add-extensions): Quote regexp special
Andreas Schwab <schwab@suse.de>
parents: 41036
diff changeset
1092 (add-to-list 'auto-mode-alist
6204eb16d008 (ada-add-extensions): Quote regexp special
Andreas Schwab <schwab@suse.de>
parents: 41036
diff changeset
1093 (cons (concat (regexp-quote body) "\\'") 'ada-mode))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1094
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1095 (add-to-list 'ada-spec-suffixes spec)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1096 (add-to-list 'ada-body-suffixes body)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1097
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1098 ;; Support for speedbar (Specifies that we want to see these files in
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1099 ;; speedbar)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1100 (if (fboundp 'speedbar-add-supported-extension)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1101 (progn
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1102 (funcall (symbol-function 'speedbar-add-supported-extension)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1103 spec)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1104 (funcall (symbol-function 'speedbar-add-supported-extension)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1105 body)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1106 )
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1107
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1108
10707
4a2ea4f52ea0 Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents: 10705
diff changeset
1109 ;;;###autoload
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1110 (defun ada-mode ()
100891
e7407b3eef86 * progmodes/ada-mode.el (ada-mode): Simplify doc string.
Juanma Barranquero <lekktu@gmail.com>
parents: 98674
diff changeset
1111 "Ada mode is the major mode for editing Ada code."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1112
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1113 (interactive)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1114 (kill-all-local-variables)
84917
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
1115
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
1116 (set-syntax-table ada-mode-syntax-table)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1117
59237
276072a4cd9d (ada-mode): Use mode-require-final-newline.
Richard M. Stallman <rms@gnu.org>
parents: 55730
diff changeset
1118 (set (make-local-variable 'require-final-newline) mode-require-final-newline)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1119
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1120 ;; Set the paragraph delimiters so that one can select a whole block
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1121 ;; simply with M-h
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1122 (set (make-local-variable 'paragraph-start) "[ \t\n\f]*$")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1123 (set (make-local-variable 'paragraph-separate) "[ \t\n\f]*$")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1124
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1125 ;; comment end must be set because it may hold a wrong value if
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1126 ;; this buffer had been in another mode before. RE
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1127 (set (make-local-variable 'comment-end) "")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1128
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1129 ;; used by autofill and indent-new-comment-line
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1130 (set (make-local-variable 'comment-start-skip) "---*[ \t]*")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1131
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1132 ;; used by autofill to break a comment line and continue it on another line.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1133 ;; The reason we need this one is that the default behavior does not work
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1134 ;; correctly with the definition of paragraph-start above when the comment
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1135 ;; is right after a multi-line subprogram declaration (the comments are
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1136 ;; aligned under the latest parameter, not under the declaration start).
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1137 (set (make-local-variable 'comment-line-break-function)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1138 (lambda (&optional soft) (let ((fill-prefix nil))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1139 (indent-new-comment-line soft))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1140
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1141 (set (make-local-variable 'indent-line-function)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1142 'ada-indent-current-function)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1143
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1144 (set (make-local-variable 'comment-column) 40)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1145
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1146 ;; Emacs 20.3 defines a comment-padding to insert spaces between
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1147 ;; the comment and the text. We do not want any, this is already
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1148 ;; included in comment-start
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
1149 (unless (featurep 'xemacs)
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
1150 (set (make-local-variable 'parse-sexp-ignore-comments) t)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
1151 (set (make-local-variable 'comment-padding) 0)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
1152 (set (make-local-variable 'parse-sexp-lookup-properties) t))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1153
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1154 (set 'case-fold-search t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1155 (if (boundp 'imenu-case-fold-search)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1156 (set 'imenu-case-fold-search t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1157
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1158 (set (make-local-variable 'fill-paragraph-function)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1159 'ada-fill-comment-paragraph)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1160
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1161 ;; Support for compile.el
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1162 ;; We just substitute our own functions to go to the error.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1163 (add-hook 'compilation-mode-hook
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1164 (lambda()
38446
f63fbebe03fb (ada-mode): Avoid unneeded version checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38422
diff changeset
1165 ;; FIXME: This has global impact! -stef
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1166 (define-key compilation-minor-mode-map [mouse-2]
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1167 'ada-compile-mouse-goto-error)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1168 (define-key compilation-minor-mode-map "\C-c\C-c"
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1169 'ada-compile-goto-error)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1170 (define-key compilation-minor-mode-map "\C-m"
38446
f63fbebe03fb (ada-mode): Avoid unneeded version checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38422
diff changeset
1171 'ada-compile-goto-error)))
f63fbebe03fb (ada-mode): Avoid unneeded version checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38422
diff changeset
1172
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1173 ;; font-lock support :
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1174
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1175 (set (make-local-variable 'font-lock-defaults)
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1176 '(ada-font-lock-keywords
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1177 nil t
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1178 ((?\_ . "w") (?# . "."))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1179 beginning-of-line
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1180 (font-lock-syntactic-keywords . ada-font-lock-syntactic-keywords)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1181
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1182 ;; Set up support for find-file.el.
38446
f63fbebe03fb (ada-mode): Avoid unneeded version checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38422
diff changeset
1183 (set (make-local-variable 'ff-other-file-alist)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1184 'ada-other-file-alist)
38446
f63fbebe03fb (ada-mode): Avoid unneeded version checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38422
diff changeset
1185 (set (make-local-variable 'ff-search-directories)
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
1186 'ada-search-directories-internal)
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
1187 (setq ff-post-load-hook 'ada-set-point-accordingly
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1188 ff-file-created-hook 'ada-make-body)
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
1189 (add-hook 'ff-pre-load-hook 'ada-which-function-are-we-in)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1190
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1191 (make-local-variable 'ff-special-constructs)
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1192 (mapc (lambda (pair) (add-to-list 'ff-special-constructs pair))
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1193 (list
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1194 ;; Top level child package declaration; go to the parent package.
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1195 (cons (eval-when-compile
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1196 (concat "^\\(private[ \t]\\)?[ \t]*package[ \t]+"
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1197 "\\(body[ \t]+\\)?"
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1198 "\\(\\(\\sw\\|[_.]\\)+\\)\\.\\(\\sw\\|_\\)+[ \t\n]+is"))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1199 (lambda ()
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1200 (ff-get-file
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1201 ada-search-directories-internal
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1202 (ada-make-filename-from-adaname (match-string 3))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1203 ada-spec-suffixes)))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1204
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1205 ;; A "separate" clause.
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1206 (cons "^separate[ \t\n]*(\\(\\(\\sw\\|[_.]\\)+\\))"
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1207 (lambda ()
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1208 (ff-get-file
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1209 ada-search-directories-internal
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1210 (ada-make-filename-from-adaname (match-string 1))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1211 ada-spec-suffixes)))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1212
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1213 ;; A "with" clause.
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1214 (cons "^with[ \t]+\\([a-zA-Z0-9_\\.]+\\)"
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1215 (lambda ()
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1216 (ff-get-file
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1217 ada-search-directories-internal
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1218 (ada-make-filename-from-adaname (match-string 1))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1219 ada-spec-suffixes)))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1220 ))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1221
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1222 ;; Support for outline-minor-mode
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1223 (set (make-local-variable 'outline-regexp)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1224 "\\([ \t]*\\(procedure\\|function\\|package\\|if\\|while\\|for\\|declare\\|case\\|end\\|begin\\|loop\\)\\|--\\)")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1225 (set (make-local-variable 'outline-level) 'ada-outline-level)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1226
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1227 ;; Support for imenu : We want a sorted index
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1228 (setq imenu-generic-expression ada-imenu-generic-expression)
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1229
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1230 (setq imenu-sort-function 'imenu--sort-by-name)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1231
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1232 ;; Support for ispell : Check only comments
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1233 (set (make-local-variable 'ispell-check-comments) 'exclusive)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1234
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1235 ;; Support for align
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1236 (add-to-list 'align-dq-string-modes 'ada-mode)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1237 (add-to-list 'align-open-comment-modes 'ada-mode)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1238 (set (make-local-variable 'align-region-separate) ada-align-region-separate)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1239
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1240 ;; Exclude comments alone on line from alignment.
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1241 (add-to-list 'align-exclude-rules-list
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1242 '(ada-solo-comment
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1243 (regexp . "^\\(\\s-*\\)--")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1244 (modes . '(ada-mode))))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1245 (add-to-list 'align-exclude-rules-list
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1246 '(ada-solo-use
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1247 (regexp . "^\\(\\s-*\\)\\<use\\>")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1248 (modes . '(ada-mode))))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1249
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1250 (setq ada-align-modes nil)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1251
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1252 (add-to-list 'ada-align-modes
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1253 '(ada-declaration-assign
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1254 (regexp . "[^:]\\(\\s-*\\):[^:]")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1255 (valid . (lambda() (not (ada-in-comment-p))))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1256 (repeat . t)
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1257 (modes . '(ada-mode))))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1258 (add-to-list 'ada-align-modes
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1259 '(ada-associate
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1260 (regexp . "[^=]\\(\\s-*\\)=>")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1261 (valid . (lambda() (not (ada-in-comment-p))))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1262 (modes . '(ada-mode))))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1263 (add-to-list 'ada-align-modes
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1264 '(ada-comment
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1265 (regexp . "\\(\\s-*\\)--")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1266 (modes . '(ada-mode))))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1267 (add-to-list 'ada-align-modes
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1268 '(ada-use
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1269 (regexp . "\\(\\s-*\\)\\<use\\s-")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1270 (valid . (lambda() (not (ada-in-comment-p))))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1271 (modes . '(ada-mode))))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1272 (add-to-list 'ada-align-modes
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1273 '(ada-at
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1274 (regexp . "\\(\\s-+\\)at\\>")
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1275 (modes . '(ada-mode))))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1276
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1277 (setq align-mode-rules-list ada-align-modes)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
1278
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1279 ;; Set up the contextual menu
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1280 (if ada-popup-key
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1281 (define-key ada-mode-map ada-popup-key 'ada-popup-menu))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1282
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1283 ;; Support for Abbreviations (the user still need to "M-x abbrev-mode"
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1284 (define-abbrev-table 'ada-mode-abbrev-table ())
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1285 (setq local-abbrev-table ada-mode-abbrev-table)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1286
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
1287 ;; Support for which-function mode
52692
3ec76ef338f9 (ada-mode): Don't use advice. Instead, set which-func-functions.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1288 (make-local-variable 'which-func-functions)
3ec76ef338f9 (ada-mode): Don't use advice. Instead, set which-func-functions.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1289 (setq which-func-functions '(ada-which-function))
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
1290
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1291 ;; Support for indent-new-comment-line (Especially for XEmacs)
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
1292 (set (make-local-variable 'comment-multi-line) nil)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1293
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1294 ;; Support for add-log
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1295 (set (make-local-variable 'add-log-current-defun-function) 'ada-which-function)
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
1296
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1297 (setq major-mode 'ada-mode
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1298 mode-name "Ada")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1299
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1300 (use-local-map ada-mode-map)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1301
38446
f63fbebe03fb (ada-mode): Avoid unneeded version checks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38422
diff changeset
1302 (easy-menu-add ada-mode-menu ada-mode-map)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1303
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1304 (set-syntax-table ada-mode-syntax-table)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1305
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1306 (if ada-clean-buffer-before-saving
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1307 (progn
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1308 ;; remove all spaces at the end of lines in the whole buffer.
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
1309 (add-hook 'local-write-file-hooks 'delete-trailing-whitespace)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1310 ;; convert all tabs to the correct number of spaces.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1311 (add-hook 'local-write-file-hooks
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1312 (lambda () (untabify (point-min) (point-max))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1313
62213
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1314 (set (make-local-variable 'skeleton-further-elements)
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1315 '((< '(backward-delete-char-untabify
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1316 (min ada-indent (current-column))))))
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1317 (add-hook 'skeleton-end-hook 'ada-adjust-case-skeleton nil t)
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1318
62772
f2892faa87d4 * progmodes/ada-mode.el (ada-mode):
Lute Kamstra <lute@gnu.org>
parents: 62213
diff changeset
1319 (run-mode-hooks 'ada-mode-hook)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1320
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1321 ;; To be run after the hook, in case the user modified
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1322 ;; ada-fill-comment-prefix
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1323 (make-local-variable 'comment-start)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1324 (if ada-fill-comment-prefix
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1325 (set 'comment-start ada-fill-comment-prefix)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1326 (set 'comment-start "-- "))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
1327
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1328 ;; Run this after the hook to give the users a chance to activate
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1329 ;; font-lock-mode
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1330
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
1331 (unless (featurep 'xemacs)
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
1332 (ada-initialize-syntax-table-properties)
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
1333 (add-hook 'font-lock-mode-hook 'ada-handle-syntax-table-properties nil t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1334
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1335 ;; the following has to be done after running the ada-mode-hook
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1336 ;; because users might want to set the values of these variable
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1337 ;; inside the hook
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1338
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1339 (cond ((eq ada-language-version 'ada83)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1340 (setq ada-keywords ada-83-keywords))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1341 ((eq ada-language-version 'ada95)
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
1342 (setq ada-keywords ada-95-keywords))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
1343 ((eq ada-language-version 'ada2005)
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
1344 (setq ada-keywords ada-2005-keywords)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1345
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1346 (if ada-auto-case
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1347 (ada-activate-keys-for-case)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1348
62213
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1349 (defun ada-adjust-case-skeleton ()
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1350 "Adjust the case of the text inserted by a skeleton."
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1351 (save-excursion
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1352 (let ((aa-end (point)))
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1353 (ada-adjust-case-region
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1354 (progn (goto-char (symbol-value 'beg)) (forward-word -1) (point))
39b445ca202b (ada-adjust-case-skeleton): Moved from ada-stmt.el.
Richard M. Stallman <rms@gnu.org>
parents: 59237
diff changeset
1355 (goto-char aa-end)))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1356
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1357 (defun ada-region-selected ()
87401
5c852af4e53c (ada-region-selected): Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 84917
diff changeset
1358 "Should we operate on an active region?"
5c852af4e53c (ada-region-selected): Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 84917
diff changeset
1359 (if (fboundp 'use-region-p)
5c852af4e53c (ada-region-selected): Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 84917
diff changeset
1360 (use-region-p)
5c852af4e53c (ada-region-selected): Use `use-region-p'.
Richard M. Stallman <rms@gnu.org>
parents: 84917
diff changeset
1361 (region-active-p)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1362
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1363 ;;-----------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1364 ;; auto-casing
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
1365 ;; Since Ada is case-insensitive, the Ada mode provides an extensive set of
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1366 ;; functions to auto-case identifiers, keywords, ...
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1367 ;; The basic rules for autocasing are defined through the variables
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1368 ;; `ada-case-attribute', `ada-case-keyword' and `ada-case-identifier'. These
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1369 ;; are references to the functions that will do the actual casing.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1370 ;;
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1371 ;; However, in most cases, the user will want to define some exceptions to
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1372 ;; these casing rules. This is done through a list of files, that contain
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1373 ;; one word per line. These files are stored in `ada-case-exception-file'.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1374 ;; For backward compatibility, this variable can also be a string.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1375 ;;-----------------------------------------------------------------
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1376
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1377 (defun ada-save-exceptions-to-file (file-name)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1378 "Save the casing exception lists to the file FILE-NAME.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1379 Casing exception lists are `ada-case-exception' and `ada-case-exception-substring'."
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1380 (find-file (expand-file-name file-name))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1381 (erase-buffer)
84917
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
1382 (mapc (lambda (x) (insert (car x) "\n"))
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
1383 (sort (copy-sequence ada-case-exception)
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
1384 (lambda(a b) (string< (car a) (car b)))))
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
1385 (mapc (lambda (x) (insert "*" (car x) "\n"))
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
1386 (sort (copy-sequence ada-case-exception-substring)
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
1387 (lambda(a b) (string< (car a) (car b)))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1388 (save-buffer)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1389 (kill-buffer nil)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1390 )
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
1391
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1392 (defun ada-create-case-exception (&optional word)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1393 "Define WORD as an exception for the casing system.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1394 If WORD is not given, then the current word in the buffer is used instead.
97078
2f3e251c6e3c Typo fixes for Ada mode.
Juanma Barranquero <lekktu@gmail.com>
parents: 97058
diff changeset
1395 The new word is added to the first file in `ada-case-exception-file'.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1396 The standard casing rules will no longer apply to this word."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1397 (interactive)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1398 (let ((previous-syntax-table (syntax-table))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1399 file-name
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1400 )
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1401
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1402 (cond ((stringp ada-case-exception-file)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1403 (setq file-name ada-case-exception-file))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1404 ((listp ada-case-exception-file)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1405 (setq file-name (car ada-case-exception-file)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1406 (t
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1407 (error (concat "No exception file specified. "
63425
d6e1fdb10546 (ada-create-case-exception, ada-create-case-exception-substring,
Juanma Barranquero <lekktu@gmail.com>
parents: 62772
diff changeset
1408 "See variable ada-case-exception-file"))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1409
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1410 (set-syntax-table ada-mode-symbol-syntax-table)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1411 (unless word
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1412 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1413 (skip-syntax-backward "w")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1414 (setq word (buffer-substring-no-properties
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1415 (point) (save-excursion (forward-word 1) (point))))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1416 (set-syntax-table previous-syntax-table)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1417
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1418 ;; Reread the exceptions file, in case it was modified by some other,
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1419 (ada-case-read-exceptions-from-file file-name)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1420
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1421 ;; If the word is already in the list, even with a different casing
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1422 ;; we simply want to replace it.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1423 (if (and (not (equal ada-case-exception '()))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1424 (assoc-string word ada-case-exception t))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1425 (setcar (assoc-string word ada-case-exception t) word)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1426 (add-to-list 'ada-case-exception (cons word t))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1427 )
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1428
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1429 (ada-save-exceptions-to-file file-name)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1430 ))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1431
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1432 (defun ada-create-case-exception-substring (&optional word)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1433 "Define the substring WORD as an exception for the casing system.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1434 If WORD is not given, then the current word in the buffer is used instead,
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1435 or the selected region if any is active.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1436 The new word is added to the first file in `ada-case-exception-file'.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1437 When auto-casing a word, this substring will be special-cased, unless the
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1438 word itself has a special casing."
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1439 (interactive)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1440 (let ((file-name
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1441 (cond ((stringp ada-case-exception-file)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1442 ada-case-exception-file)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1443 ((listp ada-case-exception-file)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1444 (car ada-case-exception-file))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1445 (t
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
1446 (error (concat "No exception file specified. "
63425
d6e1fdb10546 (ada-create-case-exception, ada-create-case-exception-substring,
Juanma Barranquero <lekktu@gmail.com>
parents: 62772
diff changeset
1447 "See variable ada-case-exception-file"))))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1448
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1449 ;; Find the substring to define as an exception. Order is: the parameter,
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1450 ;; if any, or the selected region, or the word under the cursor
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1451 (cond
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1452 (word nil)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1453
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1454 ((ada-region-selected)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1455 (setq word (buffer-substring-no-properties
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1456 (region-beginning) (region-end))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1457
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1458 (t
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1459 (let ((underscore-syntax (char-syntax ?_)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1460 (unwind-protect
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1461 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1462 (modify-syntax-entry ?_ "." (syntax-table))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1463 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1464 (skip-syntax-backward "w")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1465 (set 'word (buffer-substring-no-properties
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1466 (point)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1467 (save-excursion (forward-word 1) (point))))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1468 (modify-syntax-entry ?_ (make-string 1 underscore-syntax)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1469 (syntax-table))))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1470
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1471 ;; Reread the exceptions file, in case it was modified by some other,
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1472 (ada-case-read-exceptions-from-file file-name)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1473
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1474 ;; If the word is already in the list, even with a different casing
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1475 ;; we simply want to replace it.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1476 (if (and (not (equal ada-case-exception-substring '()))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1477 (assoc-string word ada-case-exception-substring t))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1478 (setcar (assoc-string word ada-case-exception-substring t) word)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1479 (add-to-list 'ada-case-exception-substring (cons word t))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1480 )
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1481
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1482 (ada-save-exceptions-to-file file-name)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1483
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
1484 (message "%s" (concat "Defining " word " as a casing exception"))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1485
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1486 (defun ada-case-read-exceptions-from-file (file-name)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1487 "Read the content of the casing exception file FILE-NAME."
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1488 (if (file-readable-p (expand-file-name file-name))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1489 (let ((buffer (current-buffer)))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1490 (find-file (expand-file-name file-name))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1491 (set-syntax-table ada-mode-symbol-syntax-table)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1492 (widen)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1493 (goto-char (point-min))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1494 (while (not (eobp))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1495
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1496 ;; If the item is already in the list, even with an other casing,
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1497 ;; do not add it again. This way, the user can easily decide which
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1498 ;; priority should be applied to each casing exception
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1499 (let ((word (buffer-substring-no-properties
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1500 (point) (save-excursion (forward-word 1) (point)))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1501
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1502 ;; Handling a substring ?
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1503 (if (char-equal (string-to-char word) ?*)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1504 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1505 (setq word (substring word 1))
55730
b4eeb441c089 Use assoc-string, not assoc-ignore-case.
Richard M. Stallman <rms@gnu.org>
parents: 54889
diff changeset
1506 (unless (assoc-string word ada-case-exception-substring t)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1507 (add-to-list 'ada-case-exception-substring (cons word t))))
55730
b4eeb441c089 Use assoc-string, not assoc-ignore-case.
Richard M. Stallman <rms@gnu.org>
parents: 54889
diff changeset
1508 (unless (assoc-string word ada-case-exception t)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1509 (add-to-list 'ada-case-exception (cons word t)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1510
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1511 (forward-line 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1512 (kill-buffer nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1513 (set-buffer buffer)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1514 )
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1515
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1516 (defun ada-case-read-exceptions ()
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1517 "Read all the casing exception files from `ada-case-exception-file'."
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1518 (interactive)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1519
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1520 ;; Reinitialize the casing exception list
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1521 (setq ada-case-exception '()
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1522 ada-case-exception-substring '())
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1523
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1524 (cond ((stringp ada-case-exception-file)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1525 (ada-case-read-exceptions-from-file ada-case-exception-file))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1526
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1527 ((listp ada-case-exception-file)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1528 (mapcar 'ada-case-read-exceptions-from-file
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1529 ada-case-exception-file))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1530
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1531 (defun ada-adjust-case-substring ()
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1532 "Adjust case of substrings in the previous word."
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1533 (interactive)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1534 (let ((substrings ada-case-exception-substring)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1535 (max (point))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1536 (case-fold-search t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1537 (underscore-syntax (char-syntax ?_))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1538 re)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1539
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1540 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1541 (forward-word -1)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
1542
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1543 (unwind-protect
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1544 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1545 (modify-syntax-entry ?_ "." (syntax-table))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
1546
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1547 (while substrings
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1548 (setq re (concat "\\b" (regexp-quote (caar substrings)) "\\b"))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
1549
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1550 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1551 (while (re-search-forward re max t)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1552 (replace-match (caar substrings) t)))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1553 (setq substrings (cdr substrings))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1554 )
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1555 )
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1556 (modify-syntax-entry ?_ (make-string 1 underscore-syntax) (syntax-table)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1557 )))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1558
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1559 (defun ada-adjust-case-identifier ()
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1560 "Adjust case of the previous identifier.
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
1561 The auto-casing is done according to the value of `ada-case-identifier'
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
1562 and the exceptions defined in `ada-case-exception-file'."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1563 (interactive)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1564 (if (or (equal ada-case-exception '())
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1565 (equal (char-after) ?_))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1566 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1567 (funcall ada-case-identifier -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1568 (ada-adjust-case-substring))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1569
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1570 (progn
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1571 (let ((end (point))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1572 (start (save-excursion (skip-syntax-backward "w")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1573 (point)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1574 match)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1575 ;; If we have an exception, replace the word by the correct casing
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1576 (if (setq match (assoc-string (buffer-substring start end)
55730
b4eeb441c089 Use assoc-string, not assoc-ignore-case.
Richard M. Stallman <rms@gnu.org>
parents: 54889
diff changeset
1577 ada-case-exception t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1578
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1579 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1580 (delete-region start end)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1581 (insert (car match)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1582
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1583 ;; Else simply re-case the word
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1584 (funcall ada-case-identifier -1)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1585 (ada-adjust-case-substring))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1586
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1587 (defun ada-after-keyword-p ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1588 "Return t if cursor is after a keyword that is not an attribute."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1589 (save-excursion
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1590 (forward-word -1)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1591 (and (not (and (char-before)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1592 (or (= (char-before) ?_)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1593 (= (char-before) ?'))));; unless we have a _ or '
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1594 (looking-at (concat ada-keywords "[^_]")))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1595
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1596 (defun ada-adjust-case (&optional force-identifier)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1597 "Adjust the case of the word before the character just typed.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1598 If FORCE-IDENTIFIER is non-nil then also adjust keyword as identifier."
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1599 (if (not (bobp))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1600 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1601 (forward-char -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1602 (if (and (not (bobp))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1603 ;; or if at the end of a character constant
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1604 (not (and (eq (following-char) ?')
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1605 (eq (char-before (1- (point))) ?')))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1606 ;; or if the previous character was not part of a word
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1607 (eq (char-syntax (char-before)) ?w)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1608 ;; if in a string or a comment
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1609 (not (ada-in-string-or-comment-p))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1610 )
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1611 (if (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1612 (forward-word -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1613 (or (= (point) (point-min))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1614 (backward-char 1))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1615 (= (following-char) ?'))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1616 (funcall ada-case-attribute -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1617 (if (and
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1618 (not force-identifier) ; (MH)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1619 (ada-after-keyword-p))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1620 (funcall ada-case-keyword -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1621 (ada-adjust-case-identifier))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1622 (forward-char 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
1623 ))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1624 )
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1625
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1626 (defun ada-adjust-case-interactive (arg)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1627 "Adjust the case of the previous word, and process the character just typed.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1628 ARG is the prefix the user entered with \\[universal-argument]."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1629 (interactive "P")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1630
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1631 (if ada-auto-case
101002
3b3c7e10cd97 Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100891
diff changeset
1632 (let ((lastk last-command-event)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1633 (previous-syntax-table (syntax-table)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1634
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1635 (unwind-protect
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1636 (progn
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1637 (set-syntax-table ada-mode-symbol-syntax-table)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1638 (cond ((or (eq lastk ?\n)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1639 (eq lastk ?\r))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1640 ;; horrible kludge
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1641 (insert " ")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1642 (ada-adjust-case)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1643 ;; horrible dekludge
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1644 (delete-backward-char 1)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1645 ;; some special keys and their bindings
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1646 (cond
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1647 ((eq lastk ?\n)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1648 (funcall ada-lfd-binding))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1649 ((eq lastk ?\r)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1650 (funcall ada-ret-binding))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1651 ((eq lastk ?\C-i) (ada-tab))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1652 ;; Else just insert the character
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1653 ((self-insert-command (prefix-numeric-value arg))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1654 ;; if there is a keyword in front of the underscore
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1655 ;; then it should be part of an identifier (MH)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1656 (if (eq lastk ?_)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1657 (ada-adjust-case t)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1658 (ada-adjust-case))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1659 )
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1660 ;; Restore the syntax table
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1661 (set-syntax-table previous-syntax-table))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1662 )
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1663
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1664 ;; Else, no auto-casing
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1665 (cond
101002
3b3c7e10cd97 Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100891
diff changeset
1666 ((eq last-command-event ?\n)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1667 (funcall ada-lfd-binding))
101002
3b3c7e10cd97 Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100891
diff changeset
1668 ((eq last-command-event ?\r)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1669 (funcall ada-ret-binding))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1670 (t
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1671 (self-insert-command (prefix-numeric-value arg))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1672 ))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1673
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1674 (defun ada-activate-keys-for-case ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1675 "Modify the key bindings for all the keys that should readjust the casing."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1676 (interactive)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1677 ;; Save original key-bindings to allow swapping ret/lfd
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1678 ;; when casing is activated.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1679 ;; The 'or ...' is there to be sure that the value will not
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1680 ;; be changed again when Ada mode is called more than once
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1681 (or ada-ret-binding (setq ada-ret-binding (key-binding "\C-M")))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1682 (or ada-lfd-binding (setq ada-lfd-binding (key-binding "\C-j")))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1683
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1684 ;; Call case modifying function after certain keys.
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1685 (mapcar (function (lambda(key) (define-key
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1686 ada-mode-map
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1687 (char-to-string key)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1688 'ada-adjust-case-interactive)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1689 '( ?` ?_ ?# ?% ?& ?* ?( ?) ?- ?= ?+
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1690 ?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r )))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1691
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1692 (defun ada-loose-case-word (&optional arg)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1693 "Upcase first letter and letters following `_' in the following word.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1694 No other letter is modified.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1695 ARG is ignored, and is there for compatibility with `capitalize-word' only."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1696 (interactive)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1697 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1698 (let ((end (save-excursion (skip-syntax-forward "w") (point)))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1699 (first t))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1700 (skip-syntax-backward "w")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1701 (while (and (or first (search-forward "_" end t))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1702 (< (point) end))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1703 (and first
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1704 (setq first nil))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1705 (insert-char (upcase (following-char)) 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1706 (delete-char 1)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1707
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1708 (defun ada-no-auto-case (&optional arg)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1709 "Do nothing. ARG is ignored.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1710 This function can be used for the auto-casing variables in Ada mode, to
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
1711 adapt to unusal auto-casing schemes. Since it does nothing, you can for
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1712 instance use it for `ada-case-identifier' if you don't want any special
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1713 auto-casing for identifiers, whereas keywords have to be lower-cased.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1714 See also `ada-auto-case' to disable auto casing altogether."
97078
2f3e251c6e3c Typo fixes for Ada mode.
Juanma Barranquero <lekktu@gmail.com>
parents: 97058
diff changeset
1715 nil)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1716
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1717 (defun ada-capitalize-word (&optional arg)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1718 "Upcase first letter and letters following '_', lower case other letters.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1719 ARG is ignored, and is there for compatibility with `capitalize-word' only."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1720 (interactive)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1721 (let ((end (save-excursion (skip-syntax-forward "w") (point)))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1722 (begin (save-excursion (skip-syntax-backward "w") (point))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1723 (modify-syntax-entry ?_ "_")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1724 (capitalize-region begin end)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1725 (modify-syntax-entry ?_ "w")))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1726
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1727 (defun ada-adjust-case-region (from to)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1728 "Adjust the case of all words in the region between FROM and TO.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1729 Attention: This function might take very long for big regions!"
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1730 (interactive "*r")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1731 (let ((begin nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1732 (end nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1733 (keywordp nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1734 (attribp nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1735 (previous-syntax-table (syntax-table)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1736 (message "Adjusting case ...")
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
1737 (unwind-protect
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1738 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1739 (set-syntax-table ada-mode-symbol-syntax-table)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1740 (goto-char to)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1741 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1742 ;; loop: look for all identifiers, keywords, and attributes
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1743 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1744 (while (re-search-backward "\\<\\(\\sw+\\)\\>" from t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1745 (setq end (match-end 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1746 (setq attribp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1747 (and (> (point) from)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1748 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1749 (forward-char -1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1750 (setq attribp (looking-at "'.[^']")))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1751 (or
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1752 ;; do nothing if it is a string or comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1753 (ada-in-string-or-comment-p)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1754 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1755 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1756 ;; get the identifier or keyword or attribute
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1757 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1758 (setq begin (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1759 (setq keywordp (looking-at ada-keywords))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1760 (goto-char end)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1761 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1762 ;; casing according to user-option
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1763 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1764 (if attribp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1765 (funcall ada-case-attribute -1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1766 (if keywordp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1767 (funcall ada-case-keyword -1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1768 (ada-adjust-case-identifier)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1769 (goto-char begin))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1770 (message "Adjusting case ... Done"))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1771 (set-syntax-table previous-syntax-table))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1772
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1773 (defun ada-adjust-case-buffer ()
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
1774 "Adjust the case of all words in the whole buffer.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1775 ATTENTION: This function might take very long for big buffers!"
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
1776 (interactive "*")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1777 (ada-adjust-case-region (point-min) (point-max)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1778
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1779
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1780 ;;--------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1781 ;; Format Parameter Lists
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1782 ;; Some special algorithms are provided to indent the parameter lists in
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1783 ;; subprogram declarations. This is done in two steps:
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1784 ;; - First parses the parameter list. The returned list has the following
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1785 ;; format:
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1786 ;; ( (<Param_Name> in? out? access? <Type_Name> <Default_Expression>)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1787 ;; ... )
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1788 ;; This is done in `ada-scan-paramlist'.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1789 ;; - Delete and recreate the parameter list in function
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1790 ;; `ada-insert-paramlist'.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1791 ;; Both steps are called from `ada-format-paramlist'.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1792 ;; Note: Comments inside the parameter list are lost.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1793 ;; The syntax has to be correct, or the reformating will fail.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1794 ;;--------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1795
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1796 (defun ada-format-paramlist ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1797 "Reformat the parameter list point is in."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1798 (interactive)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1799 (let ((begin nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1800 (end nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1801 (delend nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1802 (paramlist nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1803 (previous-syntax-table (syntax-table)))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
1804 (unwind-protect
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1805 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1806 (set-syntax-table ada-mode-symbol-syntax-table)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1807
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1808 ;; check if really inside parameter list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1809 (or (ada-in-paramlist-p)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1810 (error "Not in parameter list"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1811
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1812 ;; find start of current parameter-list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1813 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1814 (concat ada-subprog-start-re "\\|\\<body\\>" ) t nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1815 (down-list 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1816 (backward-char 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1817 (setq begin (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1818
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1819 ;; find end of parameter-list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1820 (forward-sexp 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1821 (setq delend (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1822 (delete-char -1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1823 (insert "\n")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1824
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1825 ;; find end of last parameter-declaration
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1826 (forward-comment -1000)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1827 (setq end (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1828
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1829 ;; build a list of all elements of the parameter-list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1830 (setq paramlist (ada-scan-paramlist (1+ begin) end))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1831
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1832 ;; delete the original parameter-list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1833 (delete-region begin delend)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1834
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1835 ;; insert the new parameter-list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1836 (goto-char begin)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1837 (ada-insert-paramlist paramlist))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
1838
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
1839 ;; restore syntax-table
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1840 (set-syntax-table previous-syntax-table)
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
1841 )))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1842
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1843 (defun ada-scan-paramlist (begin end)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1844 "Scan the parameter list found in between BEGIN and END.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1845 Return the equivalent internal parameter list."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1846 (let ((paramlist (list))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1847 (param (list))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1848 (notend t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1849 (apos nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1850 (epos nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1851 (semipos nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1852 (match-cons nil))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1853
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1854 (goto-char begin)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1855
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1856 ;; loop until end of last parameter
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1857 (while notend
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1858
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1859 ;; find first character of parameter-declaration
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1860 (ada-goto-next-non-ws)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1861 (setq apos (point))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1862
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1863 ;; find last character of parameter-declaration
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1864 (if (setq match-cons
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1865 (ada-search-ignore-string-comment "[ \t\n]*;" nil end t))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1866 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1867 (setq epos (car match-cons))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1868 (setq semipos (cdr match-cons)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1869 (setq epos end))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1870
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1871 ;; read name(s) of parameter(s)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1872 (goto-char apos)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1873 (looking-at "\\(\\(\\sw\\|[_, \t\n]\\)*\\(\\sw\\|_\\)\\)[ \t\n]*:[^=]")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1874
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1875 (setq param (list (match-string 1)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1876 (ada-search-ignore-string-comment ":" nil epos t 'search-forward)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1877
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1878 ;; look for 'in'
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1879 (setq apos (point))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1880 (setq param
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1881 (append param
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1882 (list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1883 (consp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1884 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1885 "in" nil epos t 'word-search-forward)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1886
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1887 ;; look for 'out'
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1888 (goto-char apos)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1889 (setq param
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1890 (append param
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1891 (list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1892 (consp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1893 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1894 "out" nil epos t 'word-search-forward)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1895
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
1896 ;; look for 'access'
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1897 (goto-char apos)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1898 (setq param
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1899 (append param
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1900 (list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1901 (consp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1902 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1903 "access" nil epos t 'word-search-forward)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1904
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
1905 ;; skip 'in'/'out'/'access'
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1906 (goto-char apos)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1907 (ada-goto-next-non-ws)
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
1908 (while (looking-at "\\<\\(in\\|out\\|access\\)\\>")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1909 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1910 (ada-goto-next-non-ws))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1911
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1912 ;; read type of parameter
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1913 ;; We accept spaces in the name, since some software like Rose
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1914 ;; generates something like: "A : B 'Class"
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
1915 (looking-at "\\<\\(\\sw\\|[_.' \t]\\)+\\>")
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1916 (setq param
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1917 (append param
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1918 (list (match-string 0))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1919
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1920 ;; read default-expression, if there is one
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1921 (goto-char (setq apos (match-end 0)))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1922 (setq param
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1923 (append param
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1924 (list
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1925 (if (setq match-cons
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1926 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1927 ":=" nil epos t 'search-forward))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1928 (buffer-substring (car match-cons) epos)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1929 nil))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1930
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1931 ;; add this parameter-declaration to the list
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1932 (setq paramlist (append paramlist (list param)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1933
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1934 ;; check if it was the last parameter
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1935 (if (eq epos end)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1936 (setq notend nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1937 (goto-char semipos))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1938 )
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1939 (reverse paramlist)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1940
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1941 (defun ada-insert-paramlist (paramlist)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
1942 "Insert a formatted PARAMLIST in the buffer."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1943 (let ((i (length paramlist))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1944 (parlen 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1945 (typlen 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1946 (inp nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1947 (outp nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1948 (accessp nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1949 (column nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1950 (firstcol nil))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1951
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1952 ;; loop until last parameter
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1953 (while (not (zerop i))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1954 (setq i (1- i))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1955
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1956 ;; get max length of parameter-name
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1957 (setq parlen (max parlen (length (nth 0 (nth i paramlist)))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1958
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1959 ;; get max length of type-name
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1960 (setq typlen (max typlen (length (nth 4 (nth i paramlist)))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1961
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1962 ;; is there any 'in' ?
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1963 (setq inp (or inp (nth 1 (nth i paramlist))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1964
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1965 ;; is there any 'out' ?
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1966 (setq outp (or outp (nth 2 (nth i paramlist))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1967
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
1968 ;; is there any 'access' ?
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1969 (setq accessp (or accessp (nth 3 (nth i paramlist))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1970 )
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1971
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1972 ;; does paramlist already start on a separate line ?
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1973 (if (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1974 (re-search-backward "^.\\|[^ \t]" nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1975 (looking-at "^."))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1976 ;; yes => re-indent it
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1977 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1978 (ada-indent-current)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1979 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1980 (if (looking-at "\\(is\\|return\\)")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1981 (replace-match " \\1"))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
1982
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1983 ;; no => insert it where we are after removing any whitespace
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1984 (fixup-whitespace)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1985 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1986 (cond
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1987 ((looking-at "[ \t]*\\(\n\\|;\\)")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1988 (replace-match "\\1"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1989 ((looking-at "[ \t]*\\(is\\|return\\)")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
1990 (replace-match " \\1"))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1991 (insert " "))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1992
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1993 (insert "(")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1994 (ada-indent-current)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
1995
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1996 (setq firstcol (current-column))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
1997 (setq i (length paramlist))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1998
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1999 ;; loop until last parameter
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2000 (while (not (zerop i))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2001 (setq i (1- i))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2002 (setq column firstcol)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2003
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2004 ;; insert parameter-name, space and colon
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2005 (insert (nth 0 (nth i paramlist)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2006 (indent-to (+ column parlen 1))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2007 (insert ": ")
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2008 (setq column (current-column))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2009
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2010 ;; insert 'in' or space
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2011 (if (nth 1 (nth i paramlist))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2012 (insert "in ")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2013 (if (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2014 (or inp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2015 accessp)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2016 (not (nth 3 (nth i paramlist))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2017 (insert " ")))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2018
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2019 ;; insert 'out' or space
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2020 (if (nth 2 (nth i paramlist))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2021 (insert "out ")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2022 (if (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2023 (or outp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2024 accessp)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2025 (not (nth 3 (nth i paramlist))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2026 (insert " ")))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2027
13231
fb78cec8e440 All doc strings changed to comply with standard Emacs conventions.
Richard M. Stallman <rms@gnu.org>
parents: 13160
diff changeset
2028 ;; insert 'access'
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2029 (if (nth 3 (nth i paramlist))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2030 (insert "access "))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2031
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2032 (setq column (current-column))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2033
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2034 ;; insert type-name and, if necessary, space and default-expression
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2035 (insert (nth 4 (nth i paramlist)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2036 (if (nth 5 (nth i paramlist))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2037 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2038 (indent-to (+ column typlen 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2039 (insert (nth 5 (nth i paramlist)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2040
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2041 ;; check if it was the last parameter
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2042 (if (zerop i)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2043 (insert ")")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2044 ;; no => insert ';' and newline and indent
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2045 (insert ";")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2046 (newline)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2047 (indent-to firstcol))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2048 )
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2049
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2050 ;; if anything follows, except semicolon, newline, is or return
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2051 ;; put it in a new line and indent it
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2052 (unless (looking-at "[ \t]*\\(;\\|\n\\|is\\|return\\)")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2053 (ada-indent-newline-indent))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2054 ))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2055
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2056
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2057
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2058 ;;;----------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2059 ;; Indentation Engine
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2060 ;; All indentations are indicated as a two-element string:
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2061 ;; - position of reference in the buffer
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2062 ;; - offset to indent from this position (can also be a symbol or a list
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2063 ;; that are evaluated)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2064 ;; Thus the total indentation for a line is the column number of the reference
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2065 ;; position plus whatever value the evaluation of the second element provides.
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
2066 ;; This mechanism is used so that the Ada mode can "explain" how the
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2067 ;; indentation was calculated, by showing which variables were used.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2068 ;;
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2069 ;; The indentation itself is done in only one pass: first we try to guess in
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2070 ;; what context we are by looking at the following keyword or punctuation
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2071 ;; sign. If nothing remarkable is found, just try to guess the indentation
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2072 ;; based on previous lines.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2073 ;;
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2074 ;; The relevant functions for indentation are:
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2075 ;; - `ada-indent-region': Re-indent a region of text
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2076 ;; - `ada-justified-indent-current': Re-indent the current line and shows the
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2077 ;; calculation that were done
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2078 ;; - `ada-indent-current': Re-indent the current line
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2079 ;; - `ada-get-current-indent': Calculate the indentation for the current line,
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2080 ;; based on the context (see above).
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2081 ;; - `ada-get-indent-*': Calculate the indentation in a specific context.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2082 ;; For efficiency, these functions do not check they are in the correct
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2083 ;; context.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2084 ;;;----------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2085
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2086 (defun ada-indent-region (beg end)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2087 "Indent the region between BEG end END."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2088 (interactive "*r")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2089 (goto-char beg)
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
2090 (let ((block-done 0)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2091 (lines-remaining (count-lines beg end))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2092 (msg (format "%%4d out of %4d lines remaining ..."
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2093 (count-lines beg end)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2094 (endmark (copy-marker end)))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
2095 ;; catch errors while indenting
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2096 (while (< (point) endmark)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2097 (if (> block-done 39)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2098 (progn
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2099 (setq lines-remaining (- lines-remaining block-done)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2100 block-done 0)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2101 (message msg lines-remaining)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2102 (if (= (char-after) ?\n) nil
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2103 (ada-indent-current))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2104 (forward-line 1)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2105 (setq block-done (1+ block-done)))
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
2106 (message "Indenting ... done")))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2107
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2108 (defun ada-indent-newline-indent ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2109 "Indent the current line, insert a newline and then indent the new line."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2110 (interactive "*")
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
2111 (ada-indent-current)
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
2112 (newline)
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
2113 (ada-indent-current))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2114
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2115 (defun ada-indent-newline-indent-conditional ()
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2116 "Insert a newline and indent it.
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2117 The original line is indented first if `ada-indent-after-return' is non-nil."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2118 (interactive "*")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2119 (if ada-indent-after-return (ada-indent-current))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2120 (newline)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2121 (ada-indent-current))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2122
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2123 (defun ada-justified-indent-current ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2124 "Indent the current line and explain how the calculation was done."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2125 (interactive)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2126
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2127 (let ((cur-indent (ada-indent-current)))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2128
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2129 (let ((line (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2130 (goto-char (car cur-indent))
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2131 (count-lines 1 (point)))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2132
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2133 (if (equal (cdr cur-indent) '(0))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2134 (message (concat "same indentation as line " (number-to-string line)))
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2135 (message "%s" (mapconcat (lambda(x)
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2136 (cond
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2137 ((symbolp x)
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2138 (symbol-name x))
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2139 ((numberp x)
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2140 (number-to-string x))
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2141 ((listp x)
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2142 (concat "- " (symbol-name (cadr x))))
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2143 ))
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2144 (cdr cur-indent)
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2145 " + "))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2146 (save-excursion
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2147 (goto-char (car cur-indent))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2148 (sit-for 1))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2149
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2150 (defun ada-batch-reformat ()
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2151 "Re-indent and re-case all the files found on the command line.
97078
2f3e251c6e3c Typo fixes for Ada mode.
Juanma Barranquero <lekktu@gmail.com>
parents: 97058
diff changeset
2152 This function should be used from the command line, with a
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2153 command like:
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2154 emacs -batch -l ada-mode -f ada-batch-reformat file1 file2 ..."
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2155
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2156 (while command-line-args-left
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2157 (let ((source (car command-line-args-left)))
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65223
diff changeset
2158 (message "Formating %s" source)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2159 (find-file source)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2160 (ada-indent-region (point-min) (point-max))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2161 (ada-adjust-case-buffer)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2162 (write-file source))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2163 (setq command-line-args-left (cdr command-line-args-left)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2164 (message "Done")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2165 (kill-emacs 0))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2166
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2167 (defsubst ada-goto-previous-word ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2168 "Move point to the beginning of the previous word of Ada code.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2169 Return the new position of point or nil if not found."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2170 (ada-goto-next-word t))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2171
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2172 (defun ada-indent-current ()
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2173 "Indent current line as Ada code.
97078
2f3e251c6e3c Typo fixes for Ada mode.
Juanma Barranquero <lekktu@gmail.com>
parents: 97058
diff changeset
2174 Return the calculation that was done, including the reference point
2f3e251c6e3c Typo fixes for Ada mode.
Juanma Barranquero <lekktu@gmail.com>
parents: 97058
diff changeset
2175 and the offset."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2176 (interactive)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2177 (let ((previous-syntax-table (syntax-table))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2178 (orgpoint (point-marker))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2179 cur-indent tmp-indent
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2180 prev-indent)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2181
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2182 (unwind-protect
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2183 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2184 (set-syntax-table ada-mode-symbol-syntax-table)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2185
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2186 ;; This need to be done here so that the advice is not always
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2187 ;; activated (this might interact badly with other modes)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2188 (if (featurep 'xemacs)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2189 (ad-activate 'parse-partial-sexp t))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2190
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2191 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2192 (setq cur-indent
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2193
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2194 ;; Not First line in the buffer ?
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2195 (if (save-excursion (zerop (forward-line -1)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2196 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2197 (back-to-indentation)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2198 (ada-get-current-indent))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2199
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2200 ;; first line in the buffer
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2201 (list (point-min) 0))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2202
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2203 ;; Evaluate the list to get the column to indent to
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2204 ;; prev-indent contains the column to indent to
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2205 (if cur-indent
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2206 (setq prev-indent (save-excursion (goto-char (car cur-indent))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2207 (current-column))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2208 tmp-indent (cdr cur-indent))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2209 (setq prev-indent 0 tmp-indent '()))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2210
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2211 (while (not (null tmp-indent))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2212 (cond
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2213 ((numberp (car tmp-indent))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2214 (setq prev-indent (+ prev-indent (car tmp-indent))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2215 (t
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2216 (setq prev-indent (+ prev-indent (eval (car tmp-indent)))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2217 )
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2218 (setq tmp-indent (cdr tmp-indent)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2219
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2220 ;; only re-indent if indentation is different then the current
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2221 (if (= (save-excursion (back-to-indentation) (current-column)) prev-indent)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2222 nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2223 (beginning-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2224 (delete-horizontal-space)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2225 (indent-to prev-indent))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2226 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2227 ;; restore position of point
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2228 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2229 (goto-char orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2230 (if (< (current-column) (current-indentation))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2231 (back-to-indentation)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2232
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2233 ;; restore syntax-table
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2234 (set-syntax-table previous-syntax-table)
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
2235 (if (featurep 'xemacs)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2236 (ad-deactivate 'parse-partial-sexp))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2237 )
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2238
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2239 cur-indent
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2240 ))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2241
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2242 (defun ada-get-current-indent ()
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2243 "Return the indentation to use for the current line."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2244 (let (column
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2245 pos
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2246 match-cons
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2247 result
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2248 (orgpoint (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2249 (beginning-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2250 (forward-comment -10000)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2251 (forward-line 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2252 (point))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2253
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2254 (setq result
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2255 (cond
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2256
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2257 ;;-----------------------------
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2258 ;; in open parenthesis, but not in parameter-list
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2259 ;;-----------------------------
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2260
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2261 ((and ada-indent-to-open-paren
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2262 (not (ada-in-paramlist-p))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2263 (setq column (ada-in-open-paren-p)))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2264
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2265 ;; check if we have something like this (Table_Component_Type =>
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2266 ;; Source_File_Record)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2267 (save-excursion
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2268
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2269 ;; Align the closing parenthesis on the opening one
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2270 (if (= (following-char) ?\))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2271 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2272 (goto-char column)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2273 (skip-chars-backward " \t")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2274 (list (1- (point)) 0))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2275
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2276 (if (and (skip-chars-backward " \t")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2277 (= (char-before) ?\n)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2278 (not (forward-comment -10000))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2279 (= (char-before) ?>))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2280 ;; ??? Could use a different variable
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2281 (list column 'ada-broken-indent)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2282
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2283 ;; We want all continuation lines to be indented the same
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2284 ;; (ada-broken-line from the opening parenthesis. However, in
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2285 ;; parameter list, each new parameter should be indented at the
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2286 ;; column as the opening parenthesis.
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2287
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2288 ;; A special case to handle nested boolean expressions, as in
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2289 ;; ((B
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2290 ;; and then C) -- indented by ada-broken-indent
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2291 ;; or else D) -- indenting this line.
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2292 ;; ??? This is really a hack, we should have a proper way to go to
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2293 ;; ??? the beginning of the statement
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2294
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2295 (if (= (char-before) ?\))
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2296 (backward-sexp))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2297
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2298 (if (memq (char-before) '(?, ?\; ?\( ?\)))
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2299 (list column 0)
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2300 (list column 'ada-continuation-indent)
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2301 )))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2302
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2303 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2304 ;; at end of buffer
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2305 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2306
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2307 ((not (char-after))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2308 (ada-indent-on-previous-lines nil orgpoint orgpoint))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2309
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2310 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2311 ;; starting with e
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2312 ;;---------------------------
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2313
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2314 ((= (downcase (char-after)) ?e)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2315 (cond
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2316
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2317 ;; ------- end ------
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2318
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2319 ((looking-at "end\\>")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2320 (let ((label 0)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2321 limit)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2322 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2323 (ada-goto-matching-start 1)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2324
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2325 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2326 ;; found 'loop' => skip back to 'while' or 'for'
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2327 ;; if 'loop' is not on a separate line
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2328 ;; Stop the search for 'while' and 'for' when a ';' is encountered.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2329 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2330 (if (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2331 (beginning-of-line)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2332 (looking-at ".+\\<loop\\>"))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2333 (progn
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2334 (save-excursion
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2335 (setq limit (car (ada-search-ignore-string-comment ";" t))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2336 (if (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2337 (and
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2338 (setq match-cons
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2339 (ada-search-ignore-string-comment ada-loop-start-re t limit))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2340 (not (looking-at "\\<loop\\>"))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2341 (progn
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2342 (goto-char (car match-cons))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2343 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2344 (beginning-of-line)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2345 (if (looking-at ada-named-block-re)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2346 (setq label (- ada-label-indent))))))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2347
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2348 ;; found 'record' =>
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2349 ;; if the keyword is found at the beginning of a line (or just
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2350 ;; after limited, we indent on it, otherwise we indent on the
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2351 ;; beginning of the type declaration)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2352 ;; type A is (B : Integer;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2353 ;; C : Integer) is record
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2354 ;; end record; -- This is badly indented otherwise
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2355 (if (looking-at "record")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2356 (if (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2357 (beginning-of-line)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2358 (looking-at "^[ \t]*\\(record\\|limited record\\)"))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2359 (list (save-excursion (back-to-indentation) (point)) 0)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2360 (list (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2361 (car (ada-search-ignore-string-comment "\\<type\\>" t)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2362 0))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2363
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2364 ;; Else keep the same indentation as the beginning statement
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2365 (list (+ (save-excursion (back-to-indentation) (point)) label) 0)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2366
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2367 ;; ------ exception ----
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2368
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2369 ((looking-at "exception\\>")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2370 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2371 (ada-goto-matching-start 1)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2372 (list (save-excursion (back-to-indentation) (point)) 0)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2373
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2374 ;; else
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2375
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2376 ((looking-at "else\\>")
73434
3586ad4a01a1 (ada-in-string-p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73422
diff changeset
2377 (if (save-excursion (ada-goto-previous-word)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2378 (looking-at "\\<or\\>"))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2379 (ada-indent-on-previous-lines nil orgpoint orgpoint)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2380 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2381 (ada-goto-matching-start 1 nil t)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2382 (list (progn (back-to-indentation) (point)) 0))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2383
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2384 ;; elsif
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2385
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2386 ((looking-at "elsif\\>")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2387 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2388 (ada-goto-matching-start 1 nil t)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2389 (list (progn (back-to-indentation) (point)) 0)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2390
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2391 ))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2392
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2393 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2394 ;; starting with w (when)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2395 ;;---------------------------
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2396
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2397 ((and (= (downcase (char-after)) ?w)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2398 (looking-at "when\\>"))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2399 (save-excursion
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2400 (ada-goto-matching-start 1)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2401 (list (save-excursion (back-to-indentation) (point))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2402 'ada-when-indent)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2403
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2404 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2405 ;; starting with t (then)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2406 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2407
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2408 ((and (= (downcase (char-after)) ?t)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2409 (looking-at "then\\>"))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2410 (if (save-excursion (ada-goto-previous-word)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2411 (looking-at "and\\>"))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2412 (ada-indent-on-previous-lines nil orgpoint orgpoint)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2413 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2414 ;; Select has been added for the statement: "select ... then abort"
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2415 (ada-search-ignore-string-comment
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2416 "\\<\\(elsif\\|if\\|select\\)\\>" t nil)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2417 (list (progn (back-to-indentation) (point))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2418 'ada-stmt-end-indent))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2419
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2420 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2421 ;; starting with l (loop)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2422 ;;---------------------------
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2423
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2424 ((and (= (downcase (char-after)) ?l)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2425 (looking-at "loop\\>"))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2426 (setq pos (point))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2427 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2428 (goto-char (match-end 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2429 (ada-goto-stmt-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2430 (if (looking-at "\\<\\(loop\\|if\\)\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2431 (ada-indent-on-previous-lines nil orgpoint orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2432 (unless (looking-at ada-loop-start-re)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2433 (ada-search-ignore-string-comment ada-loop-start-re
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2434 nil pos))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2435 (if (looking-at "\\<loop\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2436 (ada-indent-on-previous-lines nil orgpoint orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2437 (list (progn (back-to-indentation) (point)) 'ada-stmt-end-indent)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2438
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2439 ;;----------------------------
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2440 ;; starting with l (limited) or r (record)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2441 ;;----------------------------
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2442
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2443 ((or (and (= (downcase (char-after)) ?l)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2444 (looking-at "limited\\>"))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2445 (and (= (downcase (char-after)) ?r)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2446 (looking-at "record\\>")))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2447
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2448 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2449 (ada-search-ignore-string-comment
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2450 "\\<\\(type\\|use\\)\\>" t nil)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2451 (if (looking-at "\\<use\\>")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2452 (ada-search-ignore-string-comment "for" t nil nil
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2453 'word-search-backward))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2454 (list (progn (back-to-indentation) (point))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2455 'ada-indent-record-rel-type)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2456
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2457 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2458 ;; starting with b (begin)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2459 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2460
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2461 ((and (= (downcase (char-after)) ?b)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2462 (looking-at "begin\\>"))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2463 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2464 (if (ada-goto-matching-decl-start t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2465 (list (progn (back-to-indentation) (point)) 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2466 (ada-indent-on-previous-lines nil orgpoint orgpoint))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2467
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2468 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2469 ;; starting with i (is)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2470 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2471
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2472 ((and (= (downcase (char-after)) ?i)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2473 (looking-at "is\\>"))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2474
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2475 (if (and ada-indent-is-separate
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2476 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2477 (goto-char (match-end 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2478 (ada-goto-next-non-ws (save-excursion (end-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2479 (point)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2480 (looking-at "\\<abstract\\>\\|\\<separate\\>")))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2481 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2482 (ada-goto-stmt-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2483 (list (progn (back-to-indentation) (point)) 'ada-indent))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2484 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2485 (ada-goto-stmt-start)
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2486 (if (looking-at "\\<package\\|procedure\\|function\\>")
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2487 (list (progn (back-to-indentation) (point)) 0)
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2488 (list (progn (back-to-indentation) (point)) 'ada-indent)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2489
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2490 ;;---------------------------
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2491 ;; starting with r (return, renames)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2492 ;;---------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2493
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2494 ((and (= (downcase (char-after)) ?r)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2495 (looking-at "re\\(turn\\|names\\)\\>"))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2496
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2497 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2498 (let ((var 'ada-indent-return))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2499 ;; If looking at a renames, skip the 'return' statement too
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2500 (if (looking-at "renames")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2501 (let (pos)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2502 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2503 (set 'pos (ada-search-ignore-string-comment ";\\|return\\>" t)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2504 (if (and pos
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2505 (= (downcase (char-after (car pos))) ?r))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2506 (goto-char (car pos)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2507 (set 'var 'ada-indent-renames)))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2508
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2509 (forward-comment -1000)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2510 (if (= (char-before) ?\))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2511 (forward-sexp -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2512 (forward-word -1))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2513
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2514 ;; If there is a parameter list, and we have a function declaration
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2515 ;; or a access to subprogram declaration
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2516 (let ((num-back 1))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2517 (if (and (= (following-char) ?\()
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2518 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2519 (or (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2520 (backward-word 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2521 (looking-at "\\(function\\|procedure\\)\\>"))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2522 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2523 (backward-word 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2524 (set 'num-back 2)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2525 (looking-at "\\(function\\|procedure\\)\\>")))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2526
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2527 ;; The indentation depends of the value of ada-indent-return
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2528 (if (<= (eval var) 0)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2529 (list (point) (list '- var))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2530 (list (progn (backward-word num-back) (point))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2531 var))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2532
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2533 ;; Else there is no parameter list, but we have a function
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2534 ;; Only do something special if the user want to indent
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2535 ;; relative to the "function" keyword
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2536 (if (and (> (eval var) 0)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2537 (save-excursion (forward-word -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2538 (looking-at "function\\>")))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2539 (list (progn (forward-word -1) (point)) var)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2540
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2541 ;; Else...
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2542 (ada-indent-on-previous-lines nil orgpoint orgpoint)))))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2543
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2544 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2545 ;; starting with 'o' or 'p'
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2546 ;; 'or' as statement-start
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2547 ;; 'private' as statement-start
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2548 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2549
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2550 ((and (or (= (downcase (char-after)) ?o)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2551 (= (downcase (char-after)) ?p))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2552 (or (ada-looking-at-semi-or)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2553 (ada-looking-at-semi-private)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2554 (save-excursion
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2555 ;; ??? Wasn't this done already in ada-looking-at-semi-or ?
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2556 (ada-goto-matching-start 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2557 (list (progn (back-to-indentation) (point)) 0)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2558
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2559 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2560 ;; starting with 'd' (do)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2561 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2562
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2563 ((and (= (downcase (char-after)) ?d)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2564 (looking-at "do\\>"))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2565 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2566 (ada-goto-stmt-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2567 (list (progn (back-to-indentation) (point)) 'ada-stmt-end-indent)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2568
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2569 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2570 ;; starting with '-' (comment)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2571 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2572
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2573 ((= (char-after) ?-)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2574 (if ada-indent-comment-as-code
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2575
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2576 ;; Indent comments on previous line comments if required
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2577 ;; We must use a search-forward (even if the code is more complex),
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2578 ;; since we want to find the beginning of the comment.
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2579 (let (pos)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2580
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2581 (if (and ada-indent-align-comments
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2582 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2583 (forward-line -1)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2584 (beginning-of-line)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2585 (while (and (not pos)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2586 (search-forward "--"
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2587 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2588 (end-of-line) (point))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2589 t))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2590 (unless (ada-in-string-p)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2591 (setq pos (point))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2592 pos))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2593 (list (- pos 2) 0)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2594
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2595 ;; Else always on previous line
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2596 (ada-indent-on-previous-lines nil orgpoint orgpoint)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2597
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2598 ;; Else same indentation as the previous line
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2599 (list (save-excursion (back-to-indentation) (point)) 0)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2600
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2601 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2602 ;; starting with '#' (preprocessor line)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2603 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2604
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2605 ((and (= (char-after) ?#)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2606 (equal ada-which-compiler 'gnat)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2607 (looking-at "#[ \t]*\\(if\\|els\\(e\\|if\\)\\|end[ \t]*if\\)"))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2608 (list (save-excursion (beginning-of-line) (point)) 0))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2609
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2610 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2611 ;; starting with ')' (end of a parameter list)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2612 ;;--------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2613
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2614 ((and (not (eobp)) (= (char-after) ?\)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2615 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2616 (forward-char 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2617 (backward-sexp 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2618 (list (point) 0)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2619
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2620 ;;---------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2621 ;; new/abstract/separate
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2622 ;;---------------------------------
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2623
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2624 ((looking-at "\\(new\\|abstract\\|separate\\)\\>")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2625 (ada-indent-on-previous-lines nil orgpoint orgpoint))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2626
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2627 ;;---------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2628 ;; package/function/procedure
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2629 ;;---------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2630
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2631 ((and (or (= (downcase (char-after)) ?p) (= (downcase (char-after)) ?f))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2632 (looking-at "\\<\\(package\\|function\\|procedure\\)\\>"))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2633 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2634 ;; Go up until we find either a generic section, or the end of the
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2635 ;; previous subprogram/package
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2636 (let (found)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2637 (while (and (not found)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2638 (ada-search-ignore-string-comment
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2639 "\\<\\(generic\\|end\\|begin\\|package\\|procedure\\|function\\)\\>" t))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2640
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2641 ;; avoid "with procedure"... in generic parts
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2642 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2643 (forward-word -1)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2644 (setq found (not (looking-at "with"))))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2645
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2646 (if (looking-at "generic")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2647 (list (progn (back-to-indentation) (point)) 0)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2648 (ada-indent-on-previous-lines nil orgpoint orgpoint))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2649
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2650 ;;---------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2651 ;; label
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2652 ;;---------------------------------
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
2653
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2654 ((looking-at "\\(\\sw\\|_\\)+[ \t\n]*:[^=]")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2655 (if (ada-in-decl-p)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2656 (ada-indent-on-previous-lines nil orgpoint orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2657 (append (ada-indent-on-previous-lines nil orgpoint orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2658 '(ada-label-indent))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2659
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2660 ))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2661
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2662 ;;---------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2663 ;; Other syntaxes
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2664 ;;---------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2665 (or result (ada-indent-on-previous-lines nil orgpoint orgpoint))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2666
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2667 (defun ada-indent-on-previous-lines (&optional nomove orgpoint initial-pos)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2668 "Calculate the indentation for the new line after ORGPOINT.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2669 The result list is based on the previous lines in the buffer.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2670 If NOMOVE is nil, moves point to the beginning of the current statement.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2671 if INITIAL-POS is non-nil, moves point to INITIAL-POS before calculation."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2672 (if initial-pos
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2673 (goto-char initial-pos))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2674 (let ((oldpoint (point)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2675
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2676 ;; Is inside a parameter-list ?
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2677 (if (ada-in-paramlist-p)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2678 (ada-get-indent-paramlist)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2679
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2680 ;; move to beginning of current statement
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2681 (unless nomove
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2682 (ada-goto-stmt-start))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2683
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2684 ;; no beginning found => don't change indentation
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2685 (if (and (eq oldpoint (point))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2686 (not nomove))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2687 (ada-get-indent-nochange)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2688
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2689 (cond
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2690 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2691 ((and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2692 ada-indent-to-open-paren
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2693 (ada-in-open-paren-p))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2694 (ada-get-indent-open-paren))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2695 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2696 ((looking-at "end\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2697 (ada-get-indent-end orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2698 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2699 ((looking-at ada-loop-start-re)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2700 (ada-get-indent-loop orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2701 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2702 ((looking-at ada-subprog-start-re)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2703 (ada-get-indent-subprog orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2704 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2705 ((looking-at ada-block-start-re)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2706 (ada-get-indent-block-start orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2707 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2708 ((looking-at "\\(sub\\)?type\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2709 (ada-get-indent-type orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2710 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2711 ;; "then" has to be included in the case of "select...then abort"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2712 ;; statements, since (goto-stmt-start) at the beginning of
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2713 ;; the current function would leave the cursor on that position
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2714 ((looking-at "\\(\\(els\\)?if\\>\\)\\|then abort\\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2715 (ada-get-indent-if orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2716 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2717 ((looking-at "case\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2718 (ada-get-indent-case orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2719 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2720 ((looking-at "when\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2721 (ada-get-indent-when orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2722 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2723 ((looking-at "\\(\\sw\\|_\\)+[ \t\n]*:[^=]")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2724 (ada-get-indent-label orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2725 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2726 ((looking-at "separate\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2727 (ada-get-indent-nochange))
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2728
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2729 ;; A label
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2730 ((looking-at "<<")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2731 (list (+ (save-excursion (back-to-indentation) (point))
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
2732 (- ada-label-indent))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
2733
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2734 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2735 ((looking-at "with\\>\\|use\\>")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2736 ;; Are we still in that statement, or are we in fact looking at
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2737 ;; the previous one ?
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2738 (if (save-excursion (search-forward ";" oldpoint t))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2739 (list (progn (back-to-indentation) (point)) 0)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2740 (list (point) (if (looking-at "with")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2741 'ada-with-indent
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2742 'ada-use-indent))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2743 ;;
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2744 (t
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2745 (ada-get-indent-noindent orgpoint)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2746 ))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2747
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2748 (defun ada-get-indent-open-paren ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2749 "Calculate the indentation when point is behind an unclosed parenthesis."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2750 (list (ada-in-open-paren-p) 0))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2751
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2752 (defun ada-get-indent-nochange ()
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2753 "Return the current indentation of the previous line."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2754 (save-excursion
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2755 (forward-line -1)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2756 (back-to-indentation)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2757 (list (point) 0)))
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2758
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2759 (defun ada-get-indent-paramlist ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2760 "Calculate the indentation when point is inside a parameter list."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2761 (save-excursion
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2762 (ada-search-ignore-string-comment "[^ \t\n]" t nil t)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2763 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2764 ;; in front of the first parameter
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2765 ((= (char-after) ?\()
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2766 (goto-char (match-end 0))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2767 (list (point) 0))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2768
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2769 ;; in front of another parameter
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2770 ((= (char-after) ?\;)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2771 (goto-char (cdr (ada-search-ignore-string-comment "(\\|;" t nil t)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2772 (ada-goto-next-non-ws)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2773 (list (point) 0))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2774
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2775 ;; After an affectation (default parameter value in subprogram
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2776 ;; declaration)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2777 ((and (= (following-char) ?=) (= (preceding-char) ?:))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2778 (back-to-indentation)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2779 (list (point) 'ada-broken-indent))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2780
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2781 ;; inside a parameter declaration
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2782 (t
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2783 (goto-char (cdr (ada-search-ignore-string-comment "(\\|;" t nil t)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2784 (ada-goto-next-non-ws)
100891
e7407b3eef86 * progmodes/ada-mode.el (ada-mode): Simplify doc string.
Juanma Barranquero <lekktu@gmail.com>
parents: 98674
diff changeset
2785 (list (point) 'ada-broken-indent)))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2786
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2787 (defun ada-get-indent-end (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2788 "Calculate the indentation when point is just before an end statement.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2789 ORGPOINT is the limit position used in the calculation."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2790 (let ((defun-name nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2791 (indent nil))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
2792
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2793 ;; is the line already terminated by ';' ?
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2794 (if (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2795 (ada-search-ignore-string-comment ";" nil orgpoint nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2796 'search-forward))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2797
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2798 ;; yes, look what's following 'end'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2799 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2800 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2801 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2802 (cond
98674
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
2803 ;;
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
2804 ;; loop/select/if/case/return
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
2805 ;;
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
2806 ((looking-at "\\<\\(loop\\|select\\|if\\|case\\|return\\)\\>")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2807 (save-excursion (ada-check-matching-start (match-string 0)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2808 (list (save-excursion (back-to-indentation) (point)) 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2809
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2810 ;;
98674
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
2811 ;; record
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2812 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2813 ((looking-at "\\<record\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2814 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2815 (ada-check-matching-start (match-string 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2816 ;; we are now looking at the matching "record" statement
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2817 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2818 (ada-goto-stmt-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2819 ;; now on the matching type declaration, or use clause
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2820 (unless (looking-at "\\(for\\|type\\)\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2821 (ada-search-ignore-string-comment "\\<type\\>" t))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2822 (list (progn (back-to-indentation) (point)) 0)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2823 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2824 ;; a named block end
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2825 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2826 ((looking-at ada-ident-re)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2827 (setq defun-name (match-string 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2828 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2829 (ada-goto-matching-start 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2830 (ada-check-defun-name defun-name))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2831 (list (progn (back-to-indentation) (point)) 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2832 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2833 ;; a block-end without name
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2834 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2835 ((= (char-after) ?\;)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2836 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2837 (ada-goto-matching-start 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2838 (if (looking-at "\\<begin\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2839 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2840 (setq indent (list (point) 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2841 (if (ada-goto-matching-decl-start t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2842 (list (progn (back-to-indentation) (point)) 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2843 indent))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2844 (list (progn (back-to-indentation) (point)) 0)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2845 )))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2846 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2847 ;; anything else - should maybe signal an error ?
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2848 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2849 (t
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2850 (list (save-excursion (back-to-indentation) (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2851 'ada-broken-indent))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2852
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2853 (list (save-excursion (back-to-indentation) (point))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2854 'ada-broken-indent))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2855
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2856 (defun ada-get-indent-case (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2857 "Calculate the indentation when point is just before a case statement.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2858 ORGPOINT is the limit position used in the calculation."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2859 (let ((match-cons nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2860 (opos (point)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2861 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2862 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2863 ;; case..is..when..=>
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2864 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2865 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2866 (setq match-cons (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2867 ;; the `=>' must be after the keyword `is'.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2868 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2869 "is" nil orgpoint nil 'word-search-forward)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2870 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2871 "[ \t\n]+=>" nil orgpoint))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2872 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2873 (goto-char (car match-cons))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2874 (unless (ada-search-ignore-string-comment "when" t opos)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2875 (error "Missing 'when' between 'case' and '=>'"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2876 (list (save-excursion (back-to-indentation) (point)) 'ada-indent)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2877 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2878 ;; case..is..when
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2879 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2880 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2881 (setq match-cons (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2882 "when" nil orgpoint nil 'word-search-forward)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2883 (goto-char (cdr match-cons))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2884 (list (save-excursion (back-to-indentation) (point)) 'ada-broken-indent))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2885 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2886 ;; case..is
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2887 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2888 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2889 (setq match-cons (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2890 "is" nil orgpoint nil 'word-search-forward)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2891 (list (save-excursion (back-to-indentation) (point)) 'ada-when-indent))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2892 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2893 ;; incomplete case
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2894 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2895 (t
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2896 (list (save-excursion (back-to-indentation) (point))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2897 'ada-broken-indent)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2898
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2899 (defun ada-get-indent-when (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2900 "Calculate the indentation when point is just before a when statement.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2901 ORGPOINT is the limit position used in the calculation."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2902 (let ((cur-indent (save-excursion (back-to-indentation) (point))))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2903 (if (ada-search-ignore-string-comment "[ \t\n]*=>" nil orgpoint)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2904 (list cur-indent 'ada-indent)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2905 (list cur-indent 'ada-broken-indent))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2906
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2907 (defun ada-get-indent-if (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2908 "Calculate the indentation when point is just before an if statement.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2909 ORGPOINT is the limit position used in the calculation."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2910 (let ((cur-indent (save-excursion (back-to-indentation) (point)))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2911 (match-cons nil))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2912 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2913 ;; Move to the correct then (ignore all "and then")
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2914 ;;
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
2915 (while (and (setq match-cons (ada-search-ignore-string-comment
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2916 "\\<\\(then\\|and[ \t]*then\\)\\>"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2917 nil orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2918 (= (downcase (char-after (car match-cons))) ?a)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2919 ;; If "then" was found (we are looking at it)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2920 (if match-cons
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2921 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2922 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2923 ;; 'then' first in separate line ?
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2924 ;; => indent according to 'then',
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2925 ;; => else indent according to 'if'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2926 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2927 (if (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2928 (back-to-indentation)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2929 (looking-at "\\<then\\>"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2930 (setq cur-indent (save-excursion (back-to-indentation) (point))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2931 ;; skip 'then'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2932 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2933 (list cur-indent 'ada-indent))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2934
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2935 (list cur-indent 'ada-broken-indent))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2936
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2937 (defun ada-get-indent-block-start (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2938 "Calculate the indentation when point is at the start of a block.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2939 ORGPOINT is the limit position used in the calculation."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2940 (let ((pos nil))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2941 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2942 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2943 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2944 (setq pos (ada-goto-next-non-ws orgpoint)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2945 (goto-char pos)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2946 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2947 (ada-indent-on-previous-lines t orgpoint)))
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2948
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2949 ;; Special case for record types, for instance for:
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2950 ;; type A is (B : Integer;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2951 ;; C : Integer) is record
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2952 ;; null; -- This is badly indented otherwise
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2953 ((looking-at "record")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2954
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2955 ;; If record is at the beginning of the line, indent from there
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2956 (if (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2957 (beginning-of-line)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2958 (looking-at "^[ \t]*\\(record\\|limited record\\)"))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2959 (list (save-excursion (back-to-indentation) (point)) 'ada-indent)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2960
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2961 ;; else indent relative to the type command
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2962 (list (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2963 (car (ada-search-ignore-string-comment "\\<type\\>" t)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2964 'ada-indent)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
2965
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2966 ;; nothing follows the block-start
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2967 (t
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
2968 (list (save-excursion (back-to-indentation) (point)) 'ada-indent)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2969
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2970 (defun ada-get-indent-subprog (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
2971 "Calculate the indentation when point is just before a subprogram.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
2972 ORGPOINT is the limit position used in the calculation."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2973 (let ((match-cons nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2974 (cur-indent (save-excursion (back-to-indentation) (point)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2975 (foundis nil))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2976 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2977 ;; is there an 'is' in front of point ?
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2978 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2979 (if (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2980 (setq match-cons
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2981 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2982 "\\<\\(is\\|do\\)\\>" nil orgpoint)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2983 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2984 ;; yes, then skip to its end
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2985 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2986 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2987 (setq foundis t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2988 (goto-char (cdr match-cons)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2989 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2990 ;; no, then goto next non-ws, if there is one in front of point
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2991 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2992 (progn
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2993 (unless (ada-goto-next-non-ws orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
2994 (goto-char orgpoint))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2995
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2996 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2997 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2998 ;; nothing follows 'is'
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2999 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3000 ((and
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3001 foundis
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3002 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3003 (not (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3004 "[^ \t\n]" nil orgpoint t))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3005 (list cur-indent 'ada-indent))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3006 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3007 ;; is abstract/separate/new ...
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3008 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3009 ((and
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3010 foundis
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3011 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3012 (setq match-cons
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3013 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3014 "\\<\\(separate\\|new\\|abstract\\)\\>"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3015 nil orgpoint))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3016 (goto-char (car match-cons))
12586
f8bbc7a3b87a (ada-ident-re): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 12053
diff changeset
3017 (ada-search-ignore-string-comment ada-subprog-start-re t)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3018 (ada-get-indent-noindent orgpoint))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3019 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3020 ;; something follows 'is'
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3021 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3022 ((and
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3023 foundis
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3024 (save-excursion (setq match-cons (ada-goto-next-non-ws orgpoint)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3025 (goto-char match-cons)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3026 (ada-indent-on-previous-lines t orgpoint)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3027 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3028 ;; no 'is' but ';'
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3029 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3030 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3031 (ada-search-ignore-string-comment ";" nil orgpoint nil 'search-forward))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3032 (list cur-indent 0))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3033 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3034 ;; no 'is' or ';'
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3035 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3036 (t
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3037 (list cur-indent 'ada-broken-indent)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3038
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3039 (defun ada-get-indent-noindent (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3040 "Calculate the indentation when point is just before a 'noindent stmt'.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3041 ORGPOINT is the limit position used in the calculation."
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3042 (let ((label 0))
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3043 (save-excursion
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3044 (beginning-of-line)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3045
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3046 (cond
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3047
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3048 ;; This one is called when indenting a line preceded by a multi-line
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3049 ;; subprogram declaration (in that case, we are at this point inside
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3050 ;; the parameter declaration list)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3051 ((ada-in-paramlist-p)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3052 (ada-previous-procedure)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3053 (list (save-excursion (back-to-indentation) (point)) 0))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3054
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3055 ;; This one is called when indenting the second line of a multi-line
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3056 ;; declaration section, in a declare block or a record declaration
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3057 ((looking-at "[ \t]*\\(\\sw\\|_\\)*[ \t]*,[ \t]*$")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3058 (list (save-excursion (back-to-indentation) (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3059 'ada-broken-decl-indent))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3060
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3061 ;; This one is called in every over case when indenting a line at the
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3062 ;; top level
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3063 (t
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3064 (if (looking-at ada-named-block-re)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3065 (setq label (- ada-label-indent))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3066
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3067 (let (p)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3068
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3069 ;; "with private" or "null record" cases
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3070 (if (or (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3071 (and (ada-search-ignore-string-comment "\\<private\\>" nil orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3072 (setq p (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3073 (save-excursion (forward-char -7);; skip back "private"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3074 (ada-goto-previous-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3075 (looking-at "with"))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3076 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3077 (and (ada-search-ignore-string-comment "\\<record\\>" nil orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3078 (setq p (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3079 (save-excursion (forward-char -6);; skip back "record"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3080 (ada-goto-previous-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3081 (looking-at "null")))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3082 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3083 (goto-char p)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3084 (re-search-backward "\\<\\(type\\|subtype\\)\\>" nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3085 (list (save-excursion (back-to-indentation) (point)) 0)))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3086 (if (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3087 (ada-search-ignore-string-comment ";" nil orgpoint nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3088 'search-forward))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3089 (list (+ (save-excursion (back-to-indentation) (point)) label) 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3090 (list (+ (save-excursion (back-to-indentation) (point)) label)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3091 'ada-broken-indent)))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3092
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3093 (defun ada-get-indent-label (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3094 "Calculate the indentation when before a label or variable declaration.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3095 ORGPOINT is the limit position used in the calculation."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3096 (let ((match-cons nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3097 (cur-indent (save-excursion (back-to-indentation) (point))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3098 (ada-search-ignore-string-comment ":" nil)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3099 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3100 ;; loop label
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3101 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3102 (setq match-cons (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3103 ada-loop-start-re nil orgpoint)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3104 (goto-char (car match-cons))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3105 (ada-get-indent-loop orgpoint))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3106
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3107 ;; declare label
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3108 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3109 (setq match-cons (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3110 "\\<declare\\|begin\\>" nil orgpoint)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3111 (goto-char (car match-cons))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3112 (list (save-excursion (back-to-indentation) (point)) 'ada-indent))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3113
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3114 ;; variable declaration
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3115 ((ada-in-decl-p)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3116 (if (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3117 (ada-search-ignore-string-comment ";" nil orgpoint))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3118 (list cur-indent 0)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3119 (list cur-indent 'ada-broken-indent)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3120
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3121 ;; nothing follows colon
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3122 (t
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3123 (list cur-indent '(- ada-label-indent))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3124
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3125 (defun ada-get-indent-loop (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3126 "Calculate the indentation when just before a loop or a for ... use.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3127 ORGPOINT is the limit position used in the calculation."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3128 (let ((match-cons nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3129 (pos (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3130
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3131 ;; If looking at a named block, skip the label
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3132 (label (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3133 (beginning-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3134 (if (looking-at ada-named-block-re)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3135 (- ada-label-indent)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3136 0))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3137
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3138 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3139
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3140 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3141 ;; statement complete
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3142 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3143 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3144 (ada-search-ignore-string-comment ";" nil orgpoint nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3145 'search-forward))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3146 (list (+ (save-excursion (back-to-indentation) (point)) label) 0))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3147 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3148 ;; simple loop
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3149 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3150 ((looking-at "loop\\>")
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3151 (setq pos (ada-get-indent-block-start orgpoint))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3152 (if (equal label 0)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3153 pos
100891
e7407b3eef86 * progmodes/ada-mode.el (ada-mode): Simplify doc string.
Juanma Barranquero <lekktu@gmail.com>
parents: 98674
diff changeset
3154 (list (+ (car pos) label) (cadr pos))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3155
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3156 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3157 ;; 'for'- loop (or also a for ... use statement)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3158 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3159 ((looking-at "for\\>")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3160 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3161 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3162 ;; for ... use
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3163 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3164 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3165 (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3166 (goto-char (match-end 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3167 (ada-goto-next-non-ws orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3168 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3169 (if (= (char-after) ?') (forward-word 1) t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3170 (ada-goto-next-non-ws orgpoint)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3171 (looking-at "\\<use\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3172 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3173 ;; check if there is a 'record' before point
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3174 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3175 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3176 (setq match-cons (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3177 "record" nil orgpoint nil 'word-search-forward))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3178 t)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3179 (if match-cons
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3180 (progn
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3181 (goto-char (car match-cons))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3182 (list (save-excursion (back-to-indentation) (point)) 'ada-indent))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3183 (list (save-excursion (back-to-indentation) (point)) 'ada-broken-indent))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3184 )
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3185
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3186 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3187 ;; for..loop
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3188 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3189 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3190 (setq match-cons (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3191 "loop" nil orgpoint nil 'word-search-forward)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3192 (goto-char (car match-cons))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3193 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3194 ;; indent according to 'loop', if it's first in the line;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3195 ;; otherwise to 'for'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3196 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3197 (unless (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3198 (back-to-indentation)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3199 (looking-at "\\<loop\\>"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3200 (goto-char pos))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3201 (list (+ (save-excursion (back-to-indentation) (point)) label)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3202 'ada-indent))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3203 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3204 ;; for-statement is broken
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3205 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3206 (t
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3207 (list (+ (save-excursion (back-to-indentation) (point)) label)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3208 'ada-broken-indent))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3209
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3210 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3211 ;; 'while'-loop
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3212 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3213 ((looking-at "while\\>")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3214 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3215 ;; while..loop ?
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3216 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3217 (if (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3218 (setq match-cons (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3219 "loop" nil orgpoint nil 'word-search-forward)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3220
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3221 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3222 (goto-char (car match-cons))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3223 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3224 ;; indent according to 'loop', if it's first in the line;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3225 ;; otherwise to 'while'.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3226 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3227 (unless (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3228 (back-to-indentation)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3229 (looking-at "\\<loop\\>"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3230 (goto-char pos))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3231 (list (+ (save-excursion (back-to-indentation) (point)) label)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3232 'ada-indent))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3233
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3234 (list (+ (save-excursion (back-to-indentation) (point)) label)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3235 'ada-broken-indent))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3236
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3237 (defun ada-get-indent-type (orgpoint)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3238 "Calculate the indentation when before a type statement.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3239 ORGPOINT is the limit position used in the calculation."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3240 (let ((match-dat nil))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3241 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3242 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3243 ;; complete record declaration
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3244 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3245 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3246 (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3247 (setq match-dat (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3248 "end" nil orgpoint nil 'word-search-forward))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3249 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3250 (looking-at "\\<record\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3251 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3252 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3253 (= (char-after) ?\;)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3254 (goto-char (car match-dat))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3255 (list (save-excursion (back-to-indentation) (point)) 0))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3256 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3257 ;; record type
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3258 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3259 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3260 (setq match-dat (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3261 "record" nil orgpoint nil 'word-search-forward)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3262 (goto-char (car match-dat))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3263 (list (save-excursion (back-to-indentation) (point)) 'ada-indent))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3264 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3265 ;; complete type declaration
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3266 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3267 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3268 (ada-search-ignore-string-comment ";" nil orgpoint nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3269 'search-forward))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3270 (list (save-excursion (back-to-indentation) (point)) 0))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3271 ;;
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
3272 ;; "type ... is", but not "type ... is ...", which is broken
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3273 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3274 ((save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3275 (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3276 (ada-search-ignore-string-comment "is" nil orgpoint nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3277 'word-search-forward)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3278 (not (ada-goto-next-non-ws orgpoint))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3279 (list (save-excursion (back-to-indentation) (point)) 'ada-broken-indent))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3280 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3281 ;; broken statement
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3282 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3283 (t
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3284 (list (save-excursion (back-to-indentation) (point))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3285 'ada-broken-indent)))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3286
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3287
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3288 ;; -----------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3289 ;; -- searching and matching
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3290 ;; -----------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3291
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3292 (defun ada-goto-stmt-start ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3293 "Move point to the beginning of the statement that point is in or after.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3294 Return the new position of point.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3295 As a special case, if we are looking at a closing parenthesis, skip to the
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3296 open parenthesis."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3297 (let ((match-dat nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3298 (orgpoint (point)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3299
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3300 (setq match-dat (ada-search-prev-end-stmt))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3301 (if match-dat
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
3302
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3303 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3304 ;; found a previous end-statement => check if anything follows
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3305 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3306 (unless (looking-at "declare")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3307 (progn
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3308 (unless (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3309 (goto-char (cdr match-dat))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3310 (ada-goto-next-non-ws orgpoint))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3311 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3312 ;; nothing follows => it's the end-statement directly in
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3313 ;; front of point => search again
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3314 ;;
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3315 (setq match-dat (ada-search-prev-end-stmt)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3316 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3317 ;; if found the correct end-statement => goto next non-ws
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3318 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3319 (if match-dat
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3320 (goto-char (cdr match-dat)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3321 (ada-goto-next-non-ws)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3322 ))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
3323
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3324 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3325 ;; no previous end-statement => we are at the beginning of the
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3326 ;; accessible part of the buffer
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3327 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3328 (progn
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3329 (goto-char (point-min))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3330 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3331 ;; skip to the very first statement, if there is one
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3332 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3333 (unless (ada-goto-next-non-ws orgpoint)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3334 (goto-char orgpoint))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3335 (point)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3336
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3337
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3338 (defun ada-search-prev-end-stmt ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3339 "Move point to previous end statement.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3340 Return a cons cell whose car is the beginning and whose cdr
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3341 is the end of the match."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3342 (let ((match-dat nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3343 (found nil))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3344
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3345 ;; search until found or beginning-of-buffer
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3346 (while
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3347 (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3348 (not found)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3349 (setq match-dat (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3350 ada-end-stmt-re t)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3351
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3352 (goto-char (car match-dat))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3353 (unless (ada-in-open-paren-p)
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3354 (cond
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3355
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3356 ((and (looking-at
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3357 "\\<\\(record\\|loop\\|select\\|else\\|then\\)\\>")
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3358 (save-excursion
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3359 (ada-goto-previous-word)
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3360 (looking-at "\\<\\(end\\|or\\|and\\)\\>[ \t]*[^;]")))
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3361 (forward-word -1))
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3362
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3363 ((looking-at "is")
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3364 (setq found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3365 (and (save-excursion (ada-goto-previous-word)
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3366 (ada-goto-previous-word)
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3367 (not (looking-at "subtype")))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3368
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3369 (save-excursion (goto-char (cdr match-dat))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3370 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3371 ;; words that can go after an 'is'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3372 (not (looking-at
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3373 (eval-when-compile
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3374 (concat "\\<"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3375 (regexp-opt
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3376 '("separate" "access" "array"
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3377 "private" "abstract" "new") t)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3378 "\\>\\|("))))))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3379
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3380 ((looking-at "private")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3381 (save-excursion
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3382 (backward-word 1)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3383 (setq found (not (looking-at "is")))))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3384
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3385 (t
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
3386 (setq found t))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3387 )))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3388
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3389 (if found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3390 match-dat
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3391 nil)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3392
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3393
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3394 (defun ada-goto-next-non-ws (&optional limit)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3395 "Skip white spaces, newlines and comments to next non-ws character.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3396 Stop the search at LIMIT.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3397 Do not call this function from within a string."
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3398 (unless limit
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3399 (setq limit (point-max)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3400 (while (and (<= (point) limit)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3401 (progn (forward-comment 10000)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3402 (if (and (not (eobp))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3403 (save-excursion (forward-char 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3404 (ada-in-string-p)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3405 (progn (forward-sexp 1) t)))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3406 (if (< (point) limit)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3407 (point)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3408 nil)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3409 )
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3410
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3411
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3412 (defun ada-goto-stmt-end (&optional limit)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3413 "Move point to the end of the statement that point is in or before.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3414 Return the new position of point or nil if not found.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3415 Stop the search at LIMIT."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3416 (if (ada-search-ignore-string-comment ada-end-stmt-re nil limit)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3417 (point)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3418 nil))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3419
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3420
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3421 (defun ada-goto-next-word (&optional backward)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3422 "Move point to the beginning of the next word of Ada code.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3423 If BACKWARD is non-nil, jump to the beginning of the previous word.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3424 Return the new position of point or nil if not found."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3425 (let ((match-cons nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3426 (orgpoint (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3427 (old-syntax (char-to-string (char-syntax ?_))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3428 (modify-syntax-entry ?_ "w")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3429 (unless backward
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3430 (skip-syntax-forward "w"))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3431 (if (setq match-cons
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3432 (if backward
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3433 (ada-search-ignore-string-comment "\\w" t nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3434 (ada-search-ignore-string-comment "\\w" nil nil t)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3435 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3436 ;; move to the beginning of the word found
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3437 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3438 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3439 (goto-char (car match-cons))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3440 (skip-syntax-backward "w")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3441 (point))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3442 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3443 ;; if not found, restore old position of point
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3444 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3445 (goto-char orgpoint)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3446 'nil)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3447 (modify-syntax-entry ?_ old-syntax))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3448 )
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3449
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3450
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3451 (defun ada-check-matching-start (keyword)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3452 "Signal an error if matching block start is not KEYWORD.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3453 Moves point to the matching block start."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3454 (ada-goto-matching-start 0)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3455 (unless (looking-at (concat "\\<" keyword "\\>"))
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3456 (error "Matching start is not '%s'" keyword)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3457
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3458
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3459 (defun ada-check-defun-name (defun-name)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3460 "Check if the name of the matching defun really is DEFUN-NAME.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3461 Assumes point to be already positioned by `ada-goto-matching-start'.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3462 Moves point to the beginning of the declaration."
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3463
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
3464 ;; named block without a `declare'; ada-goto-matching-start leaves
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
3465 ;; point at start of 'begin' for a block.
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3466 (if (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3467 (ada-goto-previous-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3468 (looking-at (concat "\\<" defun-name "\\> *:")))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3469 t ; do nothing
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
3470 ;; else
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3471 ;;
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3472 ;; 'accept' or 'package' ?
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3473 ;;
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3474 (unless (looking-at ada-subprog-start-re)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3475 (ada-goto-matching-decl-start))
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3476 ;;
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3477 ;; 'begin' of 'procedure'/'function'/'task' or 'declare'
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3478 ;;
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3479 (save-excursion
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3480 ;;
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3481 ;; a named 'declare'-block ? => jump to the label
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3482 ;;
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3483 (if (looking-at "\\<declare\\>")
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
3484 (progn
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
3485 (forward-comment -1)
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
3486 (backward-word 1))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3487 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3488 ;; no, => 'procedure'/'function'/'task'/'protected'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3489 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3490 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3491 (forward-word 2)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3492 (backward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3493 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3494 ;; skip 'body' 'type'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3495 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3496 (if (looking-at "\\<\\(body\\|type\\)\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3497 (forward-word 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3498 (forward-sexp 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3499 (backward-sexp 1)))
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3500 ;;
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3501 ;; should be looking-at the correct name
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
3502 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3503 (unless (looking-at (concat "\\<" defun-name "\\>"))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3504 (error "Matching defun has different name: %s"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3505 (buffer-substring (point)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3506 (progn (forward-sexp 1) (point))))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3507
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3508 (defun ada-goto-matching-decl-start (&optional noerror recursive)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3509 "Move point to the matching declaration start of the current 'begin'.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3510 If NOERROR is non-nil, it only returns nil if no match was found."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3511 (let ((nest-count 1)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3512
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3513 ;; first should be set to t if we should stop at the first
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3514 ;; "begin" we encounter.
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3515 (first (not recursive))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3516 (count-generic nil)
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
3517 (stop-at-when nil)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3518 )
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3519
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3520 ;; Ignore "when" most of the time, except if we are looking at the
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3521 ;; beginning of a block (structure: case .. is
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3522 ;; when ... =>
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3523 ;; begin ...
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3524 ;; exception ... )
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3525 (if (looking-at "begin")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3526 (setq stop-at-when t))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3527
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3528 (if (or
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3529 (looking-at "\\<\\(package\\|procedure\\|function\\)\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3530 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3531 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3532 "\\<\\(package\\|procedure\\|function\\|generic\\)\\>" t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3533 (looking-at "generic")))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3534 (setq count-generic t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3535
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3536 ;; search backward for interesting keywords
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3537 (while (and
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3538 (not (zerop nest-count))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3539 (ada-search-ignore-string-comment ada-matching-decl-start-re t))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3540 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3541 ;; calculate nest-depth
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3542 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3543 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3544 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3545 ((looking-at "end")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3546 (ada-goto-matching-start 1 noerror)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3547
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3548 ;; In some case, two begin..end block can follow each other closely,
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3549 ;; which we have to detect, as in
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3550 ;; procedure P is
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3551 ;; procedure Q is
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3552 ;; begin
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3553 ;; end;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3554 ;; begin -- here we should go to procedure, not begin
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3555 ;; end
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3556
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3557 (if (looking-at "begin")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3558 (let ((loop-again t))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3559 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3560 (while loop-again
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3561 ;; If begin was just there as the beginning of a block
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3562 ;; (with no declare) then do nothing, otherwise just
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3563 ;; register that we have to find the statement that
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3564 ;; required the begin
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3565
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3566 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3567 "\\<\\(declare\\|begin\\|end\\|procedure\\|function\\|task\\|package\\)\\>"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3568 t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3569
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3570 (if (looking-at "end")
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3571 (ada-goto-matching-start 1 noerror t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3572 ;; (ada-goto-matching-decl-start noerror t)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3573
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3574 (setq loop-again nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3575 (unless (looking-at "begin")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3576 (setq nest-count (1+ nest-count))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3577 ))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3578 )))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3579 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3580 ((looking-at "generic")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3581 (if count-generic
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3582 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3583 (setq first nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3584 (setq nest-count (1- nest-count)))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3585 ;;
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3586 ((looking-at "if")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3587 (save-excursion
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3588 (forward-word -1)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3589 (unless (looking-at "\\<end[ \t\n]*if\\>")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3590 (progn
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3591 (setq nest-count (1- nest-count))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
3592 (setq first nil)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
3593
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3594 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3595 ((looking-at "declare\\|generic")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3596 (setq nest-count (1- nest-count))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3597 (setq first t))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3598 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3599 ((looking-at "is")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3600 ;; check if it is only a type definition, but not a protected
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3601 ;; type definition, which should be handled like a procedure.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3602 (if (or (looking-at "is[ \t]+<>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3603 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3604 (forward-comment -10000)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3605 (forward-char -1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3606
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3607 ;; Detect if we have a closing parenthesis (Could be
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3608 ;; either the end of subprogram parameters or (<>)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3609 ;; in a type definition
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3610 (if (= (char-after) ?\))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3611 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3612 (forward-char 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3613 (backward-sexp 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3614 (forward-comment -10000)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3615 ))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3616 (skip-chars-backward "a-zA-Z0-9_.'")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3617 (ada-goto-previous-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3618 (and
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3619 (looking-at "\\<\\(sub\\)?type\\|case\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3620 (save-match-data
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3621 (ada-goto-previous-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3622 (not (looking-at "\\<protected\\>"))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3623 )) ; end of `or'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3624 (goto-char (match-beginning 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3625 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3626 (setq nest-count (1- nest-count))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3627 (setq first nil))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3628
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3629 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3630 ((looking-at "new")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3631 (if (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3632 (ada-goto-previous-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3633 (looking-at "is"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3634 (goto-char (match-beginning 0))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3635 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3636 ((and first
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3637 (looking-at "begin"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3638 (setq nest-count 0))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3639 ;;
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3640 ((looking-at "when")
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3641 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3642 (forward-word -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3643 (unless (looking-at "\\<exit[ \t\n]*when\\>")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3644 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3645 (if stop-at-when
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3646 (setq nest-count (1- nest-count)))
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3647 ))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3648 ;;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3649 ((looking-at "begin")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3650 (setq first nil))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3651 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3652 (t
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3653 (setq nest-count (1+ nest-count))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3654 (setq first nil)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3655
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3656 );; end of loop
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3657
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3658 ;; check if declaration-start is really found
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3659 (if (and
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3660 (zerop nest-count)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3661 (if (looking-at "is")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3662 (ada-search-ignore-string-comment ada-subprog-start-re t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3663 (looking-at "declare\\|generic")))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3664 t
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3665 (if noerror nil
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3666 (error "No matching proc/func/task/declare/package/protected")))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3667 ))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3668
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3669 (defun ada-goto-matching-start (&optional nest-level noerror gotothen)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3670 "Move point to the beginning of a block-start.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3671 Which block depends on the value of NEST-LEVEL, which defaults to zero.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3672 If NOERROR is non-nil, it only returns nil if no matching start was found.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3673 If GOTOTHEN is non-nil, point moves to the 'then' following 'if'."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3674 (let ((nest-count (if nest-level nest-level 0))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3675 (found nil)
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3676
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3677 (last-was-begin '())
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3678 ;; List all keywords encountered while traversing
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3679 ;; something like '("end" "end" "begin")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3680 ;; This is removed from the list when "package", "procedure",...
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3681 ;; are seen. The goal is to find whether a package has an elaboration
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3682 ;; part
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3683
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3684 (pos nil))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3685
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3686 ;; search backward for interesting keywords
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3687 (while (and
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3688 (not found)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3689 (ada-search-ignore-string-comment ada-matching-start-re t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3690
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3691 (unless (and (looking-at "\\<record\\>")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3692 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3693 (forward-word -1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3694 (looking-at "\\<null\\>")))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3695 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3696 ;; calculate nest-depth
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3697 (cond
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3698 ;; found block end => increase nest depth
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3699 ((looking-at "end")
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3700 (push nil last-was-begin)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3701 (setq nest-count (1+ nest-count)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3702
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3703 ;; found loop/select/record/case/if => check if it starts or
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3704 ;; ends a block
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3705 ((looking-at "loop\\|select\\|record\\|case\\|if")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3706 (setq pos (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3707 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3708 ;; check if keyword follows 'end'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3709 (ada-goto-previous-word)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3710 (if (looking-at "\\<end\\>[ \t]*[^;]")
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3711 (progn
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3712 ;; it ends a block => increase nest depth
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3713 (setq nest-count (1+ nest-count)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3714 pos (point))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3715 (push nil last-was-begin))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3716
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3717 ;; it starts a block => decrease nest depth
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3718 (setq nest-count (1- nest-count))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3719
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3720 ;; Some nested "begin .. end" blocks with no "declare"?
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3721 ;; => remove those entries
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3722 (while (car last-was-begin)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3723 (setq last-was-begin (cdr (cdr last-was-begin))))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3724
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3725 (setq last-was-begin (cdr last-was-begin))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3726 ))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3727 (goto-char pos)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3728 )
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3729
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3730 ;; found package start => check if it really is a block
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3731 ((looking-at "package")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3732 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3733 ;; ignore if this is just a renames statement
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3734 (let ((current (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3735 (pos (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3736 "\\<\\(is\\|renames\\|;\\)\\>" nil)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3737 (if pos
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3738 (goto-char (car pos))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3739 (error (concat
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3740 "No matching 'is' or 'renames' for 'package' at"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3741 " line "
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3742 (number-to-string (count-lines 1 (1+ current)))))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3743 (unless (looking-at "renames")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3744 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3745 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3746 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3747 ;; ignore it if it is only a declaration with 'new'
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3748 ;; We could have package Foo is new ....
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3749 ;; or package Foo is separate;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3750 ;; or package Foo is begin null; end Foo
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3751 ;; for elaboration code (elaboration)
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3752 (if (and (not (looking-at "\\<\\(new\\|separate\\|begin\\)\\>"))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3753 (not (car last-was-begin)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3754 (setq nest-count (1- nest-count))))))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3755
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3756 (setq last-was-begin (cdr last-was-begin))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3757 )
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3758 ;; found task start => check if it has a body
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3759 ((looking-at "task")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3760 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3761 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3762 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3763 (cond
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3764 ((looking-at "\\<body\\>"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3765 ((looking-at "\\<type\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3766 ;; In that case, do nothing if there is a "is"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3767 (forward-word 2);; skip "type"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3768 (ada-goto-next-non-ws);; skip type name
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3769
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3770 ;; Do nothing if we are simply looking at a simple
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3771 ;; "task type name;" statement with no block
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3772 (unless (looking-at ";")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3773 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3774 ;; Skip the parameters
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3775 (if (looking-at "(")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3776 (ada-search-ignore-string-comment ")" nil))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3777 (let ((tmp (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3778 "\\<\\(is\\|;\\)\\>" nil)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3779 (if tmp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3780 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3781 (goto-char (car tmp))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3782 (if (looking-at "is")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3783 (setq nest-count (1- nest-count)))))))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3784 (t
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3785 ;; Check if that task declaration had a block attached to
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3786 ;; it (i.e do nothing if we have just "task name;")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3787 (unless (progn (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3788 (looking-at "[ \t]*;"))
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3789 (setq nest-count (1- nest-count))))))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3790 (setq last-was-begin (cdr last-was-begin))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3791 )
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3792
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3793 ((looking-at "declare")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3794 ;; remove entry for begin and end (include nested begin..end
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3795 ;; groups)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3796 (setq last-was-begin (cdr last-was-begin))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3797 (let ((count 1))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3798 (while (and (> count 0))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3799 (if (equal (car last-was-begin) t)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3800 (setq count (1+ count))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3801 (setq count (1- count)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3802 (setq last-was-begin (cdr last-was-begin))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3803 )))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3804
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3805 ((looking-at "protected")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3806 ;; Ignore if this is just a declaration
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3807 (save-excursion
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3808 (let ((pos (ada-search-ignore-string-comment
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3809 "\\(\\<is\\>\\|\\<renames\\>\\|;\\)" nil)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3810 (if pos
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3811 (goto-char (car pos)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3812 (if (looking-at "is")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3813 ;; remove entry for end
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3814 (setq last-was-begin (cdr last-was-begin)))))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3815 (setq nest-count (1- nest-count)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3816
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3817 ((or (looking-at "procedure")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3818 (looking-at "function"))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3819 ;; Ignore if this is just a declaration
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3820 (save-excursion
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3821 (let ((pos (ada-search-ignore-string-comment
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3822 "\\(\\<is\\>\\|\\<renames\\>\\|)[ \t]*;\\)" nil)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3823 (if pos
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3824 (goto-char (car pos)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3825 (if (looking-at "is")
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3826 ;; remove entry for begin and end
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3827 (setq last-was-begin (cdr (cdr last-was-begin))))))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3828 )
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3829
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3830 ;; all the other block starts
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3831 (t
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3832 (push (looking-at "begin") last-was-begin)
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3833 (setq nest-count (1- nest-count)))
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3834
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
3835 )
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3836
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3837 ;; match is found, if nest-depth is zero
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3838 (setq found (zerop nest-count))))) ; end of loop
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3839
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3840 (if (bobp)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3841 (point)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3842 (if found
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3843 ;;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3844 ;; match found => is there anything else to do ?
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3845 ;;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3846 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3847 (cond
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3848 ;;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3849 ;; found 'if' => skip to 'then', if it's on a separate line
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3850 ;; and GOTOTHEN is non-nil
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3851 ;;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3852 ((and
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3853 gotothen
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3854 (looking-at "if")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3855 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3856 (ada-search-ignore-string-comment "then" nil nil nil
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3857 'word-search-forward)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3858 (back-to-indentation)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3859 (looking-at "\\<then\\>")))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3860 (goto-char (match-beginning 0)))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3861
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3862 ;;
98674
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
3863 ;; found 'do' => skip back to 'accept' or 'return'
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3864 ;;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3865 ((looking-at "do")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3866 (unless (ada-search-ignore-string-comment
98674
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
3867 "\\<accept\\|return\\>" t)
bde81f3667cd * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Juanma Barranquero <lekktu@gmail.com>
parents: 97078
diff changeset
3868 (error "Missing 'accept' or 'return' in front of 'do'"))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3869 (point))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3870
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3871 (if noerror
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3872 nil
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3873 (error "No matching start"))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3874
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3875
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3876 (defun ada-goto-matching-end (&optional nest-level noerror)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3877 "Move point to the end of a block.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3878 Which block depends on the value of NEST-LEVEL, which defaults to zero.
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
3879 If NOERROR is non-nil, it only returns nil if no matching start found."
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3880 (let ((nest-count (or nest-level 0))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3881 (regex (eval-when-compile
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3882 (concat "\\<"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3883 (regexp-opt '("end" "loop" "select" "begin" "case"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3884 "if" "task" "package" "record" "do"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3885 "procedure" "function") t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3886 "\\>")))
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3887 found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3888 pos
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3889
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3890 ;; First is used for subprograms: they are generally handled
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3891 ;; recursively, but of course we do not want to do that the
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3892 ;; first time (see comment below about subprograms)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3893 (first (not (looking-at "declare"))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3894
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3895 ;; If we are already looking at one of the keywords, this shouldn't count
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3896 ;; in the nesting loop below, so we just make sure we don't count it.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3897 ;; "declare" is a special case because we need to look after the "begin"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3898 ;; keyword
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3899 (if (looking-at "\\<if\\|loop\\|case\\|begin\\>")
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3900 (forward-char 1))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3901
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3902 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3903 ;; search forward for interesting keywords
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3904 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3905 (while (and
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3906 (not found)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3907 (ada-search-ignore-string-comment regex nil))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3908
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3909 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3910 ;; calculate nest-depth
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3911 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3912 (backward-word 1)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3913 (cond
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3914 ;; procedures and functions need to be processed recursively, in
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3915 ;; case they are defined in a declare/begin block, as in:
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3916 ;; declare -- NL 0 (nested level)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3917 ;; A : Boolean;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3918 ;; procedure B (C : D) is
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3919 ;; begin -- NL 1
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3920 ;; null;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3921 ;; end B; -- NL 0, and we would exit
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3922 ;; begin
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3923 ;; end; -- we should exit here
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3924 ;; processing them recursively avoids the need for any special
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3925 ;; handling.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3926 ;; Nothing should be done if we have only the specs or a
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3927 ;; generic instantion.
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3928
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3929 ((and (looking-at "\\<procedure\\|function\\>"))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3930 (if first
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3931 (forward-word 1)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3932
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3933 (setq pos (point))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3934 (ada-search-ignore-string-comment "is\\|;")
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3935 (if (= (char-before) ?s)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3936 (progn
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3937 (ada-goto-next-non-ws)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3938 (unless (looking-at "\\<new\\>")
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3939 (progn
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3940 (goto-char pos)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3941 (ada-goto-matching-end 0 t)))))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3942
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3943 ;; found block end => decrease nest depth
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3944 ((looking-at "\\<end\\>")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3945 (setq nest-count (1- nest-count)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3946 found (<= nest-count 0))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3947 ;; skip the following keyword
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3948 (if (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3949 (skip-chars-forward "end")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3950 (ada-goto-next-non-ws)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3951 (looking-at "\\<\\(loop\\|select\\|record\\|case\\|if\\)\\>"))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3952 (forward-word 1)))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3953
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3954 ;; found package start => check if it really starts a block, and is not
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3955 ;; in fact a generic instantiation for instance
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3956 ((looking-at "\\<package\\>")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3957 (ada-search-ignore-string-comment "is" nil nil nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3958 'word-search-forward)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3959 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3960 ;; ignore and skip it if it is only a 'new' package
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3961 (if (looking-at "\\<new\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3962 (goto-char (match-end 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3963 (setq nest-count (1+ nest-count)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3964 found (<= nest-count 0))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
3965
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3966 ;; all the other block starts
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3967 (t
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3968 (if (not first)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3969 (setq nest-count (1+ nest-count)))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
3970 (setq found (<= nest-count 0))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3971 (forward-word 1))) ; end of 'cond'
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3972
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
3973 (setq first nil))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3974
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3975 (if found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3976 t
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3977 (if noerror
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3978 nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3979 (error "No matching end")))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3980 ))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3981
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3982
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3983 (defun ada-search-ignore-string-comment
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
3984 (search-re &optional backward limit paramlists search-func)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
3985 "Regexp-search for SEARCH-RE, ignoring comments, strings.
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3986 Returns a cons cell of begin and end of match data or nil, if not found.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3987 If BACKWARD is non-nil, search backward; search forward otherwise.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3988 The search stops at pos LIMIT.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3989 If PARAMLISTS is nil, ignore parameter lists.
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
3990 The search is done using SEARCH-FUNC. SEARCH-FUNC can be optimized
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3991 in case we are searching for a constant string.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
3992 Point is moved at the beginning of the SEARCH-RE."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
3993 (let (found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3994 begin
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3995 end
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3996 parse-result
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3997 (previous-syntax-table (syntax-table)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3998
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
3999 ;; FIXME: need to pass BACKWARD to search-func!
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4000 (unless search-func
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4001 (setq search-func (if backward 're-search-backward 're-search-forward)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4002
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4003 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4004 ;; search until found or end-of-buffer
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4005 ;; We have to test that we do not look further than limit
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4006 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4007 (set-syntax-table ada-mode-symbol-syntax-table)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4008 (while (and (not found)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4009 (or (not limit)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4010 (or (and backward (<= limit (point)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4011 (>= limit (point))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4012 (funcall search-func search-re limit 1))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4013 (setq begin (match-beginning 0))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4014 (setq end (match-end 0))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4015
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4016 (setq parse-result (parse-partial-sexp
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4017 (save-excursion (beginning-of-line) (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4018 (point)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4019
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4020 (cond
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4021 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4022 ;; If inside a string, skip it (and the following comments)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4023 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4024 ((ada-in-string-p parse-result)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4025 (if (featurep 'xemacs)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4026 (search-backward "\"" nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4027 (goto-char (nth 8 parse-result)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4028 (unless backward (forward-sexp 1)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4029 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4030 ;; If inside a comment, skip it (and the following comments)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4031 ;; There is a special code for comments at the end of the file
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4032 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4033 ((ada-in-comment-p parse-result)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4034 (if (featurep 'xemacs)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4035 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4036 (forward-line 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4037 (beginning-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4038 (forward-comment -1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4039 (goto-char (nth 8 parse-result)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4040 (unless backward
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4041 ;; at the end of the file, it is not possible to skip a comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4042 ;; so we just go at the end of the line
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4043 (if (forward-comment 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4044 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4045 (forward-comment 1000)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4046 (beginning-of-line))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4047 (end-of-line))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4048 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4049 ;; directly in front of a comment => skip it, if searching forward
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4050 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4051 ((and (= (char-after begin) ?-) (= (char-after (1+ begin)) ?-))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4052 (unless backward (progn (forward-char -1) (forward-comment 1000))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4053
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4054 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4055 ;; found a parameter-list but should ignore it => skip it
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4056 ;;
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4057 ((and (not paramlists) (ada-in-paramlist-p))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4058 (if backward
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4059 (search-backward "(" nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4060 (search-forward ")" nil t)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4061 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4062 ;; found what we were looking for
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4063 ;;
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4064 (t
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4065 (setq found t)))) ; end of loop
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4066
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4067 (set-syntax-table previous-syntax-table)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4068
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4069 (if found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4070 (cons begin end)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4071 nil)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4072
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4073 ;; -------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4074 ;; -- Testing the position of the cursor
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4075 ;; -------------------------------------------------------
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4076
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4077 (defun ada-in-decl-p ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4078 "Return t if point is inside a declarative part.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4079 Assumes point to be at the end of a statement."
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4080 (or (ada-in-paramlist-p)
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4081 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4082 (ada-goto-matching-decl-start t))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4083
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4084
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4085 (defun ada-looking-at-semi-or ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4086 "Return t if looking at an 'or' following a semicolon."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4087 (save-excursion
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4088 (and (looking-at "\\<or\\>")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4089 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4090 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4091 (ada-goto-stmt-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4092 (looking-at "\\<or\\>")))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4093
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4094
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4095 (defun ada-looking-at-semi-private ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4096 "Return t if looking at the start of a private section in a package.
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
4097 Return nil if the private is part of the package name, as in
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4098 'private package A is...' (this can only happen at top level)."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4099 (save-excursion
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4100 (and (looking-at "\\<private\\>")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4101 (not (looking-at "\\<private[ \t]*\\(package\\|generic\\)"))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4102
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4103 ;; Make sure this is the start of a private section (ie after
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4104 ;; a semicolon or just after the package declaration, but not
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4105 ;; after a 'type ... is private' or 'is new ... with private'
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4106 ;;
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4107 ;; Note that a 'private' statement at the beginning of the buffer
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4108 ;; does not indicate a private section, since this is instead a
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4109 ;; 'private procedure ...'
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
4110 (progn (forward-comment -1000)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4111 (and (not (bobp))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4112 (or (= (char-before) ?\;)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4113 (and (forward-word -3)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4114 (looking-at "\\<package\\>"))))))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4115
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4116
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4117 (defun ada-in-paramlist-p ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4118 "Return t if point is inside a parameter-list."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4119 (save-excursion
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4120 (and
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4121 (ada-search-ignore-string-comment "(\\|)" t nil t)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4122 ;; inside parentheses ?
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4123 (= (char-after) ?\()
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4124
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4125 ;; We could be looking at two things here:
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4126 ;; operator definition: function "." (
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4127 ;; subprogram definition: procedure .... (
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4128 ;; Let's skip back over the first one
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4129 (progn
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4130 (skip-chars-backward " \t\n")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4131 (if (= (char-before) ?\")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4132 (backward-char 3)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4133 (backward-word 1))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4134 t)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4135
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4136 ;; and now over the second one
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4137 (backward-word 1)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4138
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4139 ;; We should ignore the case when the reserved keyword is in a
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4140 ;; comment (for instance, when we have:
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4141 ;; -- .... package
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4142 ;; Test (A)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4143 ;; we should return nil
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4144
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4145 (not (ada-in-string-or-comment-p))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4146
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4147 ;; right keyword two words before parenthesis ?
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4148 ;; Type is in this list because of discriminants
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4149 (looking-at (eval-when-compile
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4150 (concat "\\<\\("
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4151 "procedure\\|function\\|body\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4152 "task\\|entry\\|accept\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4153 "access[ \t]+procedure\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4154 "access[ \t]+function\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4155 "pragma\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4156 "type\\)\\>"))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4157
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4158 (defun ada-search-ignore-complex-boolean (regexp backwardp)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4159 "Search for REGEXP, ignoring comments, strings, 'and then', 'or else'.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4160 If BACKWARDP is non-nil, search backward; search forward otherwise."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4161 (let (result)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4162 (while (and (setq result (ada-search-ignore-string-comment regexp backwardp))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4163 (save-excursion (forward-word -1)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4164 (looking-at "and then\\|or else"))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4165 result))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4166
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4167 (defun ada-in-open-paren-p ()
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4168 "Non-nil if in an open parenthesis.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4169 Return value is the position of the first non-ws behind the last unclosed
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4170 parenthesis, or nil."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4171 (save-excursion
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4172 (let ((parse (parse-partial-sexp
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4173 (point)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4174 (or (car (ada-search-ignore-complex-boolean
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4175 "\\<\\(;\\|is\\|then\\|loop\\|begin\\|else\\)\\>"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4176 t))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4177 (point-min)))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4178
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4179 (if (nth 1 parse)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4180 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4181 (goto-char (1+ (nth 1 parse)))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4182
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4183 ;; Skip blanks, if they are not followed by a comment
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4184 ;; See:
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4185 ;; type A is ( Value_0,
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4186 ;; Value_1);
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4187 ;; type B is ( -- comment
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4188 ;; Value_2);
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
4189
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4190 (if (or (not ada-indent-handle-comment-special)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4191 (not (looking-at "[ \t]+--")))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4192 (skip-chars-forward " \t"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4193
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4194 (point))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4195
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4196
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4197 ;; -----------------------------------------------------------
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4198 ;; -- Behavior Of TAB Key
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4199 ;; -----------------------------------------------------------
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4200
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4201 (defun ada-tab ()
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4202 "Do indenting or tabbing according to `ada-tab-policy'.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4203 In Transient Mark mode, if the mark is active, operate on the contents
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4204 of the region. Otherwise, operate only on the current line."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4205 (interactive)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4206 (cond ((eq ada-tab-policy 'indent-rigidly) (ada-tab-hard))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4207 ((eq ada-tab-policy 'indent-auto)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4208 (if (ada-region-selected)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4209 (ada-indent-region (region-beginning) (region-end))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4210 (ada-indent-current)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4211 ((eq ada-tab-policy 'always-tab) (error "Not implemented"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4212 ))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4213
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4214 (defun ada-untab (arg)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4215 "Delete leading indenting according to `ada-tab-policy'."
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4216 ;; FIXME: ARG is ignored
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4217 (interactive "P")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4218 (cond ((eq ada-tab-policy 'indent-rigidly) (ada-untab-hard))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4219 ((eq ada-tab-policy 'indent-auto) (error "Not implemented"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4220 ((eq ada-tab-policy 'always-tab) (error "Not implemented"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4221 ))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4222
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4223 (defun ada-indent-current-function ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4224 "Ada mode version of the `indent-line-function'."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4225 (interactive "*")
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4226 (let ((starting-point (point-marker)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4227 (beginning-of-line)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4228 (ada-tab)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4229 (if (< (point) starting-point)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4230 (goto-char starting-point))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4231 (set-marker starting-point nil)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4232 ))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4233
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4234 (defun ada-tab-hard ()
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4235 "Indent current line to next tab stop."
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4236 (interactive)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4237 (save-excursion
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4238 (beginning-of-line)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4239 (insert-char ? ada-indent))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4240 (if (save-excursion (= (point) (progn (beginning-of-line) (point))))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4241 (forward-char ada-indent)))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4242
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4243 (defun ada-untab-hard ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4244 "Indent current line to previous tab stop."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4245 (interactive)
73434
3586ad4a01a1 (ada-in-string-p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73422
diff changeset
4246 (let ((bol (save-excursion (progn (beginning-of-line) (point))))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4247 (eol (save-excursion (progn (end-of-line) (point)))))
73434
3586ad4a01a1 (ada-in-string-p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73422
diff changeset
4248 (indent-rigidly bol eol (- 0 ada-indent))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4249
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4250
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4251
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4252 ;; ------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4253 ;; -- Miscellaneous
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4254 ;; ------------------------------------------------------------
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4255
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4256 ;; Not needed any more for Emacs 21.2, but still needed for backward
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4257 ;; compatibility
73434
3586ad4a01a1 (ada-in-string-p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73422
diff changeset
4258 (defun ada-remove-trailing-spaces ()
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4259 "Remove trailing spaces in the whole buffer."
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4260 (interactive)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4261 (save-match-data
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4262 (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4263 (save-restriction
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4264 (widen)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4265 (goto-char (point-min))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4266 (while (re-search-forward "[ \t]+$" (point-max) t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4267 (replace-match "" nil nil))))))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4268
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4269 (defun ada-gnat-style ()
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4270 "Clean up comments, `(' and `,' for GNAT style checking switch."
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4271 (interactive)
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4272 (save-excursion
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4273
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4274 ;; The \n is required, or the line after an empty comment line is
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4275 ;; simply ignored.
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4276 (goto-char (point-min))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4277 (while (re-search-forward "--[ \t]*\\([^-\n]\\)" nil t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4278 (replace-match "-- \\1")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4279 (forward-line 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4280 (beginning-of-line))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
4281
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4282 (goto-char (point-min))
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4283 (while (re-search-forward "\\>(" nil t)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4284 (if (not (ada-in-string-or-comment-p))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4285 (replace-match " (")))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4286 (goto-char (point-min))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4287 (while (re-search-forward ";--" nil t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4288 (forward-char -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4289 (if (not (ada-in-string-or-comment-p))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4290 (replace-match "; --")))
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4291 (goto-char (point-min))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4292 (while (re-search-forward "([ \t]+" nil t)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4293 (if (not (ada-in-string-or-comment-p))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4294 (replace-match "(")))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4295 (goto-char (point-min))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4296 (while (re-search-forward ")[ \t]+)" nil t)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4297 (if (not (ada-in-string-or-comment-p))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4298 (replace-match "))")))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4299 (goto-char (point-min))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4300 (while (re-search-forward "\\>:" nil t)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4301 (if (not (ada-in-string-or-comment-p))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4302 (replace-match " :")))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4303
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4304 ;; Make sure there is a space after a ','.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4305 ;; Always go back to the beginning of the match, since otherwise
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4306 ;; a statement like ('F','D','E') is incorrectly modified.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4307 (goto-char (point-min))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4308 (while (re-search-forward ",[ \t]*\\(.\\)" nil t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4309 (if (not (save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4310 (goto-char (match-beginning 0))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4311 (ada-in-string-or-comment-p)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4312 (replace-match ", \\1")))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4313
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4314 ;; Operators should be surrounded by spaces.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4315 (goto-char (point-min))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4316 (while (re-search-forward
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4317 "[ \t]*\\(/=\\|\\*\\*\\|:=\\|\\.\\.\\|[-:+*/]\\)[ \t]*"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4318 nil t)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4319 (goto-char (match-beginning 1))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4320 (if (or (looking-at "--")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4321 (ada-in-string-or-comment-p))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4322 (progn
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4323 (forward-line 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4324 (beginning-of-line))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4325 (cond
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4326 ((string= (match-string 1) "/=")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4327 (replace-match " /= "))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4328 ((string= (match-string 1) "..")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4329 (replace-match " .. "))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4330 ((string= (match-string 1) "**")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4331 (replace-match " ** "))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4332 ((string= (match-string 1) ":=")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4333 (replace-match " := "))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4334 (t
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4335 (replace-match " \\1 ")))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4336 (forward-char 1)))
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4337 ))
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4338
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
4339
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4340
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4341 ;; -------------------------------------------------------------
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4342 ;; -- Moving To Procedures/Packages/Statements
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4343 ;; -------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4344
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4345 (defun ada-move-to-start ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4346 "Move point to the matching start of the current Ada structure."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4347 (interactive)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4348 (let ((pos (point))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4349 (previous-syntax-table (syntax-table)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4350 (unwind-protect
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4351 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4352 (set-syntax-table ada-mode-symbol-syntax-table)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4353
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4354 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4355 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4356 ;; do nothing if in string or comment or not on 'end ...;'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4357 ;; or if an error occurs during processing
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4358 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4359 (or
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4360 (ada-in-string-or-comment-p)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4361 (and (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4362 (or (looking-at "[ \t]*\\<end\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4363 (backward-word 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4364 (or (looking-at "[ \t]*\\<end\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4365 (backward-word 1))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4366 (or (looking-at "[ \t]*\\<end\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4367 (error "Not on end ...;")))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4368 (ada-goto-matching-start 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4369 (setq pos (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4370
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4371 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4372 ;; on 'begin' => go on, according to user option
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4373 ;;
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4374 ada-move-to-declaration
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4375 (looking-at "\\<begin\\>")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4376 (ada-goto-matching-decl-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4377 (setq pos (point))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4378
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4379 ) ; end of save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4380
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4381 ;; now really move to the found position
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4382 (goto-char pos))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4383
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4384 ;; restore syntax-table
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4385 (set-syntax-table previous-syntax-table))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4386
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4387 (defun ada-move-to-end ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4388 "Move point to the matching end of the block around point.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4389 Moves to 'begin' if in a declarative part."
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4390 (interactive)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4391 (let ((pos (point))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4392 decl-start
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4393 (previous-syntax-table (syntax-table)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4394 (unwind-protect
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4395 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4396 (set-syntax-table ada-mode-symbol-syntax-table)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4397
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4398 (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4399
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4400 (cond
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4401 ;; Go to the beginning of the current word, and check if we are
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4402 ;; directly on 'begin'
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4403 ((save-excursion
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4404 (skip-syntax-backward "w")
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4405 (looking-at "\\<begin\\>"))
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4406 (ada-goto-matching-end 1)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4407 )
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
4408
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4409 ;; on first line of subprogram body
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4410 ;; Do nothing for specs or generic instantion, since these are
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4411 ;; handled as the general case (find the enclosing block)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4412 ;; We also need to make sure that we ignore nested subprograms
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4413 ((save-excursion
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4414 (and (skip-syntax-backward "w")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4415 (looking-at "\\<function\\>\\|\\<procedure\\>" )
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4416 (ada-search-ignore-string-comment "is\\|;")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4417 (not (= (char-before) ?\;))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4418 ))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4419 (skip-syntax-backward "w")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4420 (ada-goto-matching-end 0 t))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
4421
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4422 ;; on first line of task declaration
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4423 ((save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4424 (and (ada-goto-stmt-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4425 (looking-at "\\<task\\>" )
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4426 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4427 (ada-goto-next-non-ws)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4428 (looking-at "\\<body\\>")))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4429 (ada-search-ignore-string-comment "begin" nil nil nil
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4430 'word-search-forward))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4431 ;; accept block start
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4432 ((save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4433 (and (ada-goto-stmt-start)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4434 (looking-at "\\<accept\\>" )))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4435 (ada-goto-matching-end 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4436 ;; package start
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4437 ((save-excursion
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4438 (setq decl-start (and (ada-goto-matching-decl-start t) (point)))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4439 (and decl-start (looking-at "\\<package\\>")))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4440 (ada-goto-matching-end 1))
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4441
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4442 ;; On a "declare" keyword
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4443 ((save-excursion
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4444 (skip-syntax-backward "w")
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4445 (looking-at "\\<declare\\>"))
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4446 (ada-goto-matching-end 0 t))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
4447
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4448 ;; inside a 'begin' ... 'end' block
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4449 (decl-start
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4450 (goto-char decl-start)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4451 (ada-goto-matching-end 0 t))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
4452
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4453 ;; (hopefully ;-) everything else
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4454 (t
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4455 (ada-goto-matching-end 1)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4456 (setq pos (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4457 )
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4458
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4459 ;; now really move to the position found
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4460 (goto-char pos))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4461
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4462 ;; restore syntax-table
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4463 (set-syntax-table previous-syntax-table))))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4464
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4465 (defun ada-next-procedure ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4466 "Move point to next procedure."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4467 (interactive)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4468 (end-of-line)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4469 (if (re-search-forward ada-procedure-start-regexp nil t)
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
4470 (goto-char (match-beginning 4))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4471 (error "No more functions/procedures/tasks")))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4472
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4473 (defun ada-previous-procedure ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4474 "Move point to previous procedure."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4475 (interactive)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4476 (beginning-of-line)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4477 (if (re-search-backward ada-procedure-start-regexp nil t)
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
4478 (goto-char (match-beginning 4))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4479 (error "No more functions/procedures/tasks")))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4480
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4481 (defun ada-next-package ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4482 "Move point to next package."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4483 (interactive)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4484 (end-of-line)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4485 (if (re-search-forward ada-package-start-regexp nil t)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4486 (goto-char (match-beginning 1))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4487 (error "No more packages")))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4488
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4489 (defun ada-previous-package ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4490 "Move point to previous package."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4491 (interactive)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4492 (beginning-of-line)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4493 (if (re-search-backward ada-package-start-regexp nil t)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4494 (goto-char (match-beginning 1))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4495 (error "No more packages")))
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4496
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4497
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4498 ;; ------------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4499 ;; -- Define keymap and menus for Ada
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4500 ;; -------------------------------------------------------------
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4501
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4502 (defun ada-create-keymap ()
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4503 "Create the keymap associated with the Ada mode."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4504
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4505 ;; All non-standard keys go into ada-mode-extra-map
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4506 (define-key ada-mode-map ada-mode-extra-prefix ada-mode-extra-map)
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4507
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4508 ;; Indentation and Formatting
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4509 (define-key ada-mode-map "\C-j" 'ada-indent-newline-indent-conditional)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4510 (define-key ada-mode-map "\C-m" 'ada-indent-newline-indent-conditional)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4511 (define-key ada-mode-map "\t" 'ada-tab)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4512 (define-key ada-mode-map "\C-c\t" 'ada-justified-indent-current)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4513 (define-key ada-mode-map "\C-c\C-l" 'ada-indent-region)
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
4514 (define-key ada-mode-map [(shift tab)] 'ada-untab)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4515 (define-key ada-mode-map "\C-c\C-f" 'ada-format-paramlist)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4516 ;; We don't want to make meta-characters case-specific.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4517
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4518 ;; Movement
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4519 (define-key ada-mode-map "\M-\C-e" 'ada-next-procedure)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4520 (define-key ada-mode-map "\M-\C-a" 'ada-previous-procedure)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4521 (define-key ada-mode-map "\C-c\C-a" 'ada-move-to-start)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4522 (define-key ada-mode-map "\C-c\C-e" 'ada-move-to-end)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4523
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4524 ;; Compilation
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4525 (unless (lookup-key ada-mode-map "\C-c\C-c")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4526 (define-key ada-mode-map "\C-c\C-c" 'compile))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4527
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4528 ;; Casing
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4529 (define-key ada-mode-map "\C-c\C-b" 'ada-adjust-case-buffer)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4530 (define-key ada-mode-map "\C-c\C-t" 'ada-case-read-exceptions)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4531 (define-key ada-mode-map "\C-c\C-y" 'ada-create-case-exception)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4532 (define-key ada-mode-map "\C-c\C-\M-y" 'ada-create-case-exception-substring)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4533
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4534 ;; On XEmacs, you can easily specify whether DEL should deletes
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4535 ;; one character forward or one character backward. Take this into
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4536 ;; account
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
4537 (define-key ada-mode-map
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
4538 (if (boundp 'delete-key-deletes-forward) [backspace] "\177")
78601
047d1fc93812 (ada-create-keymap): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78600
diff changeset
4539 'backward-delete-char-untabify)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4540
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4541 ;; Make body
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4542 (define-key ada-mode-map "\C-c\C-n" 'ada-make-subprogram-body)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4543
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4544 ;; Use predefined function of Emacs19 for comments (RE)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4545 (define-key ada-mode-map "\C-c;" 'comment-region)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4546 (define-key ada-mode-map "\C-c:" 'ada-uncomment-region)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4547
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4548 ;; The following keys are bound to functions defined in ada-xref.el or
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4549 ;; ada-prj,el., However, RMS rightly thinks that the code should be shared,
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4550 ;; and activated only if the right compiler is used
84917
e52cb6ef60ec (ada-save-exceptions-to-file): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 78601
diff changeset
4551
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
4552 (define-key ada-mode-map (if (featurep 'xemacs) '(shift button3) [S-mouse-3])
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
4553 'ada-point-and-xref)
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
4554 (define-key ada-mode-map [(control tab)] 'ada-complete-identifier)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4555
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4556 (define-key ada-mode-extra-map "o" 'ff-find-other-file)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4557 (define-key ada-mode-map "\C-c5\C-d" 'ada-goto-declaration-other-frame)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4558 (define-key ada-mode-map "\C-c\C-d" 'ada-goto-declaration)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4559 (define-key ada-mode-map "\C-c\C-s" 'ada-xref-goto-previous-reference)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4560 (define-key ada-mode-map "\C-c\C-c" 'ada-compile-application)
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4561 (define-key ada-mode-extra-map "c" 'ada-change-prj)
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4562 (define-key ada-mode-extra-map "d" 'ada-set-default-project-file)
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4563 (define-key ada-mode-extra-map "g" 'ada-gdb-application)
74002
5909c257c4ea (ada-mode-version): Bump version.
Juanma Barranquero <lekktu@gmail.com>
parents: 73935
diff changeset
4564 (define-key ada-mode-map "\C-c\C-m" 'ada-set-main-compile-application)
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4565 (define-key ada-mode-extra-map "r" 'ada-run-application)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4566 (define-key ada-mode-map "\C-c\C-o" 'ada-goto-parent)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4567 (define-key ada-mode-map "\C-c\C-r" 'ada-find-references)
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4568 (define-key ada-mode-extra-map "l" 'ada-find-local-references)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4569 (define-key ada-mode-map "\C-c\C-v" 'ada-check-current)
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4570 (define-key ada-mode-extra-map "f" 'ada-find-file)
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4571
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4572 (define-key ada-mode-extra-map "u" 'ada-prj-edit)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4573
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4574 ;; The templates, defined in ada-stmt.el
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4575
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4576 (let ((map (make-sparse-keymap)))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4577 (define-key map "h" 'ada-header)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4578 (define-key map "\C-a" 'ada-array)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4579 (define-key map "b" 'ada-exception-block)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4580 (define-key map "d" 'ada-declare-block)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4581 (define-key map "c" 'ada-case)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4582 (define-key map "\C-e" 'ada-elsif)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4583 (define-key map "e" 'ada-else)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4584 (define-key map "\C-k" 'ada-package-spec)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4585 (define-key map "k" 'ada-package-body)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4586 (define-key map "\C-p" 'ada-procedure-spec)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4587 (define-key map "p" 'ada-subprogram-body)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4588 (define-key map "\C-f" 'ada-function-spec)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4589 (define-key map "f" 'ada-for-loop)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4590 (define-key map "i" 'ada-if)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4591 (define-key map "l" 'ada-loop)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4592 (define-key map "\C-r" 'ada-record)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4593 (define-key map "\C-s" 'ada-subtype)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4594 (define-key map "S" 'ada-tabsize)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4595 (define-key map "\C-t" 'ada-task-spec)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4596 (define-key map "t" 'ada-task-body)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4597 (define-key map "\C-y" 'ada-type)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4598 (define-key map "\C-v" 'ada-private)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4599 (define-key map "u" 'ada-use)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4600 (define-key map "\C-u" 'ada-with)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4601 (define-key map "\C-w" 'ada-when)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4602 (define-key map "w" 'ada-while-loop)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4603 (define-key map "\C-x" 'ada-exception)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4604 (define-key map "x" 'ada-exit)
95268
bcc553c768f9 * textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94673
diff changeset
4605 (define-key ada-mode-extra-map "t" map))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4606 )
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4607
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4608
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4609 (defun ada-create-menu ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4610 "Create the Ada menu as shown in the menu bar."
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4611 (let ((m '("Ada"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4612 ("Help"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4613 ["Ada Mode" (info "ada-mode") t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4614 ["GNAT User's Guide" (info "gnat_ugn")
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4615 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4616 ["GNAT Reference Manual" (info "gnat_rm")
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4617 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4618 ["Gcc Documentation" (info "gcc")
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4619 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4620 ["Gdb Documentation" (info "gdb")
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4621 (eq ada-which-compiler 'gnat)]
73932
242a56e8b2c0 Replace conditional (require 'ispell) with defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 73922
diff changeset
4622 ["Ada95 Reference Manual" (info "arm95") t])
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4623 ("Options" :included (eq major-mode 'ada-mode)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4624 ["Auto Casing" (setq ada-auto-case (not ada-auto-case))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4625 :style toggle :selected ada-auto-case]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4626 ["Auto Indent After Return"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4627 (setq ada-indent-after-return (not ada-indent-after-return))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4628 :style toggle :selected ada-indent-after-return]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4629 ["Automatically Recompile For Cross-references"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4630 (setq ada-xref-create-ali (not ada-xref-create-ali))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4631 :style toggle :selected ada-xref-create-ali
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4632 :included (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4633 ["Confirm Commands"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4634 (setq ada-xref-confirm-compile (not ada-xref-confirm-compile))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4635 :style toggle :selected ada-xref-confirm-compile
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4636 :included (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4637 ["Show Cross-references In Other Buffer"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4638 (setq ada-xref-other-buffer (not ada-xref-other-buffer))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4639 :style toggle :selected ada-xref-other-buffer
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4640 :included (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4641 ["Tight Integration With GNU Visual Debugger"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4642 (setq ada-tight-gvd-integration (not ada-tight-gvd-integration))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4643 :style toggle :selected ada-tight-gvd-integration
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4644 :included (string-match "gvd" ada-prj-default-debugger)])
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4645 ["Customize" (customize-group 'ada)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4646 :included (fboundp 'customize-group)]
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4647 ["Check file" ada-check-current t]
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4648 ["Compile file" ada-compile-current t]
74002
5909c257c4ea (ada-mode-version): Bump version.
Juanma Barranquero <lekktu@gmail.com>
parents: 73935
diff changeset
4649 ["Set main and Build" ada-set-main-compile-application t]
5909c257c4ea (ada-mode-version): Bump version.
Juanma Barranquero <lekktu@gmail.com>
parents: 73935
diff changeset
4650 ["Show main" ada-show-current-main t]
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4651 ["Build" ada-compile-application t]
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4652 ["Run" ada-run-application t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4653 ["Debug" ada-gdb-application (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4654 ["------" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4655 ("Project"
74002
5909c257c4ea (ada-mode-version): Bump version.
Juanma Barranquero <lekktu@gmail.com>
parents: 73935
diff changeset
4656 ["Show project" ada-show-current-project t]
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4657 ["Load..." ada-set-default-project-file t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4658 ["New..." ada-prj-new t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4659 ["Edit..." ada-prj-edit t])
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4660 ("Goto" :included (eq major-mode 'ada-mode)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4661 ["Goto Declaration/Body" ada-goto-declaration
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4662 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4663 ["Goto Body" ada-goto-body
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4664 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4665 ["Goto Declaration Other Frame"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4666 ada-goto-declaration-other-frame
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4667 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4668 ["Goto Previous Reference" ada-xref-goto-previous-reference
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4669 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4670 ["List Local References" ada-find-local-references
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4671 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4672 ["List References" ada-find-references
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4673 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4674 ["Goto Reference To Any Entity" ada-find-any-references
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4675 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4676 ["Goto Parent Unit" ada-goto-parent
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4677 (eq ada-which-compiler 'gnat)]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4678 ["--" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4679 ["Next compilation error" next-error t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4680 ["Previous Package" ada-previous-package t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4681 ["Next Package" ada-next-package t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4682 ["Previous Procedure" ada-previous-procedure t]
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4683 ["Next Procedure" ada-next-procedure t]
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4684 ["Goto Start Of Statement" ada-move-to-start t]
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4685 ["Goto End Of Statement" ada-move-to-end t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4686 ["-" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4687 ["Other File" ff-find-other-file t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4688 ["Other File Other Window" ada-ff-other-window t])
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4689 ("Edit" :included (eq major-mode 'ada-mode)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4690 ["Search File On Source Path" ada-find-file t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4691 ["------" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4692 ["Complete Identifier" ada-complete-identifier t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4693 ["-----" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4694 ["Indent Line" ada-indent-current-function t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4695 ["Justify Current Indentation" ada-justified-indent-current t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4696 ["Indent Lines in Selection" ada-indent-region t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4697 ["Indent Lines in File"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4698 (ada-indent-region (point-min) (point-max)) t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4699 ["Format Parameter List" ada-format-paramlist t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4700 ["-" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4701 ["Comment Selection" comment-region t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4702 ["Uncomment Selection" ada-uncomment-region t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4703 ["--" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4704 ["Fill Comment Paragraph" fill-paragraph t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4705 ["Fill Comment Paragraph Justify"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4706 ada-fill-comment-paragraph-justify t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4707 ["Fill Comment Paragraph Postfix"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4708 ada-fill-comment-paragraph-postfix t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4709 ["---" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4710 ["Adjust Case Selection" ada-adjust-case-region t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4711 ["Adjust Case in File" ada-adjust-case-buffer t]
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4712 ["Create Case Exception" ada-create-case-exception t]
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4713 ["Create Case Exception Substring"
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4714 ada-create-case-exception-substring t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4715 ["Reload Case Exceptions" ada-case-read-exceptions t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4716 ["----" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4717 ["Make body for subprogram" ada-make-subprogram-body t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4718 ["-----" nil nil]
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4719 ["Narrow to subprogram" ada-narrow-to-defun t])
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4720 ("Templates"
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4721 :included (eq major-mode 'ada-mode)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4722 ["Header" ada-header t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4723 ["-" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4724 ["Package Body" ada-package-body t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4725 ["Package Spec" ada-package-spec t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4726 ["Function Spec" ada-function-spec t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4727 ["Procedure Spec" ada-procedure-spec t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4728 ["Proc/func Body" ada-subprogram-body t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4729 ["Task Body" ada-task-body t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4730 ["Task Spec" ada-task-spec t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4731 ["Declare Block" ada-declare-block t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4732 ["Exception Block" ada-exception-block t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4733 ["--" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4734 ["Entry" ada-entry t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4735 ["Entry family" ada-entry-family t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4736 ["Select" ada-select t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4737 ["Accept" ada-accept t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4738 ["Or accept" ada-or-accep t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4739 ["Or delay" ada-or-delay t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4740 ["Or terminate" ada-or-terminate t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4741 ["---" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4742 ["Type" ada-type t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4743 ["Private" ada-private t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4744 ["Subtype" ada-subtype t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4745 ["Record" ada-record t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4746 ["Array" ada-array t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4747 ["----" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4748 ["If" ada-if t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4749 ["Else" ada-else t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4750 ["Elsif" ada-elsif t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4751 ["Case" ada-case t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4752 ["-----" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4753 ["While Loop" ada-while-loop t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4754 ["For Loop" ada-for-loop t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4755 ["Loop" ada-loop t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4756 ["------" nil nil]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4757 ["Exception" ada-exception t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4758 ["Exit" ada-exit t]
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4759 ["When" ada-when t])
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4760 )))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
4761
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4762 (easy-menu-define ada-mode-menu ada-mode-map "Menu keymap for Ada mode" m)
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4763 (if (featurep 'xemacs)
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4764 (progn
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4765 (define-key ada-mode-map [menu-bar] ada-mode-menu)
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4766 (set 'mode-popup-menu (cons "Ada mode" ada-mode-menu))))))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4767
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4768
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4769 ;; -------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4770 ;; Commenting/Uncommenting code
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4771 ;; The following two calls are provided to enhance the standard
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4772 ;; comment-region function, which only allows uncommenting if the
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4773 ;; comment is at the beginning of a line. If the line have been re-indented,
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4774 ;; we are unable to use comment-region, which makes no sense.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4775 ;;
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4776 ;; In addition, we provide an interface to the standard comment handling
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4777 ;; function for justifying the comments.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4778 ;; -------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4779
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4780 (defadvice comment-region (before ada-uncomment-anywhere disable)
87566
0c4a74c24677 * progmodes/ada-xref.el (ada-prj-find-prj-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87401
diff changeset
4781 (if (and (consp arg) ;; a prefix with \C-u is of the form '(4), whereas
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4782 ;; \C-u 2 sets arg to '2' (fixed by S.Leake)
87566
0c4a74c24677 * progmodes/ada-xref.el (ada-prj-find-prj-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87401
diff changeset
4783 (derived-mode-p 'ada-mode))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4784 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4785 (let ((cs (concat "^[ \t]*" (regexp-quote comment-start))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4786 (goto-char beg)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4787 (while (re-search-forward cs end t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4788 (replace-match comment-start))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4789 ))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4790
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4791 (defun ada-uncomment-region (beg end &optional arg)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4792 "Uncomment region BEG .. END.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4793 ARG gives number of comment characters."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4794 (interactive "r\nP")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4795
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4796 ;; This advice is not needed anymore with Emacs21. However, for older
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4797 ;; versions, as well as for XEmacs, we still need to enable it.
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4798 (if (or (<= emacs-major-version 20) (featurep 'xemacs))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4799 (progn
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4800 (ad-activate 'comment-region)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4801 (comment-region beg end (- (or arg 2)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4802 (ad-deactivate 'comment-region))
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4803 (comment-region beg end (list (- (or arg 2))))
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4804 (ada-indent-region beg end)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4805
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4806 (defun ada-fill-comment-paragraph-justify ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4807 "Fill current comment paragraph and justify each line as well."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4808 (interactive)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4809 (ada-fill-comment-paragraph 'full))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4810
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4811 (defun ada-fill-comment-paragraph-postfix ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4812 "Fill current comment paragraph and justify each line as well.
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4813 Adds `ada-fill-comment-postfix' at the end of each line."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4814 (interactive)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4815 (ada-fill-comment-paragraph 'full t))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4816
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4817 (defun ada-fill-comment-paragraph (&optional justify postfix)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4818 "Fill the current comment paragraph.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4819 If JUSTIFY is non-nil, each line is justified as well.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4820 If POSTFIX and JUSTIFY are non-nil, `ada-fill-comment-postfix' is appended
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4821 to each line filled and justified.
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4822 The paragraph is indented on the first line."
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4823 (interactive "P")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4824
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4825 ;; check if inside comment or just in front a comment
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4826 (if (and (not (ada-in-comment-p))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4827 (not (looking-at "[ \t]*--")))
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4828 (error "Not inside comment"))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4829
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4830 (let* (indent from to
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4831 (opos (point-marker))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4832
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4833 ;; Sets this variable to nil, otherwise it prevents
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4834 ;; fill-region-as-paragraph to work on Emacs <= 20.2
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4835 (parse-sexp-lookup-properties nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4836
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4837 fill-prefix
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4838 (fill-column (current-fill-column)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4839
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4840 ;; Find end of paragraph
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4841 (back-to-indentation)
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4842 (while (and (not (eobp)) (looking-at ".*--[ \t]*[^ \t\n]"))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4843 (forward-line 1)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4844
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4845 ;; If we were at the last line in the buffer, create a dummy empty
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4846 ;; line at the end of the buffer.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4847 (if (eobp)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4848 (insert "\n")
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4849 (back-to-indentation)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4850 (beginning-of-line)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4851 (setq to (point-marker))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4852 (goto-char opos)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4853
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4854 ;; Find beginning of paragraph
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4855 (back-to-indentation)
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4856 (while (and (not (bobp)) (looking-at ".*--[ \t]*[^ \t\n]"))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4857 (forward-line -1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4858 (back-to-indentation))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4859
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
4860 ;; We want one line above the first one, unless we are at the beginning
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4861 ;; of the buffer
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4862 (unless (bobp)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4863 (forward-line 1))
41036
aaa6f44a1b96 (ada-fill-comment-prefix): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 41012
diff changeset
4864 (beginning-of-line)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4865 (setq from (point-marker))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4866
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4867 ;; Calculate the indentation we will need for the paragraph
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4868 (back-to-indentation)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4869 (setq indent (current-column))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4870 ;; unindent the first line of the paragraph
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4871 (delete-region from (point))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4872
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4873 ;; Remove the old postfixes
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4874 (goto-char from)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4875 (while (re-search-forward "--\n" to t)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4876 (replace-match "\n"))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4877
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4878 (goto-char (1- to))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4879 (setq to (point-marker))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4880
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4881 ;; Indent and justify the paragraph
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4882 (setq fill-prefix ada-fill-comment-prefix)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4883 (set-left-margin from to indent)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4884 (if postfix
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4885 (setq fill-column (- fill-column (length ada-fill-comment-postfix))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4886
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4887 (fill-region-as-paragraph from to justify)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4888
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4889 ;; Add the postfixes if required
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4890 (if postfix
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4891 (save-restriction
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4892 (goto-char from)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4893 (narrow-to-region from to)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4894 (while (not (eobp))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4895 (end-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4896 (insert-char ? (- fill-column (current-column)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4897 (insert ada-fill-comment-postfix)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4898 (forward-line))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4899 ))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4900
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4901 ;; In Emacs <= 20.2 and XEmacs <=20.4, there is a bug, and a newline is
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4902 ;; inserted at the end. Delete it
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4903 (if (or (featurep 'xemacs)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4904 (<= emacs-major-version 19)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4905 (and (= emacs-major-version 20)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4906 (<= emacs-minor-version 2)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4907 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4908 (goto-char to)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4909 (end-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4910 (delete-char 1)))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4911
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4912 (goto-char opos)))
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4913
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4914
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4915 ;; ---------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4916 ;; support for find-file.el
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4917 ;; These functions are used by find-file to guess the file names from
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4918 ;; unit names, and to find the other file (spec or body) from the current
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4919 ;; file (body or spec).
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4920 ;; It is also used to find in which function we are, so as to put the
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4921 ;; cursor at the correct position.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4922 ;; Standard Ada does not force any relation between unit names and file names,
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4923 ;; so some of these functions can only be a good approximation. However, they
79854
d979323205c7 Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 79717
diff changeset
4924 ;; are also overridden in `ada-xref'.el when we know that the user is using
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4925 ;; GNAT.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4926 ;; ---------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4927
79854
d979323205c7 Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 79717
diff changeset
4928 ;; Overridden when we work with GNAT, to use gnatkrunch
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4929 (defun ada-make-filename-from-adaname (adaname)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4930 "Determine the filename in which ADANAME is found.
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4931 This matches the GNAT default naming convention, except for
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
4932 pre-defined units."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4933 (while (string-match "\\." adaname)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4934 (setq adaname (replace-match "-" t t adaname)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4935 (downcase adaname)
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4936 )
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4937
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
4938 (defun ada-other-file-name ()
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4939 "Return the name of the other file.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4940 The name returned is the body if `current-buffer' is the spec,
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
4941 or the spec otherwise."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4942
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4943 (let ((is-spec nil)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4944 (is-body nil)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4945 (suffixes ada-spec-suffixes)
73434
3586ad4a01a1 (ada-in-string-p): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73422
diff changeset
4946 (name (buffer-file-name)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4947
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4948 ;; Guess whether we have a spec or a body, and get the basename of the
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4949 ;; file. Since the extension may not start with '.', we can not use
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4950 ;; file-name-extension
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4951 (while (and (not is-spec)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4952 suffixes)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4953 (if (string-match (concat "\\(.*\\)" (car suffixes) "$") name)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4954 (setq is-spec t
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4955 name (match-string 1 name)))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4956 (setq suffixes (cdr suffixes)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4957
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4958 (if (not is-spec)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4959 (progn
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4960 (setq suffixes ada-body-suffixes)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4961 (while (and (not is-body)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4962 suffixes)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4963 (if (string-match (concat "\\(.*\\)" (car suffixes) "$") name)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4964 (setq is-body t
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4965 name (match-string 1 name)))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4966 (setq suffixes (cdr suffixes)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
4967
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4968 ;; If this wasn't in either list, return name itself
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4969 (if (not (or is-spec is-body))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4970 name
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33716
diff changeset
4971
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4972 ;; Else find the other possible names
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4973 (if is-spec
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4974 (setq suffixes ada-body-suffixes)
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4975 (setq suffixes ada-spec-suffixes))
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4976 (setq is-spec name)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4977
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4978 (while suffixes
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4979
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4980 ;; If we are using project file, search for the other file in all
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4981 ;; the possible src directories.
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
4982
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
4983 (if (fboundp 'ada-find-src-file-in-dir)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4984 (let ((other
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4985 (ada-find-src-file-in-dir
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4986 (file-name-nondirectory (concat name (car suffixes))))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4987 (if other
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4988 (set 'is-spec other)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4989
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4990 ;; Else search in the current directory
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4991 (if (file-exists-p (concat name (car suffixes)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
4992 (setq is-spec (concat name (car suffixes)))))
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
4993 (setq suffixes (cdr suffixes)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4994
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
4995 is-spec)))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
4996
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
4997 (defun ada-which-function-are-we-in ()
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
4998 "Return the name of the function whose definition/declaration point is in.
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
4999 Used in `ff-pre-load-hook'."
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
5000 (setq ff-function-name nil)
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5001 (save-excursion
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5002 (end-of-line);; make sure we get the complete name
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5003 (or (if (re-search-backward ada-procedure-start-regexp nil t)
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5004 (setq ff-function-name (match-string 5)))
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5005 (if (re-search-backward ada-package-start-regexp nil t)
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5006 (setq ff-function-name (match-string 4))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5007 ))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5008
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5009
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5010 (defvar ada-last-which-function-line -1
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
5011 "Last line on which `ada-which-function' was called.")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5012 (defvar ada-last-which-function-subprog 0
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5013 "Last subprogram name returned by `ada-which-function'.")
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5014 (make-variable-buffer-local 'ada-last-which-function-subprog)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5015 (make-variable-buffer-local 'ada-last-which-function-line)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5016
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5017
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5018 (defun ada-which-function ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5019 "Return the name of the function whose body the point is in.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5020 This function works even in the case of nested subprograms, whereas the
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
5021 standard Emacs function `which-function' does not.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5022 Since the search can be long, the results are cached."
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5023
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
5024 (let ((line (count-lines 1 (point)))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5025 (pos (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5026 end-pos
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5027 func-name indent
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5028 found)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5029
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5030 ;; If this is the same line as before, simply return the same result
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5031 (if (= line ada-last-which-function-line)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5032 ada-last-which-function-subprog
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5033
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5034 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5035 ;; In case the current line is also the beginning of the body
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5036 (end-of-line)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5037
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5038 ;; Are we looking at "function Foo\n (paramlist)"
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5039 (skip-chars-forward " \t\n(")
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
5040
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5041 (condition-case nil
45931
a4c8d672ccbe * progmodes/ada-mode.el: Update copyright notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44933
diff changeset
5042 (up-list 1)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5043 (error nil))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5044
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5045 (skip-chars-forward " \t\n")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5046 (if (looking-at "return")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5047 (progn
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5048 (forward-word 1)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5049 (skip-chars-forward " \t\n")
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5050 (skip-chars-forward "a-zA-Z0-9_'")))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
5051
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5052 ;; Can't simply do forward-word, in case the "is" is not on the
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5053 ;; same line as the closing parenthesis
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5054 (skip-chars-forward "is \t\n")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5055
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5056 ;; No look for the closest subprogram body that has not ended yet.
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5057 ;; Not that we expect all the bodies to be finished by "end <name>",
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5058 ;; or a simple "end;" indented in the same column as the start of
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5059 ;; the subprogram. The goal is to be as efficient as possible.
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5060
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5061 (while (and (not found)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5062 (re-search-backward ada-imenu-subprogram-menu-re nil t))
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5063
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5064 ;; Get the function name, but not the properties, or this changes
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5065 ;; the face in the modeline on Emacs 21
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5066 (setq func-name (match-string-no-properties 2))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5067 (if (and (not (ada-in-comment-p))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5068 (not (save-excursion
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5069 (goto-char (match-end 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5070 (looking-at "[ \t\n]*new"))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5071 (save-excursion
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5072 (back-to-indentation)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5073 (setq indent (current-column))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5074 (if (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5075 (concat "end[ \t]+" func-name "[ \t]*;\\|^"
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5076 (make-string indent ? ) "end;"))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5077 (setq end-pos (point))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5078 (setq end-pos (point-max)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5079 (if (>= end-pos pos)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5080 (setq found func-name))))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5081 )
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5082 (setq ada-last-which-function-line line
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5083 ada-last-which-function-subprog found)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5084 found))))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5085
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5086 (defun ada-ff-other-window ()
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5087 "Find other file in other window using `ff-find-other-file'."
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5088 (interactive)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5089 (and (fboundp 'ff-find-other-file)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5090 (ff-find-other-file t)))
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5091
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5092 (defun ada-set-point-accordingly ()
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5093 "Move to the function declaration that was set by `ff-which-function-are-we-in'."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5094 (if ff-function-name
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5095 (progn
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5096 (goto-char (point-min))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5097 (unless (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5098 (concat ff-function-name "\\b") nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5099 (goto-char (point-min))))))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5100
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5101 (defun ada-get-body-name (&optional spec-name)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5102 "Return the file name for the body of SPEC-NAME.
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5103 If SPEC-NAME is nil, return the body for the current package.
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
5104 Return nil if no body was found."
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5105 (interactive)
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5106
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
5107 (unless spec-name (setq spec-name (buffer-file-name)))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5108
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5109 ;; Remove the spec extension. We can not simply remove the file extension,
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5110 ;; but we need to take into account the specific non-GNAT extensions that the
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5111 ;; user might have specified.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5112
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5113 (let ((suffixes ada-spec-suffixes)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5114 end)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5115 (while suffixes
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5116 (setq end (- (length spec-name) (length (car suffixes))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5117 (if (string-equal (car suffixes) (substring spec-name end))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5118 (setq spec-name (substring spec-name 0 end)))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5119 (setq suffixes (cdr suffixes))))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5120
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5121 ;; If find-file.el was available, use its functions
50812
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
5122 (if (fboundp 'ff-get-file-name)
15929fed5553 (ada-xemacs): Variable removed, since it's better to use (featurep 'xemacs).
Juanma Barranquero <lekktu@gmail.com>
parents: 50736
diff changeset
5123 (ff-get-file-name ada-search-directories-internal
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5124 (ada-make-filename-from-adaname
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5125 (file-name-nondirectory
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5126 (file-name-sans-extension spec-name)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5127 ada-body-suffixes)
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5128 ;; Else emulate it very simply
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5129 (concat (ada-make-filename-from-adaname
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5130 (file-name-nondirectory
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5131 (file-name-sans-extension spec-name)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5132 ".adb")))
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5133
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5134
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5135 ;; ---------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5136 ;; support for font-lock.el
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5137 ;; Strings are a real pain in Ada because a single quote character is
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5138 ;; overloaded as a string quote and type/instance delimiter. By default, a
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5139 ;; single quote is given punctuation syntax in `ada-mode-syntax-table'.
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5140 ;; So, for Font Lock mode purposes, we mark single quotes as having string
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5141 ;; syntax when the gods that created Ada determine them to be.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5142 ;;
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5143 ;; This only works in Emacs. See the comments before the grammar functions
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5144 ;; at the beginning of this file for how this is done with XEmacs.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5145 ;; ----------------------------------------------------
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5146
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5147 (defconst ada-font-lock-syntactic-keywords
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5148 ;; Mark single quotes as having string quote syntax in 'c' instances.
80134
b0f27575dc50 (ada-font-lock-syntactic-keywords):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79854
diff changeset
5149 ;; We used to explicitly avoid ''' as a special case for fear the buffer
b0f27575dc50 (ada-font-lock-syntactic-keywords):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79854
diff changeset
5150 ;; be highlighted as a string, but it seems this fear is unfounded.
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5151 ;;
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5152 ;; This sets the properties of the characters, so that ada-in-string-p
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5153 ;; correctly handles '"' too...
80134
b0f27575dc50 (ada-font-lock-syntactic-keywords):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79854
diff changeset
5154 '(("[^a-zA-Z0-9)]\\('\\)[^\n]\\('\\)" (1 (7 . ?')) (2 (7 . ?')))
78589
56d6a084bbb6 (ada-create-syntax-table): Move
Martin Rudalics <rudalics@gmx.at>
parents: 78234
diff changeset
5155 ("^[ \t]*\\(#\\(if\\|else\\|elsif\\|end\\)\\)" (1 (11 . ?\n)))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5156
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5157 (defvar ada-font-lock-keywords
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5158 (eval-when-compile
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5159 (list
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5160 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5161 ;; handle "type T is access function return S;"
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5162 (list "\\<\\(function[ \t]+return\\)\\>" '(1 font-lock-keyword-face) )
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5163
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5164 ;; preprocessor line
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5165 (list "^[ \t]*\\(#.*\n\\)" '(1 font-lock-type-face t))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5166
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5167 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5168 ;; accept, entry, function, package (body), protected (body|type),
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5169 ;; pragma, procedure, task (body) plus name.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5170 (list (concat
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5171 "\\<\\("
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5172 "accept\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5173 "entry\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5174 "function\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5175 "package[ \t]+body\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5176 "package\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5177 "pragma\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5178 "procedure\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5179 "protected[ \t]+body\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5180 "protected[ \t]+type\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5181 "protected\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5182 "task[ \t]+body\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5183 "task[ \t]+type\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5184 "task"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5185 "\\)\\>[ \t]*"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5186 "\\(\\sw+\\(\\.\\sw*\\)*\\)?")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5187 '(1 font-lock-keyword-face) '(2 font-lock-function-name-face nil t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5188 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5189 ;; Optional keywords followed by a type name.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5190 (list (concat ; ":[ \t]*"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5191 "\\<\\(access[ \t]+all\\|access[ \t]+constant\\|access\\|constant\\|in[ \t]+reverse\\|\\|in[ \t]+out\\|in\\|out\\)\\>"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5192 "[ \t]*"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5193 "\\(\\sw+\\(\\.\\sw*\\)*\\)?")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5194 '(1 font-lock-keyword-face nil t) '(2 font-lock-type-face nil t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5195
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5196 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5197 ;; Main keywords, except those treated specially below.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5198 (concat "\\<"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5199 (regexp-opt
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5200 '("abort" "abs" "abstract" "accept" "access" "aliased" "all"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5201 "and" "array" "at" "begin" "case" "declare" "delay" "delta"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5202 "digits" "do" "else" "elsif" "entry" "exception" "exit" "for"
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5203 "generic" "if" "in" "interface" "is" "limited" "loop" "mod" "not"
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5204 "null" "or" "others" "overriding" "private" "protected" "raise"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5205 "range" "record" "rem" "renames" "requeue" "return" "reverse"
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5206 "select" "separate" "synchronized" "tagged" "task" "terminate"
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5207 "then" "until" "when" "while" "with" "xor") t)
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5208 "\\>")
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5209 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5210 ;; Anything following end and not already fontified is a body name.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5211 '("\\<\\(end\\)\\>\\([ \t]+\\)?\\(\\(\\sw\\|[_.]\\)+\\)?"
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5212 (1 font-lock-keyword-face) (3 font-lock-function-name-face nil t))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5213 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5214 ;; Keywords followed by a type or function name.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5215 (list (concat "\\<\\("
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5216 "new\\|of\\|subtype\\|type"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5217 "\\)\\>[ \t]*\\(\\sw+\\(\\.\\sw*\\)*\\)?[ \t]*\\((\\)?")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5218 '(1 font-lock-keyword-face)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5219 '(2 (if (match-beginning 4)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5220 font-lock-function-name-face
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5221 font-lock-type-face) nil t))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5222 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5223 ;; Keywords followed by a (comma separated list of) reference.
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5224 ;; Note that font-lock only works on single lines, thus we can not
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5225 ;; correctly highlight a with_clause that spans multiple lines.
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5226 (list (concat "\\<\\(goto\\|raise\\|use\\|with\\)"
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5227 "[ \t]+\\([a-zA-Z0-9_., \t]+\\)\\W")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5228 '(1 font-lock-keyword-face) '(2 font-lock-reference-face nil t))
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5229
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5230 ;;
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5231 ;; Goto tags.
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5232 '("<<\\(\\sw+\\)>>" 1 font-lock-reference-face)
44465
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5233
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5234 ;; Highlight based-numbers (R. Reagan <robin-reply@reagans.org>)
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5235 (list "\\([0-9]+#[0-9a-fA-F_]+#\\)" '(1 font-lock-constant-face t))
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5236
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5237 ;; Ada unnamed numerical constants
0a0f75d152df (ada-case-exception-file, ada-indent-handle-comment-special): New variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42619
diff changeset
5238 (list "\\W\\([-+]?[0-9._]+\\)\\>" '(1 font-lock-constant-face))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 45931
diff changeset
5239
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5240 ))
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5241 "Default expressions to highlight in Ada mode.")
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5242
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5243
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5244 ;; ---------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5245 ;; Support for outline.el
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5246 ;; ---------------------------------------------------------
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5247
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5248 (defun ada-outline-level ()
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5249 "This is so that `current-column' DTRT in otherwise-hidden text."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5250 ;; patch from Dave Love <fx@gnu.org>
24446
25556de3fe49 (ada-outline-level): Bind buffer-invisibility-spec.
Dave Love <fx@gnu.org>
parents: 24325
diff changeset
5251 (let (buffer-invisibility-spec)
25556de3fe49 (ada-outline-level): Bind buffer-invisibility-spec.
Dave Love <fx@gnu.org>
parents: 24325
diff changeset
5252 (save-excursion
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5253 (back-to-indentation)
24446
25556de3fe49 (ada-outline-level): Bind buffer-invisibility-spec.
Dave Love <fx@gnu.org>
parents: 24325
diff changeset
5254 (current-column))))
17914
e5e2ef0dd5ab (ada-krunch-args): Use gnatkr instead of gnatk8.
Richard M. Stallman <rms@gnu.org>
parents: 14415
diff changeset
5255
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5256 ;; ---------------------------------------------------------
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5257 ;; Support for narrow-to-region
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5258 ;; ---------------------------------------------------------
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5259
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5260 (defun ada-narrow-to-defun (&optional arg)
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5261 "Make text outside current subprogram invisible.
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5262 The subprogram visible is the one that contains or follow point.
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5263 Optional ARG is ignored.
73422
e1bac685e6a0 (ada-83-string-keywords, ada-last-which-function-line ada-no-auto-case,
Juanma Barranquero <lekktu@gmail.com>
parents: 71924
diff changeset
5264 Use \\[widen] to go back to the full visibility for the buffer."
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5265
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5266 (interactive)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5267 (save-excursion
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5268 (let (end)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5269 (widen)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5270 (forward-line 1)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5271 (ada-previous-procedure)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5272
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5273 (save-excursion
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5274 (beginning-of-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5275 (setq end (point)))
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5276
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5277 (ada-move-to-end)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5278 (end-of-line)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5279 (narrow-to-region end (point))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5280 (message
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5281 "Use M-x widen to get back to full visibility in the buffer"))))
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5282
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5283 ;; ---------------------------------------------------------
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5284 ;; Automatic generation of code
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
5285 ;; The Ada mode has a set of function to automatically generate a subprogram
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5286 ;; or package body from its spec.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5287 ;; These function only use a primary and basic algorithm, this could use a
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5288 ;; lot of improvement.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5289 ;; When the user is using GNAT, we rather use gnatstub to generate an accurate
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5290 ;; body.
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5291 ;; ----------------------------------------------------------
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5292
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5293 (defun ada-gen-treat-proc (match)
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5294 "Make dummy body of a procedure/function specification.
63528
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5295 MATCH is a cons cell containing the start and end locations of the last search
d6d50a511d12 (ada-format-paramlist)
Juanma Barranquero <lekktu@gmail.com>
parents: 63425
diff changeset
5296 for `ada-procedure-start-regexp'."
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5297 (goto-char (car match))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5298 (let (func-found procname functype)
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5299 (cond
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5300 ((or (looking-at "^[ \t]*procedure")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5301 (setq func-found (looking-at "^[ \t]*function")))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5302 ;; treat it as a proc/func
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5303 (forward-word 2)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5304 (forward-word -1)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
5305 (setq procname (buffer-substring (point) (cdr match))) ; store proc name
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5306
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5307 ;; goto end of procname
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5308 (goto-char (cdr match))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5309
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5310 ;; skip over parameterlist
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5311 (unless (looking-at "[ \t\n]*\\(;\\|return\\)")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5312 (forward-sexp))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5313
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5314 ;; if function, skip over 'return' and result type.
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5315 (if func-found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5316 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5317 (forward-word 1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5318 (skip-chars-forward " \t\n")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5319 (setq functype (buffer-substring (point)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5320 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5321 (skip-chars-forward
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5322 "a-zA-Z0-9_\.")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5323 (point))))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5324 ;; look for next non WS
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5325 (cond
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5326 ((looking-at "[ \t]*;")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5327 (delete-region (match-beginning 0) (match-end 0));; delete the ';'
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5328 (ada-indent-newline-indent)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5329 (insert "is")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5330 (ada-indent-newline-indent)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5331 (if func-found
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5332 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5333 (insert "Result : " functype ";")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5334 (ada-indent-newline-indent)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5335 (insert "begin")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5336 (ada-indent-newline-indent)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5337 (if func-found
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5338 (insert "return Result;")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5339 (insert "null;"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5340 (ada-indent-newline-indent)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5341 (insert "end " procname ";")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5342 (ada-indent-newline-indent)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5343 )
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5344
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5345 ((looking-at "[ \t\n]*is")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5346 ;; do nothing
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5347 )
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5348
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5349 ((looking-at "[ \t\n]*rename")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5350 ;; do nothing
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5351 )
97058
b6ac850e9d2b Fix bug #272, and update Ada mode to version 4.0.
Juanma Barranquero <lekktu@gmail.com>
parents: 95268
diff changeset
5352
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5353 (t
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5354 (message "unknown syntax"))))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5355 (t
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5356 (if (looking-at "^[ \t]*task")
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5357 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5358 (message "Task conversion is not yet implemented")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5359 (forward-word 2)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5360 (if (looking-at "[ \t]*;")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5361 (forward-line)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5362 (ada-move-to-end))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5363 ))))))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5364
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5365 (defun ada-make-body ()
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5366 "Create an Ada package body in the current buffer.
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5367 The spec must be the previously visited buffer.
74073
ef8cf7255613 (ada-make-body): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 74002
diff changeset
5368 This function typically is to be hooked into `ff-file-created-hook'."
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5369 (delete-region (point-min) (point-max))
64434
0eca480a23a7 (ada-make-body): Use `insert-buffer-substring' and `goto-char', not `insert-buffer'.
Juanma Barranquero <lekktu@gmail.com>
parents: 64085
diff changeset
5370 (insert-buffer-substring (car (cdr (buffer-list))))
0eca480a23a7 (ada-make-body): Use `insert-buffer-substring' and `goto-char', not `insert-buffer'.
Juanma Barranquero <lekktu@gmail.com>
parents: 64085
diff changeset
5371 (goto-char (point-min))
12039
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5372 (ada-mode)
a75524689022 (initial comments): Copyright 1995; don't speak
Karl Heuer <kwzh@gnu.org>
parents: 11869
diff changeset
5373
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5374 (let (found ada-procedure-or-package-start-regexp)
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
5375 (if (setq found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5376 (ada-search-ignore-string-comment ada-package-start-regexp nil))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5377 (progn (goto-char (cdr found))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5378 (insert " body")
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5379 )
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5380 (error "No package"))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5381
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
5382 (setq ada-procedure-or-package-start-regexp
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5383 (concat ada-procedure-start-regexp
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5384 "\\|"
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5385 ada-package-start-regexp))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5386
33716
c55ff055c68a (ada-mode): `set '' -> `setq'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32300
diff changeset
5387 (while (setq found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5388 (ada-search-ignore-string-comment
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5389 ada-procedure-or-package-start-regexp nil))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5390 (progn
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5391 (goto-char (car found))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5392 (if (looking-at ada-package-start-regexp)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5393 (progn (goto-char (cdr found))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5394 (insert " body"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5395 (ada-gen-treat-proc found))))))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5396
30411
41f228350eca Got rid of all byte-compiler warnings on Emacs Load
Gerd Moellmann <gerd@gnu.org>
parents: 28995
diff changeset
5397
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5398 (defun ada-make-subprogram-body ()
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5399 "Create a dummy subprogram body in package body file from spec surrounding point."
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5400 (interactive)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5401 (let* ((found (re-search-backward ada-procedure-start-regexp nil t))
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5402 (spec (match-beginning 0))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5403 body-file)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5404 (if found
73531
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5405 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5406 (goto-char spec)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5407 (if (and (re-search-forward "(\\|;" nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5408 (= (char-before) ?\())
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5409 (progn
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5410 (ada-search-ignore-string-comment ")" nil)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5411 (ada-search-ignore-string-comment ";" nil)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5412 (setq spec (buffer-substring spec (point)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5413
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5414 ;; If find-file.el was available, use its functions
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5415 (setq body-file (ada-get-body-name))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5416 (if body-file
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5417 (find-file body-file)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5418 (error "No body found for the package. Create it first"))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5419
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5420 (save-restriction
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5421 (widen)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5422 (goto-char (point-max))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5423 (forward-comment -10000)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5424 (re-search-backward "\\<end\\>" nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5425 ;; Move to the beginning of the elaboration part, if any
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5426 (re-search-backward "^begin" nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5427 (newline)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5428 (forward-char -1)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5429 (insert spec)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5430 (re-search-backward ada-procedure-start-regexp nil t)
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5431 (ada-gen-treat-proc (cons (match-beginning 0) (match-end 0)))
7e876e4226ed Change maintainer, apply whitespace-clean, checkdoc. Minor improvements to many
Juanma Barranquero <lekktu@gmail.com>
parents: 73434
diff changeset
5432 ))
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5433 (error "Not in subprogram spec"))))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5434
26225
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5435 ;; --------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5436 ;; Global initializations
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5437 ;; --------------------------------------------------------
91cb7b3bae3c Changed format of years in copyright notice.
Gerd Moellmann <gerd@gnu.org>
parents: 25903
diff changeset
5438
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5439 ;; Create the keymap once and for all. If we do that in ada-mode,
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5440 ;; the keys changed in the user's .emacs have to be modified
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5441 ;; every time
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5442 (ada-create-keymap)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5443 (ada-create-menu)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5444
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5445 ;; Create the syntax tables, but do not activate them
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5446 (ada-create-syntax-table)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5447
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5448 ;; Add the default extensions (and set up speedbar)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5449 (ada-add-extensions ".ads" ".adb")
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5450 ;; This two files are generated by GNAT when running with -gnatD
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5451 (if (equal ada-which-compiler 'gnat)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5452 (ada-add-extensions ".ads.dg" ".adb.dg"))
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5453
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5454 ;; Read the special cases for exceptions
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5455 (ada-case-read-exceptions)
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5456
71537
2a4ed80e93ba (ada-which-compiler, ada-mode-menu, ada-compile-mouse-goto-error,
Juanma Barranquero <lekktu@gmail.com>
parents: 68764
diff changeset
5457 ;; Setup auto-loading of the other Ada mode files.
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5458 (autoload 'ada-change-prj "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5459 (autoload 'ada-check-current "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5460 (autoload 'ada-compile-application "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5461 (autoload 'ada-compile-current "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5462 (autoload 'ada-complete-identifier "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5463 (autoload 'ada-find-file "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5464 (autoload 'ada-find-any-references "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5465 (autoload 'ada-find-src-file-in-dir "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5466 (autoload 'ada-find-local-references "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5467 (autoload 'ada-find-references "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5468 (autoload 'ada-gdb-application "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5469 (autoload 'ada-goto-declaration "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5470 (autoload 'ada-goto-declaration-other-frame "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5471 (autoload 'ada-goto-parent "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5472 (autoload 'ada-make-body-gnatstub "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5473 (autoload 'ada-point-and-xref "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5474 (autoload 'ada-reread-prj-file "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5475 (autoload 'ada-run-application "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5476 (autoload 'ada-set-default-project-file "ada-xref" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5477 (autoload 'ada-xref-goto-previous-reference "ada-xref" nil t)
74002
5909c257c4ea (ada-mode-version): Bump version.
Juanma Barranquero <lekktu@gmail.com>
parents: 73935
diff changeset
5478 (autoload 'ada-set-main-compile-application "ada-xref" nil t)
5909c257c4ea (ada-mode-version): Bump version.
Juanma Barranquero <lekktu@gmail.com>
parents: 73935
diff changeset
5479 (autoload 'ada-show-current-main "ada-xref" nil t)
73922
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5480
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5481 (autoload 'ada-customize "ada-prj" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5482 (autoload 'ada-prj-edit "ada-prj" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5483 (autoload 'ada-prj-new "ada-prj" nil t)
289cedd46cd8 Delete `eval-and-compile' around `require'.
Juanma Barranquero <lekktu@gmail.com>
parents: 73531
diff changeset
5484 (autoload 'ada-prj-save "ada-prj" nil t)
50736
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5485
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5486 (autoload 'ada-array "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5487 (autoload 'ada-case "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5488 (autoload 'ada-declare-block "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5489 (autoload 'ada-else "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5490 (autoload 'ada-elsif "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5491 (autoload 'ada-exception "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5492 (autoload 'ada-exception-block "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5493 (autoload 'ada-exit "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5494 (autoload 'ada-for-loop "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5495 (autoload 'ada-function-spec "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5496 (autoload 'ada-header "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5497 (autoload 'ada-if "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5498 (autoload 'ada-loop "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5499 (autoload 'ada-package-body "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5500 (autoload 'ada-package-spec "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5501 (autoload 'ada-private "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5502 (autoload 'ada-procedure-spec "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5503 (autoload 'ada-record "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5504 (autoload 'ada-subprogram-body "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5505 (autoload 'ada-subtype "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5506 (autoload 'ada-tabsize "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5507 (autoload 'ada-task-body "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5508 (autoload 'ada-task-spec "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5509 (autoload 'ada-type "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5510 (autoload 'ada-use "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5511 (autoload 'ada-when "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5512 (autoload 'ada-while-loop "ada-stmt" nil t)
b0ce71ab9c28 (ada-search-directories): Take into account ADA_INCLUDE_PATH for better
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
5513 (autoload 'ada-with "ada-stmt" nil t)
25903
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5514
812005e9c20e (ada-get-indent-*, ada-indent-current, ada-goto-*,
Gerd Moellmann <gerd@gnu.org>
parents: 25420
diff changeset
5515 ;;; provide ourselves
10705
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5516 (provide 'ada-mode)
3d356714b662 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5517
78600
4f60c94dc647 Fix up comment style in header.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78589
diff changeset
5518 ;; arch-tag: 1b7d45ec-1698-43b5-8d4a-e479ea023270
10707
4a2ea4f52ea0 Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents: 10705
diff changeset
5519 ;;; ada-mode.el ends here