EXPR =
- '<expr>' [ DEFUN | DEFMACRO | DEFVAR | TERM ] * '</expr>'
+ '<expr>' [ DEFUN | DEFVAR | TERM ] * '</expr>'
-TERM = [ VAR | DIRECT | FUNCALL ]
-
-TYPE = 'integer' | 'string' | 'boolean' | 'symbol' | 'list'
+TERM = [ INT | STRING | SYMBOL | LIST | VAR | FUNCALL ]
DEFUN =
- '<defun fname="' FUNCNAME ? ">'
+ '<defun fname="' FNAME ? ">'
ARGS ?
TERM *
'</defun>'
ARGS =
- '<args>' SYMBOL * OPTIONAL ? REST ? '</args>'
- | '<unevaled-args>' SYMBOL * OPTIONAL ? REST ? '</args>'
+ '<args>' FIXED ? OPTIONAL ? REST ? '</args>'
+ | '<args-unevalled>' FIXED ? OPTIONAL ? REST ? '</args-unevalled>'
+
+FIXED =
+ '<fixed> VAR + '</fixed>'
OPTIONAL =
- '<optional/>' SYMBOL *
+ '<optional>' VAR + '<optional>'
REST =
- '<rest/>' SYMBOL
+ '<rest>' VAR '</rest>'
-DEFVAR = DEFVAR-INT DEFVAR-STR DEFVAR-BOOL
+DEFVAR = DEFVAR-INT DEFVAR-STR
DEFVAR-INT =
- '<defvar vname="' VARNAME '">'
+ '<defvar vname="' VNAME '">'
DESCRIPTION ?
INT ?
- <possible-value>[ INT | '<range>' INT INT '</range>' ] *</possible-value>
+ <possible-value> [ INT | '<range>' INT INT '</range>' ] *</possible-value>
'</defvar>'
DEFVAR-STR =
- '<defvar vname"' VARNAME '">'
+ '<defvar vname"' VNAME '">'
DESCRIPTION ?
STR ?
<possible-value> STR * </possible-value>
'</defvar>'
-DEFVAR-BOOL =
- '<defvar vname"' VARNAME '">'
- DESCRIPTION ?
- BOOL ?
- '</defvar>'
-
DESCRIPTION =
- '<description>' TEXT '</description>'
+ '<description>' [ TEXT | GETTEXT ] '</description>'
-VAR =
- '<variable vname="' NAME '"/>'
-
-DIRECT = INT STR BOOL SYMBOL LIST
+GETTEXT =
+ '<gettext>' TEXT '</gettext>'
INT =
'<integer>' INTEGER '</integer>'
STR =
'<string>' STRING '</string>'
-BOOL =
- '<boolean>' [ 'true' | 'false' ] </boolean>
SYMBOL =
'<symbol>' NAME '</symbol>'
LIST =
- '<list>' DIRECT * '</list>' | <list/>
+ '<list>' TERM * '</list>' | <list/>
+
+VAR =
+ '<varref vname="' VNAME '"/>'
FUNCALL =
- '<funcall fname="' PREDEFINED-FUNC-NAME '">' TERM * '</funcall>'
- | '<' PREDEFINED-FUNC-SYMBOL '>' TERM * '</' PREDEFINED-FUNC-SYMBOL '>'
- | '<' PREDEFINED-MACRO-SYMBOL '>' TERM * '</' PREDEFINED-MACRO-SYMBOL '>'
+ '<funcall fname="' FNAME '">' TERM * '</funcall>'
+ | '<' PREDEFINED '>' TERM * '</' PREDEFINED '>'
+ | '<' PREDEFINED 'vname="' VNAME '">' TERM * '</' PREDEFINED '>'
-PREDEFINED-FUNC-SYMBOL =
+PREDEFINED =
'set'
| 'and' | 'or' | 'not'
- | 'lt' | 'le' | 'eq' | 'ge' | 'gt'
- | 'noteq'
+ | 'lt' | 'le' | 'eq' | 'ge' | 'gt' | 'noteq'
| 'add' | 'sub' | 'mul' | 'div' | 'mod'
- | 'add-set' | 'sub-set' | 'mul-set' | 'div-set' | 'mod-set'
| 'logand' | 'logior' | 'logxor' | 'lsh'
- | 'logand-set' | 'logior-set' | 'logxor-set' | 'lsh-set'
- | 'append' | 'concat' | 'substr'
- | 'cons' | 'car' | 'cdr' | 'nth'
-
-PREDEFINED-FUNC-NAME =
- PREDEFINED-FUNC-SYMBOL
- | '='
- | '&&' | '||' | '!'
- | '<' | '<=' | '==' | '>=' | '>'
- | '!='
- | '+' | '-' | '*' | '/' | '%'
- | '+=' | '-=' | '*=' | '/=' | '%='
- | '&=' | '|=' | '~=' | '<<=' | '>>='
-
-PREDEFINED-MACRO-SYMBOL =
- 'case' | 'cond' | 'if' | 'progn' | 'when' | 'while'
-
-PREDEFINED-MACRO-NAME = PREDEFINED-MACRO-SYMBOL
+ | 'append' | 'concat' | 'nth' | 'copy' | 'ins' | 'del'
+ | 'progn' | 'if' | 'when' | 'cond'
+ | 'loop' | 'break' | 'while' | 'foreach'
+ | 'quote' | 'eval' | 'type'
+
+;; TERM has a value, and is evaluated to a TERM as below.
+;; INT has an integer value, and is evaluated to itself .
+;; STRING has a string value, and is evaluated to itself.
+;; SYMBOL has a symbol value, and is evaluated to itself.
+;; LIST has a list value and, is evaluated to itself.
+;; VAR has a value of TERM that is assigned to the variable,
+;; and is evalued to that TERM.
+;; FUNCALL has a value of TERM that is returned by that function,
+;; and is evalued to that TERM.
+
+INTTERM = INT | VAR (value is INT) | FUNCALL (return INT)
+STRTERM = STR | VAR (value is STR) | FUNCALL (return STR)
+LISTTERM = LIST | VAR (value is LIST) | FUNCALL (return LIST)
+ANYTERM = TERM
+
+;; Here after, when an argument is TERM, it is given to a function
+;; without being evaluted. Otherwise, an evaluated term is given.
+
+'<set vname="' VNAME '">' ANYTERM '</set>'
+'<add>' INTTERM + '</add>'
+'<add vname="' VNAME '">' INTTERM + '</add>'
+'<sub>' INTTERM + '</sub>'
+'<sub vname="' VNAME '">' INTTERM + '</sub>'
+'<mul>' INTTERM + '</mul>'
+'<mul vname="' VNAME '">' INTTERM + '</mul>'
+'<div>' INTTERM + '</div>'
+'<div vname="' VNAME '">' INTTERM + '</div>'
+'<mod>' INTTERM INTTERM '</mod>'
+'<mod vname="' VNAME '">' INTTERM '</div>'
+'<logand> INTTERM + '</logand>'
+'<logand vname="' VNAME '">' INTTERM + '</logand>'
+'<logior> INTTERM + '</logior>'
+'<logior> vname="' VNAME '">' INTTERM + '</logior>'
+'<logxor> INTTERM + '</logxor>'
+'<logxor> vname="' VNAME '">' INTTERM + '</logxor>'
+'<lsh>' INTTERM INTTERM '</lsh>'
+'<lsh vname="' VNAME '">' INTTERM '</mul>'
+'<lt>' INTTERM INTTERM '</lt>'
+'<le>' INTTERM INTTERM '</le>'
+'<eq>' INTTERM INTTERM '</eq>'
+'<noteq>' INTTERM INTTERM '</noteq>'
+'<ge>' INTTERM INTTERM '</ge>'
+'<gt>' INTTERM INTTERM '</gt>'
+'<append>' ANYTERM + '</append>'
+'<concat>' [ INTTERM | STRTERM | LISTTERM ] + '</concat>'
+'<nth>' INTTERM [ STRTERM | LISTTERM ] '</nth>'
+'<copy>' LISTTERM '</nth>'
+'<ins vname="' VNAME '">' INTTERM [ STRTERM | LISTTERM ] '</ins>'
+'<del vname="' VNAME '">' INTTERM INTTERM '</ins>'
+'<and>' TERM + '</and>'
+'<or>' TERM + '</or>'
+'<not>' TERM '</not>'
+'<progn>' TERM * '</progn>'
+'<if>' TERM TERM TERM ? '</if>'
+'<when>' TERM TERM * '</when>'
+'<cond>' LIST + '</cond>'
+'<loop>' TERM + '</loop>'
+'<while>' TERM + '</while>'
+'<foreach vname="' VNAME '">' TERM + '</foreach>'
+'<quote>' TERM '</quote>'
+'<eval>' TERM '</eval>'
+'<type>' ANYTERM '</type>'
projects / m17n / m17n-lib-cs.git / blobdiff