X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=xex.txt;h=376ef8c90025511a3b053e8e9019ab1e0513bacf;hb=5c9e4aa354c1ac591c12b2c7c3bd67d6a025a176;hp=5670662e1edbf62ef5f61207883ea0099c4f5e79;hpb=a08ae385b628a922a32b605819bc52330199b224;p=m17n%2Fm17n-lib-cs.git

diff --git a/xex.txt b/xex.txt
index 5670662..376ef8c 100644
--- a/xex.txt
+++ b/xex.txt
@@ -4,13 +4,13 @@ EXPR =
 TERM = [ INT | STRING | SYMBOL | LIST | ERROR | VARREF | FUNCALL ]
 
 DEFUN =
-  '<defun fname="' FNAME ? ">'
+  '<defun fname="' FNAME '">'
   ARGS ?
   TERM *
   '</defun>'
 
 DEFMACRO =
-  '<defmacro fname="' FNAME ? ">'
+  '<defmacro fname="' FNAME '">'
   ARGS ?
   TERM *
   '</defmacro>'
@@ -230,7 +230,7 @@ WHEN = '<when>' TERM TERM * '</when>'
 COND = '<cond>' LIST + '</cond>'
 LOOP = '<loop>' TERM + '</loop>'
 WHILE = '<while>' TERM + '</while>'
-FOREACH = '<foreach vname="' VNAME '">' TERM + '</foreach>'
+FOREACH = '<foreach vname="' VNAME '">' [STRTERM | LISTTERM] TERM + '</foreach>'
 BREAK = '<break>' TERM ? '</break>'
 RETURN = '<return>' TERM ? '</return>'
 QUOTE = '<quote>' TERM '</quote>'