Mercurial > emacs
annotate lisp/progmodes/pascal.el @ 111997:a5a188ddc758
Minor clean up to silence some gcc warnings.
* src/window.c (Fset_window_buffer):
* src/xterm.c (x_set_frame_alpha): Restructure code to silence
compiler warning.
(handle_one_xevent): Remove unused var `p'.
(do_ewmh_fullscreen): Remove unused var `lval'.
(xembed_set_info): Remove unused var `atom'.
* src/textprop.c (Fremove_list_of_text_properties): Add braces to silence
compiler warning.
* src/fontset.c (fontset_id_valid_p, dump_fontset):
* src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration.
* src/eval.c (Feval, Ffuncall): Avoid unneeded gotos.
* src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause'
label only when it's used.
* src/image.c (x_create_bitmap_from_xpm_data):
* src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like
its callers.
* src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and
`consumed_chars'.
(DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'.
(decode_coding_emacs_mule): Remove unused label `retry'.
(detect_eol): Add parens to silence compiler warning.
* src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where
it's used to silence the compiler.
(make_number): Modernize k&r declaration.
(mark_char_table): Add parens to silence compiler warning.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sun, 19 Dec 2010 00:43:42 -0500 |
parents | 810cef5c0eee |
children | 417b1e4d63cd |
rev | line source |
---|---|
13337 | 1 ;;; pascal.el --- major mode for editing pascal source in Emacs |
4934 | 2 |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
3 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
4 ;; 2002 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
5 ;; Free Software Foundation, Inc. |
4934 | 6 |
28976
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
7 ;; Author: Espen Skoglund <esk@gnu.org> |
13337 | 8 ;; Keywords: languages |
4934 | 9 |
13337 | 10 ;; This file is part of GNU Emacs. |
4934 | 11 |
94673
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87941
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
13337 | 13 ;; 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:
87941
diff
changeset
|
14 ;; 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:
87941
diff
changeset
|
15 ;; (at your option) any later version. |
4934 | 16 |
14183 | 17 ;; GNU Emacs is distributed in the hope that it will be useful, |
13337 | 18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
4934 | 21 |
13337 | 22 ;; 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:
87941
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
4934 | 24 |
25 ;;; Commentary: | |
26 | |
14169 | 27 ;; USAGE |
28 ;; ===== | |
5723 | 29 |
14169 | 30 ;; Emacs should enter Pascal mode when you find a Pascal source file. |
31 ;; When you have entered Pascal mode, you may get more info by pressing | |
32 ;; C-h m. You may also get online help describing various functions by: | |
33 ;; C-h f <Name of function you want described> | |
5723 | 34 |
14169 | 35 ;; If you want to customize Pascal mode to fit you better, you may add |
36 ;; these lines (the values of the variables presented here are the defaults): | |
37 ;; | |
38 ;; ;; User customization for Pascal mode | |
39 ;; (setq pascal-indent-level 3 | |
40 ;; pascal-case-indent 2 | |
41 ;; pascal-auto-newline nil | |
42 ;; pascal-tab-always-indent t | |
43 ;; pascal-auto-endcomments t | |
44 ;; pascal-auto-lineup '(all) | |
45 ;; pascal-toggle-completions nil | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
46 ;; pascal-type-keywords '("array" "file" "packed" "char" |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
47 ;; "integer" "real" "string" "record") |
14169 | 48 ;; pascal-start-keywords '("begin" "end" "function" "procedure" |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
49 ;; "repeat" "until" "while" "read" "readln" |
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
50 ;; "reset" "rewrite" "write" "writeln") |
14169 | 51 ;; pascal-separator-keywords '("downto" "else" "mod" "div" "then")) |
4934 | 52 |
14169 | 53 ;; KNOWN BUGS / BUGREPORTS |
54 ;; ======================= | |
55 ;; As far as I know, there are no bugs in the current version of this | |
56 ;; package. This may not be true however, since I never use this mode | |
57 ;; myself and therefore would never notice them anyway. If you do | |
28976
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
58 ;; find any bugs, you may submit them to: esk@gnu.org as well as to |
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
59 ;; bug-gnu-emacs@gnu.org. |
5723 | 60 |
61 ;;; Code: | |
4934 | 62 |
106378
f7a46a812653
* progmodes/pascal.el: Require CL when compiling (for lexical-let).
Juanma Barranquero <lekktu@gmail.com>
parents:
106376
diff
changeset
|
63 (eval-when-compile (require 'cl)) |
f7a46a812653
* progmodes/pascal.el: Require CL when compiling (for lexical-let).
Juanma Barranquero <lekktu@gmail.com>
parents:
106376
diff
changeset
|
64 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
65 (defgroup pascal nil |
64047
e872639c28e3
(pascal): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
62772
diff
changeset
|
66 "Major mode for editing Pascal source in Emacs." |
66963
a11fdee52c05
Add :link (custom-group-link font-lock-faces) to defgroup.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
67 :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
68 :group 'languages) |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
69 |
4934 | 70 (defvar pascal-mode-abbrev-table nil |
71 "Abbrev table in use in Pascal-mode buffers.") | |
72 (define-abbrev-table 'pascal-mode-abbrev-table ()) | |
73 | |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
74 (defvar pascal-mode-map |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
75 (let ((map (make-sparse-keymap))) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
76 (define-key map ";" 'electric-pascal-semi-or-dot) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
77 (define-key map "." 'electric-pascal-semi-or-dot) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
78 (define-key map ":" 'electric-pascal-colon) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
79 (define-key map "=" 'electric-pascal-equal) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
80 (define-key map "#" 'electric-pascal-hash) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
81 (define-key map "\r" 'electric-pascal-terminate-line) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
82 (define-key map "\t" 'electric-pascal-tab) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
83 (define-key map "\M-\t" 'pascal-complete-word) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
84 (define-key map "\M-?" 'pascal-show-completions) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
85 (define-key map "\177" 'backward-delete-char-untabify) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
86 (define-key map "\M-\C-h" 'pascal-mark-defun) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
87 (define-key map "\C-c\C-b" 'pascal-insert-block) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
88 (define-key map "\M-*" 'pascal-star-comment) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
89 (define-key map "\C-c\C-c" 'pascal-comment-area) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
90 (define-key map "\C-c\C-u" 'pascal-uncomment-area) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
91 (define-key map "\M-\C-a" 'pascal-beg-of-defun) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
92 (define-key map "\M-\C-e" 'pascal-end-of-defun) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
93 (define-key map "\C-c\C-d" 'pascal-goto-defun) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
94 (define-key map "\C-c\C-o" 'pascal-outline-mode) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
95 ;; A command to change the whole buffer won't be used terribly |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
96 ;; often, so no need for a key binding. |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
97 ;; (define-key map "\C-cd" 'pascal-downcase-keywords) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
98 ;; (define-key map "\C-cu" 'pascal-upcase-keywords) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
99 ;; (define-key map "\C-cc" 'pascal-capitalize-keywords) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
100 map) |
4934 | 101 "Keymap used in Pascal mode.") |
12689
83ef0f002ecf
(pascal-mode): Added imenu support.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
102 |
83ef0f002ecf
(pascal-mode): Added imenu support.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
103 (defvar pascal-imenu-generic-expression |
43255
c440fcd3adb0
(pascal-imenu-generic-expression): Add menu-title and fix parentheses.
Eli Zaretskii <eliz@gnu.org>
parents:
28976
diff
changeset
|
104 '((nil "^[ \t]*\\(function\\|procedure\\)[ \t\n]+\\([a-zA-Z0-9_.:]+\\)" 2)) |
12689
83ef0f002ecf
(pascal-mode): Added imenu support.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
105 "Imenu expression for Pascal-mode. See `imenu-generic-expression'.") |
17482
b758fbf989b7
(pascal-mode): Set comment-start.
Richard M. Stallman <rms@gnu.org>
parents:
16622
diff
changeset
|
106 |
5723 | 107 (defvar pascal-keywords |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
108 '("and" "array" "begin" "case" "const" "div" "do" "downto" "else" "end" |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
109 "file" "for" "function" "goto" "if" "in" "label" "mod" "nil" "not" "of" |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
110 "or" "packed" "procedure" "program" "record" "repeat" "set" "then" "to" |
5723 | 111 "type" "until" "var" "while" "with" |
112 ;; The following are not standard in pascal, but widely used. | |
113 "get" "put" "input" "output" "read" "readln" "reset" "rewrite" "write" | |
114 "writeln")) | |
4934 | 115 |
5723 | 116 ;;; |
117 ;;; Regular expressions used to calculate indent, etc. | |
118 ;;; | |
119 (defconst pascal-symbol-re "\\<[a-zA-Z_][a-zA-Z_0-9.]*\\>") | |
120 (defconst pascal-beg-block-re "\\<\\(begin\\|case\\|record\\|repeat\\)\\>") | |
121 (defconst pascal-end-block-re "\\<\\(end\\|until\\)\\>") | |
122 (defconst pascal-declaration-re "\\<\\(const\\|label\\|type\\|var\\)\\>") | |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
123 (defconst pascal-progbeg-re "\\<\\program\\>") |
5723 | 124 (defconst pascal-defun-re "\\<\\(function\\|procedure\\|program\\)\\>") |
6123
3c66892f0083
(pascal-sub-block-re): Recognize for and with.
Richard M. Stallman <rms@gnu.org>
parents:
5723
diff
changeset
|
125 (defconst pascal-sub-block-re "\\<\\(if\\|else\\|for\\|while\\|with\\)\\>") |
6153
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
126 (defconst pascal-noindent-re "\\<\\(begin\\|end\\|until\\|else\\)\\>") |
5723 | 127 (defconst pascal-nosemi-re "\\<\\(begin\\|repeat\\|then\\|do\\|else\\)\\>") |
128 (defconst pascal-autoindent-lines-re | |
129 "\\<\\(label\\|var\\|type\\|const\\|until\\|end\\|begin\\|repeat\\|else\\)\\>") | |
130 | |
131 ;;; Strings used to mark beginning and end of excluded text | |
132 (defconst pascal-exclude-str-start "{-----\\/----- EXCLUDED -----\\/-----") | |
133 (defconst pascal-exclude-str-end " -----/\\----- EXCLUDED -----/\\-----}") | |
4934 | 134 |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
135 (defvar pascal-mode-syntax-table |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
136 (let ((st (make-syntax-table))) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
137 (modify-syntax-entry ?\\ "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
138 (modify-syntax-entry ?\( "()1" st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
139 (modify-syntax-entry ?\) ")(4" st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
140 ;; This used to use comment-syntax `b'. But the only document I could |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
141 ;; find about the syntax of Pascal's comments said that (* ... } is |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
142 ;; a valid comment, just as { ... *) or (* ... *) or { ... }. |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
143 (modify-syntax-entry ?* ". 23" st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
144 (modify-syntax-entry ?{ "<" st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
145 (modify-syntax-entry ?} ">" st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
146 (modify-syntax-entry ?+ "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
147 (modify-syntax-entry ?- "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
148 (modify-syntax-entry ?= "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
149 (modify-syntax-entry ?% "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
150 (modify-syntax-entry ?< "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
151 (modify-syntax-entry ?> "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
152 (modify-syntax-entry ?& "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
153 (modify-syntax-entry ?| "." st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
154 (modify-syntax-entry ?_ "_" st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
155 (modify-syntax-entry ?\' "\"" st) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
156 st) |
4934 | 157 "Syntax table in use in Pascal-mode buffers.") |
158 | |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
159 |
4934 | 160 |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
161 (defconst pascal-font-lock-keywords (purecopy |
9387
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
162 (list |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
163 '("^[ \t]*\\(function\\|pro\\(cedure\\|gram\\)\\)\\>[ \t]*\\([a-z]\\)" |
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
164 1 font-lock-keyword-face) |
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
165 '("^[ \t]*\\(function\\|pro\\(cedure\\|gram\\)\\)\\>[ \t]*\\([a-z][a-z0-9_]*\\)" |
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
166 3 font-lock-function-name-face t) |
9387
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
167 ; ("type" "const" "real" "integer" "char" "boolean" "var" |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
168 ; "record" "array" "file") |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
169 (cons (concat "\\<\\(array\\|boolean\\|c\\(har\\|onst\\)\\|file\\|" |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
170 "integer\\|re\\(al\\|cord\\)\\|type\\|var\\)\\>") |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
171 'font-lock-type-face) |
20953
f3f9df46d008
Changed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20459
diff
changeset
|
172 '("\\<\\(label\\|external\\|forward\\)\\>" . font-lock-constant-face) |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
173 '("\\<\\([0-9]+\\)[ \t]*:" 1 font-lock-function-name-face) |
9387
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
174 ; ("of" "to" "for" "if" "then" "else" "case" "while" |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
175 ; "do" "until" "and" "or" "not" "in" "with" "repeat" "begin" "end") |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
176 (concat "\\<\\(" |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
177 "and\\|begin\\|case\\|do\\|e\\(lse\\|nd\\)\\|for\\|i[fn]\\|" |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
178 "not\\|o[fr]\\|repeat\\|t\\(hen\\|o\\)\\|until\\|w\\(hile\\|ith\\)" |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
179 "\\)\\>") |
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
180 '("\\<\\(goto\\)\\>[ \t]*\\([0-9]+\\)?" |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
181 1 font-lock-keyword-face) |
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
182 '("\\<\\(goto\\)\\>[ \t]*\\([0-9]+\\)?" |
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
183 2 font-lock-keyword-face t))) |
9387
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
184 "Additional expressions to highlight in Pascal mode.") |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
185 (put 'pascal-mode 'font-lock-defaults '(pascal-font-lock-keywords nil t)) |
9387
ccd27c6ef48d
(pascal-font-lock-keywords): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8689
diff
changeset
|
186 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
187 (defcustom pascal-indent-level 3 |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
188 "*Indentation of Pascal statements with respect to containing block." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
189 :type 'integer |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
190 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
191 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
192 (defcustom pascal-case-indent 2 |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
193 "*Indentation for case statements." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
194 :type 'integer |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
195 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
196 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
197 (defcustom pascal-auto-newline nil |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
198 "*Non-nil means automatically insert newlines in certain cases. |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
199 These include after semicolons and after the punctuation mark after an `end'." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
200 :type 'boolean |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
201 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
202 |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
203 (defcustom pascal-indent-nested-functions t |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
204 "*Non-nil means nested functions are indented." |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
205 :type 'boolean |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
206 :group 'pascal) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
207 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
208 (defcustom pascal-tab-always-indent t |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
209 "*Non-nil means TAB in Pascal mode should always reindent the current line. |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
210 If this is nil, TAB inserts a tab if it is at the end of the line |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
211 and follows non-whitespace text." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
212 :type 'boolean |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
213 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
214 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
215 (defcustom pascal-auto-endcomments t |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
216 "*Non-nil means automatically insert comments after certain `end's. |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
217 Specifically, this is done after the ends of cases statements and functions. |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
218 The name of the function or case is included between the braces." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
219 :type 'boolean |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
220 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
221 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
222 (defcustom pascal-auto-lineup '(all) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
223 "*List of contexts where auto lineup of :'s or ='s should be done. |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
224 Elements can be of type: 'paramlist', 'declaration' or 'case', which will |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
225 do auto lineup in parameterlist, declarations or case-statements |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
226 respectively. The word 'all' will do all lineups. '(case paramlist) for |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
227 instance will do lineup in case-statements and parameterlist, while '(all) |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
228 will do all lineups." |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
229 :type '(set :extra-offset 8 |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
230 (const :tag "Everything" all) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
231 (const :tag "Parameter lists" paramlist) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
232 (const :tag "Decalrations" declaration) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
233 (const :tag "Case statements" case)) |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
234 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
235 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
236 (defcustom pascal-toggle-completions nil |
12882
83fd8f17cfe4
(pascal-mode): Set comment-start.
Richard M. Stallman <rms@gnu.org>
parents:
12689
diff
changeset
|
237 "*Non-nil means \\<pascal-mode-map>\\[pascal-complete-word] should try all possible completions one by one. |
83fd8f17cfe4
(pascal-mode): Set comment-start.
Richard M. Stallman <rms@gnu.org>
parents:
12689
diff
changeset
|
238 Repeated use of \\[pascal-complete-word] will show you all of them. |
83fd8f17cfe4
(pascal-mode): Set comment-start.
Richard M. Stallman <rms@gnu.org>
parents:
12689
diff
changeset
|
239 Normally, when there is more than one possible completion, |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
240 it displays a list of all possible completions." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
241 :type 'boolean |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
242 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
243 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
244 (defcustom pascal-type-keywords |
5723 | 245 '("array" "file" "packed" "char" "integer" "real" "string" "record") |
246 "*Keywords for types used when completing a word in a declaration or parmlist. | |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
247 These include integer, real, char, etc. |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
248 The types defined within the Pascal program |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
249 are handled in another way, and should not be added to this list." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
250 :type '(repeat (string :tag "Keyword")) |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
251 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
252 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
253 (defcustom pascal-start-keywords |
5723 | 254 '("begin" "end" "function" "procedure" "repeat" "until" "while" |
255 "read" "readln" "reset" "rewrite" "write" "writeln") | |
256 "*Keywords to complete when standing at the first word of a statement. | |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
257 These are keywords such as begin, repeat, until, readln. |
5723 | 258 The procedures and variables defined within the Pascal program |
47263
21c763762fb2
(pascal-start-keywords): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
43255
diff
changeset
|
259 are handled in another way, and should not be added to this list." |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
260 :type '(repeat (string :tag "Keyword")) |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
261 :group 'pascal) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
262 |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
263 (defcustom pascal-separator-keywords |
5723 | 264 '("downto" "else" "mod" "div" "then") |
265 "*Keywords to complete when NOT standing at the first word of a statement. | |
17483
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
266 These are keywords such as downto, else, mod, then. |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
267 Variables and function names defined within the Pascal program |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
268 are handled in another way, and should not be added to this list." |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
269 :type '(repeat (string :tag "Keyword")) |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
270 :group 'pascal) |
5f8a37eaea45
Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
17482
diff
changeset
|
271 |
5723 | 272 |
273 ;;; | |
274 ;;; Macros | |
275 ;;; | |
276 | |
277 (defun pascal-declaration-end () | |
278 (let ((nest 1)) | |
279 (while (and (> nest 0) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
280 (re-search-forward |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
281 "[:=]\\|\\(\\<record\\>\\)\\|\\(\\<end\\>\\)" |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
282 (point-at-eol 2) t)) |
5723 | 283 (cond ((match-beginning 1) (setq nest (1+ nest))) |
14776
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
284 ((match-beginning 2) (setq nest (1- nest))) |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
285 ((looking-at "[^(\n]+)") (setq nest 0)))))) |
5723 | 286 |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
287 |
5723 | 288 (defun pascal-declaration-beg () |
289 (let ((nest 1)) | |
290 (while (and (> nest 0) | |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
291 (re-search-backward "[:=]\\|\\<\\(type\\|var\\|label\\|const\\)\\>\\|\\(\\<record\\>\\)\\|\\(\\<end\\>\\)" (point-at-bol 0) t)) |
5723 | 292 (cond ((match-beginning 1) (setq nest 0)) |
293 ((match-beginning 2) (setq nest (1- nest))) | |
294 ((match-beginning 3) (setq nest (1+ nest))))) | |
295 (= nest 0))) | |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
296 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
297 |
5723 | 298 (defsubst pascal-within-string () |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
299 (nth 3 (parse-partial-sexp (point-at-bol) (point)))) |
5723 | 300 |
4934 | 301 |
302 ;;;###autoload | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
303 (define-derived-mode pascal-mode prog-mode "Pascal" |
5723 | 304 "Major mode for editing Pascal code. \\<pascal-mode-map> |
305 TAB indents for Pascal code. Delete converts tabs to spaces as it moves back. | |
306 | |
307 \\[pascal-complete-word] completes the word around current point with respect \ | |
308 to position in code | |
309 \\[pascal-show-completions] shows all possible completions at this point. | |
310 | |
311 Other useful functions are: | |
312 | |
313 \\[pascal-mark-defun]\t- Mark function. | |
314 \\[pascal-insert-block]\t- insert begin ... end; | |
315 \\[pascal-star-comment]\t- insert (* ... *) | |
316 \\[pascal-comment-area]\t- Put marked area in a comment, fixing nested comments. | |
317 \\[pascal-uncomment-area]\t- Uncomment an area commented with \ | |
318 \\[pascal-comment-area]. | |
319 \\[pascal-beg-of-defun]\t- Move to beginning of current function. | |
320 \\[pascal-end-of-defun]\t- Move to end of current function. | |
321 \\[pascal-goto-defun]\t- Goto function prompted for in the minibuffer. | |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
322 \\[pascal-outline-mode]\t- Enter `pascal-outline-mode'. |
5723 | 323 |
324 Variables controlling indentation/edit style: | |
325 | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
326 `pascal-indent-level' (default 3) |
5723 | 327 Indentation of Pascal statements with respect to containing block. |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
328 `pascal-case-indent' (default 2) |
5723 | 329 Indentation for case statements. |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
330 `pascal-auto-newline' (default nil) |
14000
36dc9ede3562
(pascal-auto-newline, pascal-mode, electric-pascal-hash):
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
331 Non-nil means automatically newline after semicolons and the punctuation |
36dc9ede3562
(pascal-auto-newline, pascal-mode, electric-pascal-hash):
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
332 mark after an end. |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
333 `pascal-indent-nested-functions' (default t) |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
334 Non-nil means nested functions are indented. |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
335 `pascal-tab-always-indent' (default t) |
4934 | 336 Non-nil means TAB in Pascal mode should always reindent the current line, |
337 regardless of where in the line point is when the TAB command is used. | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
338 `pascal-auto-endcomments' (default t) |
5723 | 339 Non-nil means a comment { ... } is set after the ends which ends cases and |
340 functions. The name of the function or case will be set between the braces. | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
341 `pascal-auto-lineup' (default t) |
17482
b758fbf989b7
(pascal-mode): Set comment-start.
Richard M. Stallman <rms@gnu.org>
parents:
16622
diff
changeset
|
342 List of contexts where auto lineup of :'s or ='s should be done. |
4934 | 343 |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
344 See also the user variables `pascal-type-keywords', `pascal-start-keywords' and |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
345 `pascal-separator-keywords'. |
4934 | 346 |
347 Turning on Pascal mode calls the value of the variable pascal-mode-hook with | |
348 no args, if that value is non-nil." | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
349 (set (make-local-variable 'local-abbrev-table) pascal-mode-abbrev-table) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
350 (set (make-local-variable 'indent-line-function) 'pascal-indent-line) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
351 (set (make-local-variable 'comment-indent-function) 'pascal-indent-comment) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
352 (set (make-local-variable 'parse-sexp-ignore-comments) nil) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
353 (set (make-local-variable 'blink-matching-paren-dont-ignore-comments) t) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
354 (set (make-local-variable 'case-fold-search) t) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
355 (set (make-local-variable 'comment-start) "{") |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
356 (set (make-local-variable 'comment-start-skip) "(\\*+ *\\|{ *") |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
357 (set (make-local-variable 'comment-end) "}") |
12689
83ef0f002ecf
(pascal-mode): Added imenu support.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
358 ;; Font lock support |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
359 (set (make-local-variable 'font-lock-defaults) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
360 '(pascal-font-lock-keywords nil t)) |
12689
83ef0f002ecf
(pascal-mode): Added imenu support.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
361 ;; Imenu support |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
362 (set (make-local-variable 'imenu-generic-expression) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
363 pascal-imenu-generic-expression) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
364 (set (make-local-variable 'imenu-case-fold-search) t) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
365 ;; Pascal-mode's own hide/show support. |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
366 (add-to-invisibility-spec '(pascal . t))) |
4934 | 367 |
5723 | 368 |
369 | |
4934 | 370 ;;; |
371 ;;; Electric functions | |
372 ;;; | |
373 (defun electric-pascal-terminate-line () | |
374 "Terminate line and indent next line." | |
375 (interactive) | |
5723 | 376 ;; First, check if current line should be indented |
4934 | 377 (save-excursion |
378 (beginning-of-line) | |
379 (skip-chars-forward " \t") | |
5723 | 380 (if (looking-at pascal-autoindent-lines-re) |
4934 | 381 (pascal-indent-line))) |
5723 | 382 (delete-horizontal-space) ; Removes trailing whitespaces |
4934 | 383 (newline) |
5723 | 384 ;; Indent next line |
4934 | 385 (pascal-indent-line) |
386 ;; Maybe we should set some endcomments | |
387 (if pascal-auto-endcomments | |
388 (pascal-set-auto-comments)) | |
389 ;; Check if we shall indent inside comment | |
390 (let ((setstar nil)) | |
391 (save-excursion | |
392 (forward-line -1) | |
393 (skip-chars-forward " \t") | |
5723 | 394 (cond ((looking-at "\\*[ \t]+)") |
4934 | 395 ;; Delete region between `*' and `)' if there is only whitespaces. |
396 (forward-char 1) | |
5723 | 397 (delete-horizontal-space)) |
4934 | 398 ((and (looking-at "(\\*\\|\\*[^)]") |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
399 (not (save-excursion (search-forward "*)" (point-at-eol) t)))) |
4934 | 400 (setq setstar t)))) |
401 ;; If last line was a star comment line then this one shall be too. | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
402 (if (null setstar) |
5723 | 403 (pascal-indent-line) |
404 (insert "* ")))) | |
4934 | 405 |
406 | |
5723 | 407 (defun electric-pascal-semi-or-dot () |
408 "Insert `;' or `.' character and reindent the line." | |
4934 | 409 (interactive) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
410 (insert last-command-event) |
4934 | 411 (save-excursion |
412 (beginning-of-line) | |
413 (pascal-indent-line)) | |
414 (if pascal-auto-newline | |
415 (electric-pascal-terminate-line))) | |
416 | |
417 (defun electric-pascal-colon () | |
5723 | 418 "Insert `:' and do all indentions except line indent on this line." |
4934 | 419 (interactive) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
420 (insert last-command-event) |
5723 | 421 ;; Do nothing if within string. |
422 (if (pascal-within-string) | |
423 () | |
424 (save-excursion | |
425 (beginning-of-line) | |
426 (pascal-indent-line)) | |
427 (let ((pascal-tab-always-indent nil)) | |
428 (pascal-indent-command)))) | |
429 | |
4934 | 430 (defun electric-pascal-equal () |
5723 | 431 "Insert `=', and do indention if within type declaration." |
4934 | 432 (interactive) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
433 (insert last-command-event) |
5723 | 434 (if (eq (car (pascal-calculate-indent)) 'declaration) |
4934 | 435 (let ((pascal-tab-always-indent nil)) |
436 (pascal-indent-command)))) | |
437 | |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
438 (defun electric-pascal-hash () |
14000
36dc9ede3562
(pascal-auto-newline, pascal-mode, electric-pascal-hash):
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
439 "Insert `#', and indent to column 0 if this is a CPP directive." |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
440 (interactive) |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
441 (insert last-command-event) |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
442 (if (save-excursion (beginning-of-line) (looking-at "^[ \t]*#")) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
443 (save-excursion (beginning-of-line) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
444 (delete-horizontal-space)))) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
445 |
4934 | 446 (defun electric-pascal-tab () |
5723 | 447 "Function called when TAB is pressed in Pascal mode." |
4934 | 448 (interactive) |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
449 ;; Do nothing if within a string or in a CPP directive. |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
450 (if (or (pascal-within-string) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
451 (and (not (bolp)) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
452 (save-excursion (beginning-of-line) (eq (following-char) ?#)))) |
5723 | 453 (insert "\t") |
454 ;; If pascal-tab-always-indent, indent the beginning of the line. | |
455 (if pascal-tab-always-indent | |
456 (save-excursion | |
457 (beginning-of-line) | |
458 (pascal-indent-line)) | |
14776
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
459 (if (save-excursion |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
460 (skip-chars-backward " \t") |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
461 (bolp)) |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
462 (pascal-indent-line) |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
463 (insert "\t"))) |
5723 | 464 (pascal-indent-command))) |
465 | |
466 | |
4934 | 467 |
468 ;;; | |
469 ;;; Interactive functions | |
470 ;;; | |
471 (defun pascal-insert-block () | |
5723 | 472 "Insert Pascal begin ... end; block in the code with right indentation." |
4934 | 473 (interactive) |
474 (insert "begin") | |
475 (electric-pascal-terminate-line) | |
476 (save-excursion | |
22682
c283610d2a74
(pascal-insert-block): Fixed space-deletion bug in
Richard M. Stallman <rms@gnu.org>
parents:
20953
diff
changeset
|
477 (newline) |
4934 | 478 (insert "end;") |
479 (beginning-of-line) | |
480 (pascal-indent-line))) | |
481 | |
482 (defun pascal-star-comment () | |
5723 | 483 "Insert Pascal star comment at point." |
4934 | 484 (interactive) |
485 (pascal-indent-line) | |
486 (insert "(*") | |
487 (electric-pascal-terminate-line) | |
488 (save-excursion | |
489 (electric-pascal-terminate-line) | |
5723 | 490 (delete-horizontal-space) |
491 (insert ")")) | |
492 (insert " ")) | |
4934 | 493 |
5723 | 494 (defun pascal-mark-defun () |
4934 | 495 "Mark the current pascal function (or procedure). |
5723 | 496 This puts the mark at the end, and point at the beginning." |
4934 | 497 (interactive) |
498 (push-mark (point)) | |
5723 | 499 (pascal-end-of-defun) |
4934 | 500 (push-mark (point)) |
5723 | 501 (pascal-beg-of-defun) |
87941
d77b6e5ee8af
* sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79717
diff
changeset
|
502 (when (featurep 'xemacs) |
d77b6e5ee8af
* sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79717
diff
changeset
|
503 (zmacs-activate-region))) |
4934 | 504 |
505 (defun pascal-comment-area (start end) | |
5723 | 506 "Put the region into a Pascal comment. |
507 The comments that are in this area are \"deformed\": | |
508 `*)' becomes `!(*' and `}' becomes `!{'. | |
509 These deformed comments are returned to normal if you use | |
510 \\[pascal-uncomment-area] to undo the commenting. | |
511 | |
512 The commented area starts with `pascal-exclude-str-start', and ends with | |
513 `pascal-include-str-end'. But if you change these variables, | |
514 \\[pascal-uncomment-area] won't recognize the comments." | |
4934 | 515 (interactive "r") |
516 (save-excursion | |
517 ;; Insert start and endcomments | |
518 (goto-char end) | |
519 (if (and (save-excursion (skip-chars-forward " \t") (eolp)) | |
520 (not (save-excursion (skip-chars-backward " \t") (bolp)))) | |
521 (forward-line 1) | |
522 (beginning-of-line)) | |
5723 | 523 (insert pascal-exclude-str-end) |
4934 | 524 (setq end (point)) |
525 (newline) | |
526 (goto-char start) | |
527 (beginning-of-line) | |
5723 | 528 (insert pascal-exclude-str-start) |
4934 | 529 (newline) |
530 ;; Replace end-comments within commented area | |
531 (goto-char end) | |
532 (save-excursion | |
533 (while (re-search-backward "\\*)" start t) | |
534 (replace-match "!(*" t t))) | |
535 (save-excursion | |
536 (while (re-search-backward "}" start t) | |
537 (replace-match "!{" t t))))) | |
538 | |
539 (defun pascal-uncomment-area () | |
5723 | 540 "Uncomment a commented area; change deformed comments back to normal. |
541 This command does nothing if the pointer is not in a commented | |
4934 | 542 area. See also `pascal-comment-area'." |
543 (interactive) | |
544 (save-excursion | |
545 (let ((start (point)) | |
546 (end (point))) | |
547 ;; Find the boundaries of the comment | |
548 (save-excursion | |
5723 | 549 (setq start (progn (search-backward pascal-exclude-str-start nil t) |
4934 | 550 (point))) |
5723 | 551 (setq end (progn (search-forward pascal-exclude-str-end nil t) |
4934 | 552 (point)))) |
553 ;; Check if we're really inside a comment | |
554 (if (or (equal start (point)) (<= end (point))) | |
555 (message "Not standing within commented area.") | |
556 (progn | |
557 ;; Remove endcomment | |
558 (goto-char end) | |
559 (beginning-of-line) | |
560 (let ((pos (point))) | |
561 (end-of-line) | |
562 (delete-region pos (1+ (point)))) | |
563 ;; Change comments back to normal | |
564 (save-excursion | |
565 (while (re-search-backward "!{" start t) | |
566 (replace-match "}" t t))) | |
567 (save-excursion | |
568 (while (re-search-backward "!(\\*" start t) | |
569 (replace-match "*)" t t))) | |
570 ;; Remove startcomment | |
571 (goto-char start) | |
572 (beginning-of-line) | |
573 (let ((pos (point))) | |
574 (end-of-line) | |
575 (delete-region pos (1+ (point))))))))) | |
576 | |
5723 | 577 (defun pascal-beg-of-defun () |
578 "Move backward to the beginning of the current function or procedure." | |
4934 | 579 (interactive) |
5723 | 580 (catch 'found |
581 (if (not (looking-at (concat "\\s \\|\\s)\\|" pascal-defun-re))) | |
582 (forward-sexp 1)) | |
583 (let ((nest 0) (max -1) (func 0) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
584 (reg (concat pascal-beg-block-re "\\|" |
5723 | 585 pascal-end-block-re "\\|" |
586 pascal-defun-re))) | |
587 (while (re-search-backward reg nil 'move) | |
588 (cond ((let ((state (save-excursion | |
589 (parse-partial-sexp (point-min) (point))))) | |
590 (or (nth 3 state) (nth 4 state))) ; Inside string or comment | |
591 ()) | |
592 ((match-end 1) ; begin|case|record|repeat | |
593 (if (and (looking-at "\\<record\\>") (>= max 0)) | |
594 (setq func (1- func))) | |
595 (setq nest (1+ nest) | |
596 max (max nest max))) | |
597 ((match-end 2) ; end|until | |
598 (if (and (= nest max) (>= max 0)) | |
599 (setq func (1+ func))) | |
600 (setq nest (1- nest))) | |
601 ((match-end 3) ; function|procedure | |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
602 (if (= 0 func) |
5723 | 603 (throw 'found t) |
604 (setq func (1- func))))))) | |
605 nil)) | |
4934 | 606 |
5723 | 607 (defun pascal-end-of-defun () |
608 "Move forward to the end of the current function or procedure." | |
4934 | 609 (interactive) |
5723 | 610 (if (looking-at "\\s ") |
611 (forward-sexp 1)) | |
612 (if (not (looking-at pascal-defun-re)) | |
613 (pascal-beg-of-defun)) | |
614 (forward-char 1) | |
615 (let ((nest 0) (func 1) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
616 (reg (concat pascal-beg-block-re "\\|" |
5723 | 617 pascal-end-block-re "\\|" |
618 pascal-defun-re))) | |
619 (while (and (/= func 0) | |
620 (re-search-forward reg nil 'move)) | |
621 (cond ((let ((state (save-excursion | |
622 (parse-partial-sexp (point-min) (point))))) | |
623 (or (nth 3 state) (nth 4 state))) ; Inside string or comment | |
624 ()) | |
625 ((match-end 1) | |
626 (setq nest (1+ nest)) | |
627 (if (save-excursion | |
628 (goto-char (match-beginning 0)) | |
629 (looking-at "\\<record\\>")) | |
630 (setq func (1+ func)))) | |
631 ((match-end 2) | |
632 (setq nest (1- nest)) | |
633 (if (= nest 0) | |
634 (setq func (1- func)))) | |
635 ((match-end 3) | |
636 (setq func (1+ func)))))) | |
637 (forward-line 1)) | |
4934 | 638 |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
639 (defun pascal-end-of-statement () |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
640 "Move forward to end of current statement." |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
641 (interactive) |
15230
307b7c77a5e5
(pascal-end-of-statement, pascal-calculate-indent):
Richard M. Stallman <rms@gnu.org>
parents:
14776
diff
changeset
|
642 (let ((parse-sexp-ignore-comments t) |
307b7c77a5e5
(pascal-end-of-statement, pascal-calculate-indent):
Richard M. Stallman <rms@gnu.org>
parents:
14776
diff
changeset
|
643 (nest 0) pos |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
644 (regexp (concat "\\(" pascal-beg-block-re "\\)\\|\\(" |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
645 pascal-end-block-re "\\)"))) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
646 (if (not (looking-at "[ \t\n]")) (forward-sexp -1)) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
647 (or (looking-at pascal-beg-block-re) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
648 ;; Skip to end of statement |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
649 (setq pos (catch 'found |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
650 (while t |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
651 (forward-sexp 1) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
652 (cond ((looking-at "[ \t]*;") |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
653 (skip-chars-forward "^;") |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
654 (forward-char 1) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
655 (throw 'found (point))) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
656 ((save-excursion |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
657 (forward-sexp -1) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
658 (looking-at pascal-beg-block-re)) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
659 (goto-char (match-beginning 0)) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
660 (throw 'found nil)) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
661 ((eobp) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
662 (throw 'found (point)))))))) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
663 (if (not pos) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
664 ;; Skip a whole block |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
665 (catch 'found |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
666 (while t |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
667 (re-search-forward regexp nil 'move) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
668 (setq nest (if (match-end 1) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
669 (1+ nest) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
670 (1- nest))) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
671 (cond ((eobp) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
672 (throw 'found (point))) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
673 ((= 0 nest) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
674 (throw 'found (pascal-end-of-statement)))))) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
675 pos))) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
676 |
4934 | 677 (defun pascal-downcase-keywords () |
5723 | 678 "Downcase all Pascal keywords in the buffer." |
4934 | 679 (interactive) |
680 (pascal-change-keywords 'downcase-word)) | |
681 | |
682 (defun pascal-upcase-keywords () | |
5723 | 683 "Upcase all Pascal keywords in the buffer." |
4934 | 684 (interactive) |
685 (pascal-change-keywords 'upcase-word)) | |
686 | |
687 (defun pascal-capitalize-keywords () | |
5723 | 688 "Capitalize all Pascal keywords in the buffer." |
4934 | 689 (interactive) |
690 (pascal-change-keywords 'capitalize-word)) | |
691 | |
5723 | 692 ;; Change the keywords according to argument. |
4934 | 693 (defun pascal-change-keywords (change-word) |
694 (save-excursion | |
5723 | 695 (let ((keyword-re (concat "\\<\\(" |
696 (mapconcat 'identity pascal-keywords "\\|") | |
697 "\\)\\>"))) | |
698 (goto-char (point-min)) | |
699 (while (re-search-forward keyword-re nil t) | |
700 (funcall change-word -1))))) | |
701 | |
702 | |
4934 | 703 |
704 ;;; | |
705 ;;; Other functions | |
706 ;;; | |
707 (defun pascal-set-auto-comments () | |
5723 | 708 "Insert `{ case }' or `{ NAME }' on this line if appropriate. |
709 Insert `{ case }' if there is an `end' on the line which | |
710 ends a case block. Insert `{ NAME }' if there is an `end' | |
711 on the line which ends a function or procedure named NAME." | |
4934 | 712 (save-excursion |
713 (forward-line -1) | |
714 (skip-chars-forward " \t") | |
5723 | 715 (if (and (looking-at "\\<end;") |
4934 | 716 (not (save-excursion |
717 (end-of-line) | |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
718 (search-backward "{" (point-at-bol) t)))) |
6316
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
719 (let ((type (car (pascal-calculate-indent)))) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
720 (if (eq type 'declaration) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
721 () |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
722 (if (eq type 'case) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
723 ;; This is a case block |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
724 (progn |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
725 (end-of-line) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
726 (delete-horizontal-space) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
727 (insert " { case }")) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
728 (let ((nest 1)) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
729 ;; Check if this is the end of a function |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
730 (save-excursion |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
731 (while (not (or (looking-at pascal-defun-re) (bobp))) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
732 (backward-sexp 1) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
733 (cond ((looking-at pascal-beg-block-re) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
734 (setq nest (1- nest))) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
735 ((looking-at pascal-end-block-re) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
736 (setq nest (1+ nest))))) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
737 (if (bobp) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
738 (setq nest 1))) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
739 (if (zerop nest) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
740 (progn |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
741 (end-of-line) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
742 (delete-horizontal-space) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
743 (insert " { ") |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
744 (let (b e) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
745 (save-excursion |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
746 (setq b (progn (pascal-beg-of-defun) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
747 (skip-chars-forward "^ \t") |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
748 (skip-chars-forward " \t") |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
749 (point)) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
750 e (progn (skip-chars-forward "a-zA-Z0-9_") |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
751 (point)))) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
752 (insert-buffer-substring (current-buffer) b e)) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
753 (insert " }")))))))))) |
4934 | 754 |
5723 | 755 |
756 | |
4934 | 757 ;;; |
5723 | 758 ;;; Indentation |
759 ;;; | |
760 (defconst pascal-indent-alist | |
761 '((block . (+ ind pascal-indent-level)) | |
762 (case . (+ ind pascal-case-indent)) | |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
763 (caseblock . ind) (cpp . 0) |
5723 | 764 (declaration . (+ ind pascal-indent-level)) |
765 (paramlist . (pascal-indent-paramlist t)) | |
28976
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
766 (comment . (pascal-indent-comment)) |
5723 | 767 (defun . ind) (contexp . ind) |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
768 (unknown . ind) (string . 0) (progbeg . 0))) |
5723 | 769 |
4934 | 770 (defun pascal-indent-command () |
5723 | 771 "Indent for special part of code." |
772 (let* ((indent-str (pascal-calculate-indent)) | |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
773 (type (car indent-str))) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
774 (cond ((and (eq type 'paramlist) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
775 (or (memq 'all pascal-auto-lineup) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
776 (memq 'paramlist pascal-auto-lineup))) |
5723 | 777 (pascal-indent-paramlist) |
778 (pascal-indent-paramlist)) | |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
779 ((and (eq type 'declaration) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
780 (or (memq 'all pascal-auto-lineup) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
781 (memq 'declaration pascal-auto-lineup))) |
5723 | 782 (pascal-indent-declaration)) |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
783 ((and (eq type 'case) (not (looking-at "^[ \t]*$")) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
784 (or (memq 'all pascal-auto-lineup) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
785 (memq 'case pascal-auto-lineup))) |
5723 | 786 (pascal-indent-case))) |
787 (if (looking-at "[ \t]+$") | |
788 (skip-chars-forward " \t")))) | |
4934 | 789 |
790 (defun pascal-indent-line () | |
5723 | 791 "Indent current line as a Pascal statement." |
792 (let* ((indent-str (pascal-calculate-indent)) | |
793 (type (car indent-str)) | |
794 (ind (car (cdr indent-str)))) | |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
795 ;; Labels should not be indented. |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
796 (if (and (looking-at "^[0-9a-zA-Z]+[ \t]*:[^=]") |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
797 (not (eq type 'declaration))) |
5723 | 798 (search-forward ":" nil t)) |
799 (delete-horizontal-space) | |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
800 (cond (; Some things should not be indented |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
801 (or (and (eq type 'declaration) (looking-at pascal-declaration-re)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
802 (eq type 'cpp)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
803 ()) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
804 (; Other things should have no extra indent |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
805 (looking-at pascal-noindent-re) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
806 (indent-to ind)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
807 (; Nested functions should be indented |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
808 (looking-at pascal-defun-re) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
809 (if (and pascal-indent-nested-functions |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
810 (eq type 'defun)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
811 (indent-to (+ ind pascal-indent-level)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
812 (indent-to ind))) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
813 (; But most lines are treated this way |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
814 (indent-to (eval (cdr (assoc type pascal-indent-alist)))) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
815 )))) |
4934 | 816 |
5723 | 817 (defun pascal-calculate-indent () |
818 "Calculate the indent of the current Pascal line. | |
819 Return a list of two elements: (INDENT-TYPE INDENT-LEVEL)." | |
820 (save-excursion | |
15230
307b7c77a5e5
(pascal-end-of-statement, pascal-calculate-indent):
Richard M. Stallman <rms@gnu.org>
parents:
14776
diff
changeset
|
821 (let* ((parse-sexp-ignore-comments t) |
307b7c77a5e5
(pascal-end-of-statement, pascal-calculate-indent):
Richard M. Stallman <rms@gnu.org>
parents:
14776
diff
changeset
|
822 (oldpos (point)) |
5723 | 823 (state (save-excursion (parse-partial-sexp (point-min) (point)))) |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
824 (nest 0) (par 0) (complete (looking-at "[ \t]*end\\>")) |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
825 (elsed (looking-at "[ \t]*else\\>")) (funccnt 0) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
826 (did-func (looking-at "[ \t]*\\(procedure\\|function\\)\\>")) |
5723 | 827 (type (catch 'nesting |
828 ;; Check if inside a string, comment or parenthesis | |
829 (cond ((nth 3 state) (throw 'nesting 'string)) | |
830 ((nth 4 state) (throw 'nesting 'comment)) | |
831 ((> (car state) 0) | |
832 (goto-char (scan-lists (point) -1 (car state))) | |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
833 (setq par (1+ (current-column)))) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
834 ((save-excursion (beginning-of-line) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
835 (eq (following-char) ?#)) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
836 (throw 'nesting 'cpp))) |
5723 | 837 ;; Loop until correct indent is found |
838 (while t | |
839 (backward-sexp 1) | |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
840 (cond (;--Escape from case statements |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
841 (and (looking-at "[A-Za-z0-9]+[ \t]*:[^=]") |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
842 (not complete) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
843 (save-excursion (skip-chars-backward " \t") |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
844 (bolp)) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
845 (= (save-excursion |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
846 (end-of-line) (backward-sexp) (point)) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
847 (point)) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
848 (> (save-excursion (goto-char oldpos) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
849 (beginning-of-line) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
850 (point)) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
851 (point))) |
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
852 (throw 'nesting 'caseblock)) |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
853 (;--Beginning of program |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
854 (looking-at pascal-progbeg-re) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
855 (throw 'nesting 'progbeg)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
856 (;--No known statements |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
857 (bobp) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
858 (throw 'nesting 'progbeg)) |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
859 (;--Nest block outwards |
5723 | 860 (looking-at pascal-beg-block-re) |
861 (if (= nest 0) | |
862 (cond ((looking-at "case\\>") | |
863 (throw 'nesting 'case)) | |
864 ((looking-at "record\\>") | |
865 (throw 'nesting 'declaration)) | |
6153
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
866 (t (throw 'nesting 'block))) |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
867 (if (and (looking-at "record\\>") (= nest 1)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
868 (setq funccnt (1- funccnt))) |
5723 | 869 (setq nest (1- nest)))) |
870 (;--Nest block inwards | |
871 (looking-at pascal-end-block-re) | |
6153
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
872 (if (and (looking-at "end\\s ") |
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
873 elsed (not complete)) |
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
874 (throw 'nesting 'block)) |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
875 (if (= nest 0) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
876 (setq funccnt (1+ funccnt))) |
5723 | 877 (setq complete t |
878 nest (1+ nest))) | |
879 (;--Defun (or parameter list) | |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
880 (and (looking-at pascal-defun-re) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
881 (progn (setq funccnt (1- funccnt) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
882 did-func t) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
883 (or (bolp) (< funccnt 0)))) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
884 ;; Prevent searching whole buffer |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
885 (if (and (bolp) (>= funccnt 0)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
886 (throw 'nesting 'progbeg)) |
5723 | 887 (if (= 0 par) |
888 (throw 'nesting 'defun) | |
889 (setq par 0) | |
890 (let ((n 0)) | |
891 (while (re-search-forward | |
892 "\\(\\<record\\>\\)\\|\\<end\\>" | |
893 oldpos t) | |
894 (if (match-end 1) | |
895 (setq n (1+ n)) (setq n (1- n)))) | |
896 (if (> n 0) | |
897 (throw 'nesting 'declaration) | |
898 (throw 'nesting 'paramlist))))) | |
899 (;--Declaration part | |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
900 (and (looking-at pascal-declaration-re) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
901 (not did-func) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
902 (= funccnt 0)) |
6153
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
903 (if (save-excursion |
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
904 (goto-char oldpos) |
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
905 (forward-line -1) |
40e4038bd544
(pascal-calculate-indent): Fixed indentation bug
Richard M. Stallman <rms@gnu.org>
parents:
6123
diff
changeset
|
906 (looking-at "^[ \t]*$")) |
5723 | 907 (throw 'nesting 'unknown) |
908 (throw 'nesting 'declaration))) | |
909 (;--If, else or while statement | |
910 (and (not complete) | |
911 (looking-at pascal-sub-block-re)) | |
912 (throw 'nesting 'block)) | |
913 (;--Found complete statement | |
914 (save-excursion (forward-sexp 1) | |
915 (= (following-char) ?\;)) | |
916 (setq complete t)) | |
917 ))))) | |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
918 |
5723 | 919 ;; Return type of block and indent level. |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
920 (if (> par 0) ; Unclosed Parenthesis |
5723 | 921 (list 'contexp par) |
922 (list type (pascal-indent-level)))))) | |
4934 | 923 |
5723 | 924 (defun pascal-indent-level () |
925 "Return the indent-level the current statement has. | |
926 Do not count labels, case-statements or records." | |
4934 | 927 (save-excursion |
928 (beginning-of-line) | |
5723 | 929 (if (looking-at "[ \t]*[0-9a-zA-Z]+[ \t]*:[^=]") |
930 (search-forward ":" nil t) | |
931 (if (looking-at ".*=[ \t]*record\\>") | |
932 (search-forward "=" nil t))) | |
4934 | 933 (skip-chars-forward " \t") |
934 (current-column))) | |
935 | |
28976
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
936 (defun pascal-indent-comment () |
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
937 "Return indent for current comment." |
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
938 (save-excursion |
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
939 (re-search-backward "\\((\\*\\)\\|{" nil t) |
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
940 (if (match-beginning 1) |
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
941 (1+ (current-column)) |
cd57818019f8
(pascal-indent-alist, pascal-indent-comment): Changed
Gerd Moellmann <gerd@gnu.org>
parents:
27745
diff
changeset
|
942 (current-column)))) |
5723 | 943 |
944 (defun pascal-indent-case () | |
945 "Indent within case statements." | |
15230
307b7c77a5e5
(pascal-end-of-statement, pascal-calculate-indent):
Richard M. Stallman <rms@gnu.org>
parents:
14776
diff
changeset
|
946 (let ((savepos (point-marker)) |
307b7c77a5e5
(pascal-end-of-statement, pascal-calculate-indent):
Richard M. Stallman <rms@gnu.org>
parents:
14776
diff
changeset
|
947 (end (prog2 |
6316
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
948 (end-of-line) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
949 (point-marker) |
5723 | 950 (re-search-backward "\\<case\\>" nil t))) |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
951 (beg (point)) |
5723 | 952 (ind 0)) |
953 ;; Get right indent | |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
954 (while (< (point) end) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
955 (if (re-search-forward |
6316
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
956 "^[ \t]*[^ \t,:]+[ \t]*\\(,[ \t]*[^ \t,:]+[ \t]*\\)*:" |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
957 (marker-position end) 'move) |
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
958 (forward-char -1)) |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
959 (if (< (point) end) |
14776
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
960 (progn |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
961 (delete-horizontal-space) |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
962 (if (> (current-column) ind) |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
963 (setq ind (current-column))) |
d392e3ffa1bb
(pascal-declaration-end): Now locates the end of a parameterlist correctly.
Richard M. Stallman <rms@gnu.org>
parents:
14183
diff
changeset
|
964 (pascal-end-of-statement)))) |
5723 | 965 (goto-char beg) |
966 ;; Indent all case statements | |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
967 (while (< (point) end) |
6316
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
968 (if (re-search-forward |
10446
034609a036b1
(pascal-mode-map, pascal-outline-map):
Richard M. Stallman <rms@gnu.org>
parents:
9479
diff
changeset
|
969 "^[ \t]*[^][ \t,\\.:]+[ \t]*\\(,[ \t]*[^ \t,:]+[ \t]*\\)*:" |
6316
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
970 (marker-position end) 'move) |
5723 | 971 (forward-char -1)) |
972 (indent-to (1+ ind)) | |
973 (if (/= (following-char) ?:) | |
974 () | |
975 (forward-char 1) | |
976 (delete-horizontal-space) | |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
977 (insert " ")) |
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
978 (pascal-end-of-statement)) |
15230
307b7c77a5e5
(pascal-end-of-statement, pascal-calculate-indent):
Richard M. Stallman <rms@gnu.org>
parents:
14776
diff
changeset
|
979 (goto-char savepos))) |
5723 | 980 |
981 (defun pascal-indent-paramlist (&optional arg) | |
982 "Indent current line in parameterlist. | |
983 If optional arg is non-nil, just return the | |
984 indent of the current line in parameterlist." | |
985 (save-excursion | |
986 (let* ((oldpos (point)) | |
987 (stpos (progn (goto-char (scan-lists (point) -1 1)) (point))) | |
988 (stcol (1+ (current-column))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
989 (edpos (progn (pascal-declaration-end) |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
990 (search-backward ")" (point-at-bol) t) |
5723 | 991 (point))) |
992 (usevar (re-search-backward "\\<var\\>" stpos t))) | |
993 (if arg (progn | |
994 ;; If arg, just return indent | |
995 (goto-char oldpos) | |
996 (beginning-of-line) | |
997 (if (or (not usevar) (looking-at "[ \t]*var\\>")) | |
998 stcol (+ 4 stcol))) | |
999 (goto-char stpos) | |
1000 (forward-char 1) | |
1001 (delete-horizontal-space) | |
1002 (if (and usevar (not (looking-at "var\\>"))) | |
1003 (indent-to (+ 4 stcol))) | |
1004 (pascal-indent-declaration nil stpos edpos))))) | |
1005 | |
1006 (defun pascal-indent-declaration (&optional arg start end) | |
1007 "Indent current lines as declaration, lining up the `:'s or `='s." | |
1008 (let ((pos (point-marker))) | |
1009 (if (and (not (or arg start)) (not (pascal-declaration-beg))) | |
1010 () | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
1011 (let ((lineup (if (or (looking-at "\\<var\\>\\|\\<record\\>") arg start) |
5723 | 1012 ":" "=")) |
1013 (stpos (if start start | |
1014 (forward-word 2) (backward-word 1) (point))) | |
1015 (edpos (set-marker (make-marker) | |
1016 (if end end | |
1017 (max (progn (pascal-declaration-end) | |
1018 (point)) | |
1019 pos)))) | |
1020 ind) | |
1021 | |
1022 (goto-char stpos) | |
1023 ;; Indent lines in record block | |
1024 (if arg | |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
1025 (while (<= (point) edpos) |
5723 | 1026 (beginning-of-line) |
1027 (delete-horizontal-space) | |
1028 (if (looking-at "end\\>") | |
1029 (indent-to arg) | |
1030 (indent-to (+ arg pascal-indent-level))) | |
1031 (forward-line 1))) | |
1032 | |
1033 ;; Do lineup | |
1034 (setq ind (pascal-get-lineup-indent stpos edpos lineup)) | |
1035 (goto-char stpos) | |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
1036 (while (and (<= (point) edpos) (not (eobp))) |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1037 (if (search-forward lineup (point-at-eol) 'move) |
5723 | 1038 (forward-char -1)) |
1039 (delete-horizontal-space) | |
1040 (indent-to ind) | |
1041 (if (not (looking-at lineup)) | |
1042 (forward-line 1) ; No more indent if there is no : or = | |
1043 (forward-char 1) | |
1044 (delete-horizontal-space) | |
1045 (insert " ") | |
1046 ;; Indent record block | |
1047 (if (looking-at "record\\>") | |
1048 (pascal-indent-declaration (current-column))) | |
1049 (forward-line 1))))) | |
1050 | |
1051 ;; If arg - move point | |
1052 (if arg (forward-line -1) | |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
1053 (goto-char pos)))) |
5723 | 1054 |
1055 ; "Return the indent level that will line up several lines within the region | |
1056 ;from b to e nicely. The lineup string is str." | |
1057 (defun pascal-get-lineup-indent (b e str) | |
1058 (save-excursion | |
1059 (let ((ind 0) | |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1060 (reg (concat str "\\|\\(\\<record\\>\\)\\|" pascal-defun-re))) |
5723 | 1061 (goto-char b) |
1062 ;; Get rightmost position | |
1063 (while (< (point) e) | |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1064 (and (re-search-forward reg (min e (point-at-eol 2)) 'move) |
24944
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1065 (cond ((match-beginning 1) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1066 ;; Skip record blocks |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1067 (pascal-declaration-end)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1068 ((match-beginning 2) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1069 ;; We have entered a new procedure. Exit. |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1070 (goto-char e)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1071 (t |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1072 (goto-char (match-beginning 0)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1073 (skip-chars-backward " \t") |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1074 (if (> (current-column) ind) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1075 (setq ind (current-column))) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1076 (goto-char (match-end 0)) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1077 (end-of-line) |
052b3b8dcccc
(pascal-beg-of-defun): More intuitive behavior when having nested functons.
Richard M. Stallman <rms@gnu.org>
parents:
24118
diff
changeset
|
1078 )))) |
5723 | 1079 ;; In case no lineup was found |
1080 (if (> ind 0) | |
1081 (1+ ind) | |
1082 ;; No lineup-string found | |
1083 (goto-char b) | |
1084 (end-of-line) | |
1085 (skip-chars-backward " \t") | |
1086 (1+ (current-column)))))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
1087 |
5723 | 1088 |
4934 | 1089 |
5723 | 1090 ;;; |
1091 ;;; Completion | |
10534
38b5efae433a
(pascal-*-completion, pascal-comp-defun)
Richard M. Stallman <rms@gnu.org>
parents:
10446
diff
changeset
|
1092 |
5723 | 1093 (defun pascal-string-diff (str1 str2) |
1094 "Return index of first letter where STR1 and STR2 differs." | |
1095 (catch 'done | |
1096 (let ((diff 0)) | |
1097 (while t | |
1098 (if (or (> (1+ diff) (length str1)) | |
1099 (> (1+ diff) (length str2))) | |
1100 (throw 'done diff)) | |
1101 (or (equal (aref str1 diff) (aref str2 diff)) | |
1102 (throw 'done diff)) | |
1103 (setq diff (1+ diff)))))) | |
1104 | |
1105 ;; Calculate all possible completions for functions if argument is `function', | |
1106 ;; completions for procedures if argument is `procedure' or both functions and | |
1107 ;; procedures otherwise. | |
1108 | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1109 (defun pascal-func-completion (type pascal-str) |
5723 | 1110 ;; Build regular expression for function/procedure names |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1111 (save-excursion |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1112 (if (string= pascal-str "") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1113 (setq pascal-str "[a-zA-Z_]")) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1114 (let ((pascal-str (concat (cond |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1115 ((eq type 'procedure) "\\<\\(procedure\\)\\s +") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1116 ((eq type 'function) "\\<\\(function\\)\\s +") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1117 (t "\\<\\(function\\|procedure\\)\\s +")) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1118 "\\<\\(" pascal-str "[a-zA-Z0-9_.]*\\)\\>")) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1119 (pascal-all ()) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1120 match) |
106378
f7a46a812653
* progmodes/pascal.el: Require CL when compiling (for lexical-let).
Juanma Barranquero <lekktu@gmail.com>
parents:
106376
diff
changeset
|
1121 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1122 (if (not (looking-at "\\<\\(function\\|procedure\\)\\>")) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1123 (re-search-backward "\\<\\(function\\|procedure\\)\\>" nil t)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1124 (forward-char 1) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
1125 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1126 ;; Search through all reachable functions |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1127 (while (pascal-beg-of-defun) |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1128 (if (re-search-forward pascal-str (point-at-eol) t) |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1129 (progn (setq match (buffer-substring (match-beginning 2) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1130 (match-end 2))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1131 (push match pascal-all))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1132 (goto-char (match-beginning 0))) |
5723 | 1133 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1134 pascal-all))) |
5723 | 1135 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1136 (defun pascal-get-completion-decl (pascal-str) |
5723 | 1137 ;; Macro for searching through current declaration (var, type or const) |
19148
7c41b30f50ce
(pascal-mode-syntax-table): _ is now a symbol constituent.
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
1138 ;; for matches of `str' and adding the occurrence to `all' |
5723 | 1139 (let ((end (save-excursion (pascal-declaration-end) |
1140 (point))) | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1141 (pascal-all ()) |
5723 | 1142 match) |
1143 ;; Traverse lines | |
1144 (while (< (point) end) | |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1145 (if (re-search-forward "[:=]" (point-at-eol) t) |
5723 | 1146 ;; Traverse current line |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
1147 (while (and (re-search-backward |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
1148 (concat "\\((\\|\\<\\(var\\|type\\|const\\)\\>\\)\\|" |
5723 | 1149 pascal-symbol-re) |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1150 (point-at-bol) t) |
5723 | 1151 (not (match-end 1))) |
1152 (setq match (buffer-substring (match-beginning 0) (match-end 0))) | |
10534
38b5efae433a
(pascal-*-completion, pascal-comp-defun)
Richard M. Stallman <rms@gnu.org>
parents:
10446
diff
changeset
|
1153 (if (string-match (concat "\\<" pascal-str) match) |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1154 (push match pascal-all)))) |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1155 (if (re-search-forward "\\<record\\>" (point-at-eol) t) |
5723 | 1156 (pascal-declaration-end) |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1157 (forward-line 1))) |
5723 | 1158 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1159 pascal-all)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1160 |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1161 (defun pascal-type-completion (pascal-str) |
5723 | 1162 "Calculate all possible completions for types." |
1163 (let ((start (point)) | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1164 (pascal-all ()) |
5723 | 1165 goon) |
1166 ;; Search for all reachable type declarations | |
1167 (while (or (pascal-beg-of-defun) | |
1168 (setq goon (not goon))) | |
1169 (save-excursion | |
1170 (if (and (< start (prog1 (save-excursion (pascal-end-of-defun) | |
1171 (point)) | |
1172 (forward-char 1))) | |
1173 (re-search-forward | |
8689
499bf32bfd9b
(pascal-auto-lineup): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
6942
diff
changeset
|
1174 "\\<type\\>\\|\\<\\(begin\\|function\\|procedure\\)\\>" |
5723 | 1175 start t) |
1176 (not (match-end 1))) | |
1177 ;; Check current type declaration | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1178 (setq pascal-all |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1179 (nconc (pascal-get-completion-decl pascal-str) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1180 pascal-all))))) |
5723 | 1181 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1182 pascal-all)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1183 |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1184 (defun pascal-var-completion (prefix) |
5723 | 1185 "Calculate all possible completions for variables (or constants)." |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1186 (save-excursion |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1187 (let ((start (point)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1188 (pascal-all ()) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1189 goon twice) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1190 ;; Search for all reachable var declarations |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1191 (while (or (pascal-beg-of-defun) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1192 (setq goon (not goon))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1193 (save-excursion |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1194 (if (> start (prog1 (save-excursion (pascal-end-of-defun) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1195 (point)))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1196 () ; Declarations not reachable |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1197 (if (search-forward "(" (point-at-eol) t) |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1198 ;; Check parameterlist |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1199 ;; FIXME: pascal-get-completion-decl doesn't understand |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1200 ;; the var declarations in parameter lists :-( |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1201 (setq pascal-all |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1202 (nconc (pascal-get-completion-decl prefix) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1203 pascal-all))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1204 (setq twice 2) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1205 (while (>= (setq twice (1- twice)) 0) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1206 (cond |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1207 ((and (re-search-forward |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1208 (concat "\\<\\(var\\|const\\)\\>\\|" |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1209 "\\<\\(begin\\|function\\|procedure\\)\\>") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1210 start t) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1211 (not (match-end 2))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1212 ;; Check var/const declarations |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1213 (setq pascal-all |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1214 (nconc (pascal-get-completion-decl prefix) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1215 pascal-all))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1216 ((match-end 2) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1217 (setq twice 0))))))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1218 pascal-all))) |
5723 | 1219 |
1220 | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1221 (defun pascal-keyword-completion (keyword-list pascal-str) |
5723 | 1222 "Give list of all possible completions of keywords in KEYWORD-LIST." |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1223 (let ((pascal-all ())) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1224 (dolist (s keyword-list) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1225 (if (string-match (concat "\\<" pascal-str) s) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1226 (push s pascal-all))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1227 pascal-all)) |
5723 | 1228 |
1229 ;; Function passed to completing-read, try-completion or | |
1230 ;; all-completions to get completion on STR. If predicate is non-nil, | |
1231 ;; it must be a function to be called for every match to check if this | |
1232 ;; should really be a match. If flag is t, the function returns a list | |
1233 ;; of all possible completions. If it is nil it returns a string, the | |
1234 ;; longest possible completion, or t if STR is an exact match. If flag | |
1235 ;; is 'lambda, the function returns t if STR is an exact match, nil | |
1236 ;; otherwise. | |
1237 | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1238 (defvar pascal-completion-cache nil) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
1239 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1240 (defun pascal-completion (pascal-str pascal-pred pascal-flag) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1241 (let ((all (car pascal-completion-cache))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1242 ;; Check the cache's freshness. |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1243 (unless (and pascal-completion-cache |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1244 (string-prefix-p (nth 1 pascal-completion-cache) pascal-str) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1245 (eq (current-buffer) (nth 2 pascal-completion-cache)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1246 (eq (field-beginning) (nth 3 pascal-completion-cache))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1247 (let ((state (car (pascal-calculate-indent)))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1248 (setq all |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1249 ;; Determine what should be completed |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1250 (cond |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1251 ( ;--Within a declaration or parameterlist |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1252 (or (eq state 'declaration) (eq state 'paramlist) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1253 (and (eq state 'defun) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1254 (save-excursion |
111435
810cef5c0eee
Replace unneeded compatibility definitions with point-at-bol, point-at-eol.
Glenn Morris <rgm@gnu.org>
parents:
110447
diff
changeset
|
1255 (re-search-backward ")[ \t]*:" (point-at-bol) t)))) |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1256 (if (or (eq state 'paramlist) (eq state 'defun)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1257 (pascal-beg-of-defun)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1258 (nconc |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1259 (pascal-type-completion pascal-str) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1260 (pascal-keyword-completion pascal-type-keywords pascal-str))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1261 ( ;--Starting a new statement |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1262 (and (not (eq state 'contexp)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1263 (save-excursion |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1264 (skip-chars-backward "a-zA-Z0-9_.") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1265 (backward-sexp 1) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1266 (or (looking-at pascal-nosemi-re) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1267 (progn |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1268 (forward-sexp 1) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1269 (looking-at "\\s *\\(;\\|:[^=]\\)"))))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1270 (nconc |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1271 (pascal-var-completion pascal-str) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1272 (pascal-func-completion 'procedure pascal-str) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1273 (pascal-keyword-completion pascal-start-keywords pascal-str))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1274 (t ;--Anywhere else |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1275 (nconc |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1276 (pascal-var-completion pascal-str) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1277 (pascal-func-completion 'function pascal-str) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1278 (pascal-keyword-completion pascal-separator-keywords |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1279 pascal-str))))) |
4934 | 1280 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1281 (setq pascal-completion-cache |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1282 (list all pascal-str (current-buffer) (field-beginning))))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1283 |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1284 ;; Now we have built a list of all matches. Give response to caller |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1285 (complete-with-action pascal-flag all pascal-str pascal-pred))) |
5723 | 1286 |
1287 (defvar pascal-last-word-numb 0) | |
1288 (defvar pascal-last-word-shown nil) | |
1289 (defvar pascal-last-completions nil) | |
1290 | |
1291 (defun pascal-complete-word () | |
1292 "Complete word at current point. | |
1293 \(See also `pascal-toggle-completions', `pascal-type-keywords', | |
6316
1032840397be
(pascal-indent-case): Handle comma separated list.
Richard M. Stallman <rms@gnu.org>
parents:
6153
diff
changeset
|
1294 `pascal-start-keywords' and `pascal-separator-keywords'.)" |
5723 | 1295 (interactive) |
1296 (let* ((b (save-excursion (skip-chars-backward "a-zA-Z0-9_") (point))) | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1297 (e (save-excursion (skip-chars-forward "a-zA-Z0-9_") (point)))) |
5723 | 1298 |
1299 ;; Toggle-completions inserts whole labels | |
1300 (if pascal-toggle-completions | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1301 (let* ((pascal-str (buffer-substring b e)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1302 (allcomp (if (and pascal-toggle-completions |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1303 (string= pascal-last-word-shown pascal-str)) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1304 pascal-last-completions |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1305 (all-completions pascal-str 'pascal-completion)))) |
5723 | 1306 ;; Update entry number in list |
1307 (setq pascal-last-completions allcomp | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47263
diff
changeset
|
1308 pascal-last-word-numb |
5723 | 1309 (if (>= pascal-last-word-numb (1- (length allcomp))) |
1310 0 | |
1311 (1+ pascal-last-word-numb))) | |
1312 (setq pascal-last-word-shown (elt allcomp pascal-last-word-numb)) | |
1313 ;; Display next match or same string if no match was found | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1314 (if allcomp |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1315 (progn |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1316 (goto-char e) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1317 (insert-before-markers pascal-last-word-shown) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1318 (delete-region b e)) |
5723 | 1319 (message "(No match)"))) |
14000
36dc9ede3562
(pascal-auto-newline, pascal-mode, electric-pascal-hash):
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
1320 ;; The other form of completion does not necessarily do that. |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1321 (completion-in-region b e 'pascal-completion)))) |
5723 | 1322 |
1323 (defun pascal-show-completions () | |
1324 "Show all possible completions at current point." | |
1325 (interactive) | |
1326 (let* ((b (save-excursion (skip-chars-backward "a-zA-Z0-9_") (point))) | |
1327 (e (save-excursion (skip-chars-forward "a-zA-Z0-9_") (point))) | |
10534
38b5efae433a
(pascal-*-completion, pascal-comp-defun)
Richard M. Stallman <rms@gnu.org>
parents:
10446
diff
changeset
|
1328 (pascal-str (buffer-substring b e)) |
5723 | 1329 (allcomp (if (and pascal-toggle-completions |
10534
38b5efae433a
(pascal-*-completion, pascal-comp-defun)
Richard M. Stallman <rms@gnu.org>
parents:
10446
diff
changeset
|
1330 (string= pascal-last-word-shown pascal-str)) |
5723 | 1331 pascal-last-completions |
10534
38b5efae433a
(pascal-*-completion, pascal-comp-defun)
Richard M. Stallman <rms@gnu.org>
parents:
10446
diff
changeset
|
1332 (all-completions pascal-str 'pascal-completion)))) |
5723 | 1333 ;; Show possible completions in a temporary buffer. |
1334 (with-output-to-temp-buffer "*Completions*" | |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65981
diff
changeset
|
1335 (display-completion-list allcomp pascal-str)) |
5723 | 1336 ;; Wait for a keypress. Then delete *Completion* window |
1337 (momentary-string-display "" (point)) | |
1338 (delete-window (get-buffer-window (get-buffer "*Completions*"))))) | |
1339 | |
1340 | |
1341 (defun pascal-get-default-symbol () | |
1342 "Return symbol around current point as a string." | |
1343 (save-excursion | |
1344 (buffer-substring (progn | |
1345 (skip-chars-backward " \t") | |
1346 (skip-chars-backward "a-zA-Z0-9_") | |
1347 (point)) | |
1348 (progn | |
1349 (skip-chars-forward "a-zA-Z0-9_") | |
1350 (point))))) | |
1351 | |
1352 (defun pascal-build-defun-re (str &optional arg) | |
1353 "Return function/procedure starting with STR as regular expression. | |
1354 With optional second arg non-nil, STR is the complete name of the instruction." | |
1355 (if arg | |
1356 (concat "^\\(function\\|procedure\\)[ \t]+\\(" str "\\)\\>") | |
1357 (concat "^\\(function\\|procedure\\)[ \t]+\\(" str "[a-zA-Z0-9_]*\\)\\>"))) | |
1358 | |
1359 ;; Function passed to completing-read, try-completion or | |
1360 ;; all-completions to get completion on any function name. If | |
1361 ;; predicate is non-nil, it must be a function to be called for every | |
1362 ;; match to check if this should really be a match. If flag is t, the | |
1363 ;; function returns a list of all possible completions. If it is nil | |
1364 ;; it returns a string, the longest possible completion, or t if STR | |
1365 ;; is an exact match. If flag is 'lambda, the function returns t if | |
1366 ;; STR is an exact match, nil otherwise. | |
1367 | |
10534
38b5efae433a
(pascal-*-completion, pascal-comp-defun)
Richard M. Stallman <rms@gnu.org>
parents:
10446
diff
changeset
|
1368 (defun pascal-comp-defun (pascal-str pascal-pred pascal-flag) |
5723 | 1369 (save-excursion |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1370 (let ((pascal-all nil)) |
5723 | 1371 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1372 ;; Build regular expression for functions |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1373 (let ((pascal-str (pascal-build-defun-re (if (string= pascal-str "") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1374 "[a-zA-Z_]" |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1375 pascal-str)))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1376 (goto-char (point-min)) |
106378
f7a46a812653
* progmodes/pascal.el: Require CL when compiling (for lexical-let).
Juanma Barranquero <lekktu@gmail.com>
parents:
106376
diff
changeset
|
1377 |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1378 ;; Build a list of all possible completions |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1379 (while (re-search-forward pascal-str nil t) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1380 (push (match-string 2) pascal-all))) |
5723 | 1381 |
1382 ;; Now we have built a list of all matches. Give response to caller | |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1383 (complete-with-action pascal-flag pascal-all pascal-str pascal-pred)))) |
5723 | 1384 |
1385 (defun pascal-goto-defun () | |
1386 "Move to specified Pascal function/procedure. | |
1387 The default is a name found in the buffer around point." | |
1388 (interactive) | |
1389 (let* ((default (pascal-get-default-symbol)) | |
1390 (default (if (pascal-comp-defun default nil 'lambda) | |
1391 default "")) | |
106378
f7a46a812653
* progmodes/pascal.el: Require CL when compiling (for lexical-let).
Juanma Barranquero <lekktu@gmail.com>
parents:
106376
diff
changeset
|
1392 (label |
106376
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1393 ;; Do completion with default |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1394 (completing-read (if (not (string= default "")) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1395 (concat "Label (default " default "): ") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1396 "Label: ") |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1397 ;; Complete with the defuns found in the |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1398 ;; current-buffer. |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1399 (lexical-let ((buf (current-buffer))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1400 (lambda (s p a) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1401 (with-current-buffer buf |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1402 (pascal-comp-defun s p a)))) |
642af15d3e89
Use completion-in-buffer and remove uses of dynamic scoping.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104395
diff
changeset
|
1403 nil t ""))) |
5723 | 1404 ;; If there was no response on prompt, use default value |
1405 (if (string= label "") | |
1406 (setq label default)) | |
1407 ;; Goto right place in buffer if label is not an empty string | |
1408 (or (string= label "") | |
1409 (progn | |
1410 (goto-char (point-min)) | |
1411 (re-search-forward (pascal-build-defun-re label t)) | |
1412 (beginning-of-line))))) | |
1413 | |
1414 | |
4934 | 1415 |
5723 | 1416 ;;; |
1417 ;;; Pascal-outline-mode | |
1418 ;;; | |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1419 (defvar pascal-outline-map |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1420 (let ((map (make-sparse-keymap))) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1421 (if (fboundp 'set-keymap-name) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1422 (set-keymap-name pascal-outline-map 'pascal-outline-map)) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1423 (define-key map "\M-\C-a" 'pascal-outline-prev-defun) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1424 (define-key map "\M-\C-e" 'pascal-outline-next-defun) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1425 (define-key map "\C-c\C-d" 'pascal-outline-goto-defun) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1426 (define-key map "\C-c\C-s" 'pascal-show-all) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1427 (define-key map "\C-c\C-h" 'pascal-hide-other-defuns) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1428 map) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1429 "Keymap used in Pascal Outline mode.") |
5723 | 1430 |
104395
df3d3d6c4426
* net/newst-treeview.el (newsticker-groups-filename):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101002
diff
changeset
|
1431 (define-obsolete-function-alias 'pascal-outline 'pascal-outline-mode "22.1") |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1432 (define-minor-mode pascal-outline-mode |
5723 | 1433 "Outline-line minor mode for Pascal mode. |
1434 When in Pascal Outline mode, portions | |
1435 of the text being edited may be made invisible. \\<pascal-outline-map> | |
1436 | |
1437 Pascal Outline mode provides some additional commands. | |
1438 | |
1439 \\[pascal-outline-prev-defun]\ | |
1440 \t- Move to previous function/procedure, hiding everything else. | |
1441 \\[pascal-outline-next-defun]\ | |
1442 \t- Move to next function/procedure, hiding everything else. | |
1443 \\[pascal-outline-goto-defun]\ | |
1444 \t- Goto function/procedure prompted for in minibuffer, | |
1445 \t hide all other functions. | |
1446 \\[pascal-show-all]\t- Show the whole buffer. | |
1447 \\[pascal-hide-other-defuns]\ | |
1448 \t- Hide everything but the current function (function under the cursor). | |
1449 \\[pascal-outline]\t- Leave pascal-outline-mode." | |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1450 :init-value nil :lighter " Outl" :keymap pascal-outline-map |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1451 (add-to-invisibility-spec '(pascal . t)) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1452 (unless pascal-outline-mode |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1453 (pascal-show-all))) |
5723 | 1454 |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1455 (defun pascal-outline-change (b e hide) |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1456 (when (> e b) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1457 ;; We could try and optimize this in the case where the region is |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1458 ;; already hidden. But I'm not sure it's worth the trouble. |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1459 (remove-overlays b e 'invisible 'pascal) |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1460 (when hide |
65981
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1461 (let ((ol (make-overlay b e nil t nil))) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1462 (overlay-put ol 'invisible 'pascal) |
4a74f7c2bd7b
(pascal-mode-map): Move init into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65680
diff
changeset
|
1463 (overlay-put ol 'evaporate t))))) |
5723 | 1464 |
1465 (defun pascal-show-all () | |
1466 "Show all of the text in the buffer." | |
1467 (interactive) | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1468 (pascal-outline-change (point-min) (point-max) nil)) |
5723 | 1469 |
1470 (defun pascal-hide-other-defuns () | |
1471 "Show only the current defun." | |
1472 (interactive) | |
1473 (save-excursion | |
1474 (let ((beg (progn (if (not (looking-at "\\(function\\|procedure\\)\\>")) | |
1475 (pascal-beg-of-defun)) | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1476 (line-beginning-position))) |
5723 | 1477 (end (progn (pascal-end-of-defun) |
1478 (backward-sexp 1) | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1479 (line-beginning-position 2))) |
5723 | 1480 (opoint (point-min))) |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1481 ;; BEG at BOL. |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1482 ;; OPOINT at EOL. |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1483 ;; END at BOL. |
5723 | 1484 (goto-char (point-min)) |
1485 | |
1486 ;; Hide all functions before current function | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1487 (while (re-search-forward "^[ \t]*\\(function\\|procedure\\)\\>" |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1488 beg 'move) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1489 (pascal-outline-change opoint (line-end-position 0) t) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1490 (setq opoint (line-end-position)) |
5723 | 1491 ;; Functions may be nested |
1492 (if (> (progn (pascal-end-of-defun) (point)) beg) | |
1493 (goto-char opoint))) | |
1494 (if (> beg opoint) | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1495 (pascal-outline-change opoint (1- beg) t)) |
5723 | 1496 |
1497 ;; Show current function | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1498 (pascal-outline-change (1- beg) end nil) |
5723 | 1499 ;; Hide nested functions |
1500 (forward-char 1) | |
1501 (while (re-search-forward "^\\(function\\|procedure\\)\\>" end 'move) | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1502 (setq opoint (line-end-position)) |
5723 | 1503 (pascal-end-of-defun) |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1504 (pascal-outline-change opoint (line-end-position) t)) |
5723 | 1505 |
1506 (goto-char end) | |
1507 (setq opoint end) | |
1508 | |
1509 ;; Hide all function after current function | |
1510 (while (re-search-forward "^\\(function\\|procedure\\)\\>" nil 'move) | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1511 (pascal-outline-change opoint (line-end-position 0) t) |
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1512 (setq opoint (line-end-position)) |
5723 | 1513 (pascal-end-of-defun)) |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1514 (pascal-outline-change opoint (point-max) t) |
5723 | 1515 |
1516 ;; Hide main program | |
1517 (if (< (progn (forward-line -1) (point)) end) | |
4934 | 1518 (progn |
5723 | 1519 (goto-char beg) |
1520 (pascal-end-of-defun) | |
1521 (backward-sexp 1) | |
110447
2ecf65f18c7c
* lisp/progmodes/pascal.el (pascal-mode): Use define-derived-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1522 (pascal-outline-change (line-end-position) (point-max) t)))))) |
5723 | 1523 |
1524 (defun pascal-outline-next-defun () | |
1525 "Move to next function/procedure, hiding all others." | |
1526 (interactive) | |
1527 (pascal-end-of-defun) | |
1528 (pascal-hide-other-defuns)) | |
4934 | 1529 |
5723 | 1530 (defun pascal-outline-prev-defun () |
1531 "Move to previous function/procedure, hiding all others." | |
1532 (interactive) | |
1533 (pascal-beg-of-defun) | |
1534 (pascal-hide-other-defuns)) | |
4934 | 1535 |
5723 | 1536 (defun pascal-outline-goto-defun () |
1537 "Move to specified function/procedure, hiding all others." | |
1538 (interactive) | |
1539 (pascal-goto-defun) | |
1540 (pascal-hide-other-defuns)) | |
1541 | |
18383 | 1542 (provide 'pascal) |
1543 | |
5723 | 1544 ;;; pascal.el ends here |