branch: externals/wisi
commit 4d8af96acea502e315b5a3202acf028e3f07f5b5
Author: Stephen Leake <[email protected]>
Commit: Stephen Leake <[email protected]>
update to Ada mode version 5.0.1
new Ada mode keybinding: C-c ; comment-dwim
new Ada mode menu entries: comment-dwim, ada-reset-parser
misc bug fixes
ada-indent-opentoken is now a minor mode
new gpr mode keybinding: C-c C-o ff-find-other-file
packages/ada-mode/README: New file.
---
wisi-parse.el | 7 ++++++-
wisi.el | 13 +++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/wisi-parse.el b/wisi-parse.el
index 4497b39..bb3b60b 100755
--- a/wisi-parse.el
+++ b/wisi-parse.el
@@ -75,7 +75,12 @@
If a file needs more than this, it's probably an indication that
the grammar is excessively redundant.")
-(defvar wisi-debug)
+(defvar wisi-debug 0
+ "wisi debug mode:
+0 : normal - ignore parse errors, for indenting new code
+1 : report parse errors (for running tests)
+2 : show parse states, position point at parse errors, debug-on-error works in
parser
+3 : also show top 10 items of parser stack.")
(defun wisi-parse (automaton lexer)
"Parse input using the automaton specified in AUTOMATON.
diff --git a/wisi.el b/wisi.el
index faa1e3d..e327c18 100755
--- a/wisi.el
+++ b/wisi.el
@@ -38,8 +38,8 @@
;; that lets us find statement indent points from arbitrary places in
;; the code.
;;
-;; The grammar for Ada as represented by the EBNF in LRM Annex P is
-;; not LALR(1), so we use a generalized LALR(1) parser (see
+;; For example, the grammar for Ada as represented by the EBNF in LRM
+;; Annex P is not LALR(1), so we use a generalized LALR(1) parser (see
;; wisi-parse, wisi-compile).
;;
;; The parser actions cache indentation and other information as text
@@ -120,7 +120,7 @@
;;;; grammar compiler and parser
;;
;; Since we are using a generalized LALR(1) parser, we cannot use any
-;; of the wisent grammar functions. We use the OpenToken Ada package
+;; of the wisent grammar functions. We use OpenToken wisi-generate
;; to compile BNF to Elisp source (similar to
;; semantic-grammar-create-package), and wisi-compile-grammar to
;; compile that to the parser table.
@@ -443,13 +443,6 @@ Also invalidate the Emacs syntax cache."
If accessing cache at a marker for a token as set by `wisi-cache-tokens', POS
must be (1- mark)."
(get-text-property pos 'wisi-cache))
-(defvar wisi-debug 0
- "wisi debug mode:
-0 : normal - ignore parse errors, for indenting new code
-1 : report parse errors (for running tests)
-2 : show parse states, position point at parse errors, debug-on-error works in
parser
-3 : also show top 10 items of parser stack.")
-
(defvar-local wisi-parse-error-msg nil)
(defun wisi-goto-error ()