X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=xex.txt;h=ced1f8006fe9b8580e7812f75b3c7c417c92ec89;hb=a00c135c6ed03fcb7e77dd090cd19dc1347cac72;hp=609284751f6183ad734a8d43fb6fd37e90c0d2cb;hpb=b4d84e254382583a716e778edbc3884bf2d9c9bd;p=m17n%2Fm17n-lib-cs.git

diff --git a/xex.txt b/xex.txt
index 6092847..ced1f80 100644
--- a/xex.txt
+++ b/xex.txt
@@ -11,14 +11,14 @@ DEFUN =
   TERM *
   '</defun>'
 
-DEFMACRO =
-  '<defmacro mname="' MACRONAME '">'
-  ARGS ?
-  TERM *
-  '</defmacro>'
-
 ARGS =
-  '<args>' SYMBOL * '</args>' | '<args/>'
+  '<args>' [ SYMBOL | VAR ] * OPTIONAL ? REST ? '</args>'
+
+OPTIONAL =
+  '<optional/>' [ SYMBOL | VAR ] *
+
+REST =
+  '<rest/>' [ SYMBOL | VAR ]
 
 DEFVAR = DEFVAR-INT DEFVAR-STR DEFVAR-BOOL
 
@@ -40,7 +40,6 @@ DEFVAR-BOOL =
   '<defvar vname"' VARNAME '">'
   DESCRIPTION ?
   BOOL ?
-  <possible-value> BOOL </possible-value>
   '</defvar>'
 
 DESCRIPTION =
@@ -52,20 +51,18 @@ VAR =
 DIRECT = INT STR BOOL SYMBOL LIST
 
 INT =
-  '<const type="integer">' INTEGER '</const>'
+  '<integer>' INTEGER '</integer>'
 STR =
-  '<const type="string">' STRING '</const>'
+  '<string>' STRING '</string>'
 BOOL =
-  '<const type="boolean">' [ 'true' | 'false' ] </const>
+  '<boolean>' [ 'true' | 'false' ] </boolean>
 SYMBOL =
-  '<const type="symbol">' NAME '</const>'
+  '<symbol>' NAME '</symbol>'
 LIST =
-  '<const type="list">' DIRECT * '</const>' | <const type="list"/>
+  '<list>' DIRECT * '</list>' | <list/>
 
 FUNCALL =
-  '<funcall id="' [ FUNCNAME | MACRONAME ] '">' TERM * '</funcall>'
-  | '<funcall fname="' PREDEFINED-FUNC-NAME '">' TERM * '</funcall>'
-  | '<funcall mname="' PREDEFINED-MACRO-NAME '">' TERM * '</funcall>'
+  '<funcall fname="' PREDEFINED-FUNC-NAME '">' TERM * '</funcall>'
   | '<' PREDEFINED-FUNC-SYMBOL '>' TERM * '</' PREDEFINED-FUNC-SYMBOL '>'
   | '<' PREDEFINED-MACRO-SYMBOL '>' TERM * '</' PREDEFINED-MACRO-SYMBOL '>'