diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-03 17:37:44 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-03 18:52:02 +0300 |
commit | c061a6e1c1d7e9d0d8659101f41e6e6c7960a35a (patch) | |
tree | 7e216fe413a17718fd96701a3116f31b65eab78c | |
parent | 65dc49e829ccc712c6b7f4114dcfeb7c0a0e90fb (diff) | |
download | mailfromd-c061a6e1c1d7e9d0d8659101f41e6e6c7960a35a.tar.gz mailfromd-c061a6e1c1d7e9d0d8659101f41e6e6c7960a35a.tar.bz2 |
Minor change
* doc/mailfromd.texi: Add new keywords.
* elisp/mfl-mode.el: Add new keywords.
* tests/prec01.at: Forgotten to add in 1026a8cc51d8c.
-rw-r--r-- | doc/mailfromd.texi | 7 | ||||
-rw-r--r-- | elisp/mfl-mode.el | 10 | ||||
-rw-r--r-- | tests/prec01.at | 47 |
3 files changed, 59 insertions, 5 deletions
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi index 35ec60a2..f9f8eba7 100644 --- a/doc/mailfromd.texi +++ b/doc/mailfromd.texi @@ -11769,11 +11769,14 @@ done words: @itemize @bullet +@item __defpreproc__ +@item __defstatedir__ @item __file__ @item __function__ @item __line__ @item __major__ @item __minor__ +@item __module__ @item __package__ @item __patch__ @item __preproc__ @@ -11785,6 +11788,7 @@ words: @item alias @item begin @item break +@item bye @item case @item catch @item const @@ -11806,7 +11810,8 @@ words: @item if @item import @item loop -@item matches +@item matches +@item module @item next @item not @item number diff --git a/elisp/mfl-mode.el b/elisp/mfl-mode.el index e93828b3..8d60cc6b 100644 --- a/elisp/mfl-mode.el +++ b/elisp/mfl-mode.el @@ -355,12 +355,12 @@ otherwise." (defconst mfl-keywords (eval-when-compile - (regexp-opt '("accept" "add" "and" "alias" "begin" "break" "case" + (regexp-opt '("accept" "add" "and" "alias" "begin" "break" "bye" "case" "catch" "const" "continue" "default" "delete" "discard" "do" "done" "echo" "end" "elif" "else" "fi" "fnmatches" "for" "from" "func" - "if" "import" "loop" "matches" "next" + "if" "import" "loop" "matches" "module" "next" "not" "on" "or" "pass" "precious" "prog" "reject" "replace" "return" "returns" "require" "set" "static" "switch" "tempfail" @@ -373,8 +373,10 @@ otherwise." (defconst mfl-constants (eval-when-compile - (regexp-opt '("__file__" "__function__" "__line__" "__major__" - "__minor__" "__package__" "__patch__" "__preproc__" + (regexp-opt '("__defpreproc__" "__defstatedir__" + "__file__" "__function__" "__line__" "__major__" + "__minor__" "__module__" "__package__" "__patch__" + "__preproc__" "__statedir__" "__version__") 'words))) (defconst mfl-type-names diff --git a/tests/prec01.at b/tests/prec01.at new file mode 100644 index 00000000..6a080526 --- /dev/null +++ b/tests/prec01.at @@ -0,0 +1,47 @@ +# This file is part of Mailfromd testsuite. -*- Autotest -*- +# Copyright (C) 2007, 2008, 2009 Sergey Poznyakoff +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +AT_SETUP([function precedence (dot concat)]) +AT_KEYWORDS([fprec prec prec01]) + +MF_CHECK_TEXT([ +# Test function precedence: calls without parentheses have the lowest +# precedence, calls with them have the highest. The test below +# should produce two lines: +# +# gnugnu +# gnuGNU + +set GNU "GNU" +set gnu "gnu" + +prog envfrom +do + echo tolower %GNU . toupper(%gnu) + echo tolower(%GNU) . toupper(%gnu) +done], +[], +[EX_OK], +[State envfrom: continue +], +[gnugnu +gnuGNU +]) + +AT_CLEANUP + + + |