(grep-regexp-alist): Replace complex regexp

[gnu-emacs] / lisp / progmodes / ebnf-iso.el

diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index f36065bd558b60dfc2b89f666592b2de8dd39216..96ae2842863923b2c13489f9040eea2055878b56 100644 (file)
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -1,6 +1,6 @@
 ;;; ebnf-iso.el --- parser for ISO EBNF
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;; Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
@@ -23,8 +23,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -112,7 +112,7 @@
 ;;
 ;; ISO EBNF accepts the characters given by <character> production above,
 ;; HORIZONTAL TAB (^I), VERTICAL TAB (^K), NEWLINE (^J or ^M) and FORM FEED
-;; (^L), any other characters are illegal.  But ebnf2ps accepts also the
+;; (^L), any other characters are invalid.  But ebnf2ps accepts also the
 ;; european 8-bit accentuated characters (from \240 to \377) and underscore
 ;; (_).
 ;;
@@ -389,7 +389,7 @@
 
 
 (defun ebnf-iso-lex ()
-  "Lexical analyser for ISO EBNF.
+  "Lexical analyzer for ISO EBNF.
 
 Return a lexical token.
 
@@ -427,7 +427,7 @@ See documentation for variable `ebnf-iso-lex'."
        'end-of-input)
        ;; error
        ((eq token 'error)
-       (error "Illegal character"))
+       (error "Invalid character"))
        ;; integer
        ((eq token 'integer)
        (setq ebnf-iso-lex (ebnf-buffer-substring "0-9"))
@@ -527,7 +527,7 @@ See documentation for variable `ebnf-iso-lex'."
               (forward-char)
               (setq pair (1+ pair))))
            (t
-            (error "Illegal character"))
+            (error "Invalid character"))
            ))))