projects
/
m17n
/
m17n-lib-cs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[m17n/m17n-lib-cs.git]
/
xex.txt
diff --git
a/xex.txt
b/xex.txt
index
cdd2f9e
..
ced1f80
100644
(file)
--- a/
xex.txt
+++ b/
xex.txt
@@
-11,14
+11,14
@@
DEFUN =
TERM *
'</defun>'
TERM *
'</defun>'
-DEFMACRO =
- '<defmacro mname="' MACRONAME '">'
- ARGS ?
- TERM *
- '</defmacro>'
-
ARGS =
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
DEFVAR = DEFVAR-INT DEFVAR-STR DEFVAR-BOOL
@@
-51,20
+51,18
@@
VAR =
DIRECT = INT STR BOOL SYMBOL LIST
INT =
DIRECT = INT STR BOOL SYMBOL LIST
INT =
- '<const type="integer">' INTEGER '</const>'
+ '<integer>' INTEGER '</integer>'
STR =
STR =
- '<const type="string">' STRING '</const>'
+ '<string>' STRING '</string>'
BOOL =
BOOL =
- '<const type="boolean">' [ 'true' | 'false' ] </const>
+ '<boolean>' [ 'true' | 'false' ] </boolean>
SYMBOL =
SYMBOL =
- '<const type="symbol">' NAME '</const>'
+ '<symbol>' NAME '</symbol>'
LIST =
LIST =
- '<const type="list">' DIRECT * '</const>' | <const type="list"/>
+ '<list>' DIRECT * '</list>' | <list/>
FUNCALL =
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 '>'
| '<' PREDEFINED-FUNC-SYMBOL '>' TERM * '</' PREDEFINED-FUNC-SYMBOL '>'
| '<' PREDEFINED-MACRO-SYMBOL '>' TERM * '</' PREDEFINED-MACRO-SYMBOL '>'