From 773db3df0debc60901f68cb8d97e59f2a314cdde Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Fri, 18 Sep 2009 00:11:53 +0000
Subject: [PATCH] *** empty log message ***

---
 xex.txt |   46 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/xex.txt b/xex.txt
index 5e58f74..4a36efe 100644
--- a/xex.txt
+++ b/xex.txt
@@ -60,18 +60,16 @@ FUNCALL =
   | '<' PREDEFINED-FUNC-SYMBOL '>' TERM * '</' PREDEFINED-FUNC-SYMBOL '>'
 
 PREDEFINED-FUNC-SYMBOL =
-  'set'
-  | 'and' | 'or' | 'not'
-  | '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' | 'nth'  | 'copy' | 'ins' | 'del'
-  | 'progn' | 'if' | 'when' | 'cond'
-  | 'while' | 'for' | 'foreach'
-  | 'eval' | 'type'
+  SET
+  | AND | OR | NOT
+  | LT | LE | EQ | GE | GT
+  | NOTEQ
+  | ADD | SUB | MUL | DIV | MOD
+  | LOGAND | LOGIOR | LOGXOR | LSH
+  | APPEND | CONCAT | NTH  | COPY | INS | DEL
+  | PROGN | IF | WHEN | COND
+  | WHILE | FOR | FOREACH
+  | EVAL | TYPE
 
 PREDEFINED-FUNC-NAME =
   PREDEFINED-FUNC-SYMBOL
@@ -95,3 +93,27 @@ FALSE =
 ;; LIST is evaluated to itself.
 ;; VAR is evaluated to TERM that is set to that variable.
 ;; FUNCALL is evaluated to TERM returned by that function.
+
+SET =
+  '<set vname="' VARNAME '">' TERM '</set>'
+;; Set the variable of name VARNAME to TERM.
+
+AND =	;; arguments unevalled
+  '<and> TERM ... </and>
+OR (unevalled-arg ...) =
+  '<or> TERM ... </or>
+NOT (arg) =
+  '<not> TERM </not>
+
+LT (arg ...) =
+  '<lt>' TERM ... '</lt>'
+
+  | 'and' | 'or' | 'not'
+  | 'lt' | 'le' | 'eq' | 'ge' | 'gt'
+  | 'noteq'
+  | 'add' | 'sub' | 'mul' | 'div' | 'mod'
+  | 'logand' | 'logior' | 'logxor' | 'lsh'
+  | 'append' | 'concat' | 'nth'  | 'copy' | 'ins' | 'del'
+  | 'progn' | 'if' | 'when' | 'cond'
+  | 'while' | 'for' | 'foreach'
+  | 'eval' | 'type'
-- 
1.7.10.4