X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=xex.txt;h=055a0ebf768d46aa0afe8baae08cf394f5cbf97b;hb=1886ee749147f8dd59897f13a3f4501ff483565a;hp=46d86ac49ea0ed44b3424b560896e61b7cd5b9bd;hpb=30c120fd525ae9e62a5ff580f23f3c5594379f45;p=m17n%2Fm17n-lib-cs.git

diff --git a/xex.txt b/xex.txt
index 46d86ac..055a0eb 100644
--- a/xex.txt
+++ b/xex.txt
@@ -139,6 +139,8 @@ LSH = '<lsh>' INTTERM INTTERM '</lsh>'
       | '<lsh vname="' VNAME '">' INTTERM '</mul>'
 LT = '<lt>' INTTERM INTTERM '</lt>'
 LE = '<le>' INTTERM INTTERM '</le>'
+GE = '<ge>' INTTERM INTTERM '</ge>'
+GT ='<gt>' INTTERM INTTERM '</gt>'
 
 EQ = '<eq>' XXXTERM + '</eq>'
 
@@ -148,10 +150,7 @@ EQ = '<eq>' XXXTERM + '</eq>'
 NOTEQ = '<noteq>' XXXTERM XXXTERM '</noteq>'
 
 ;; If XXXTERMs have the same object, the value is 0.  Othersise the
-;; value is 0.
-
-GE = '<ge>' INTTERM INTTERM '</ge>'
-GT ='<gt>' INTTERM INTTERM '</gt>'
+;; value is 1.
 
 APPEND = '<append>' XXXTERM + '</append>'
          | '<append vname=" VNAME '">' XXXTERM + '</append>'
@@ -169,20 +168,20 @@ CONCAT = '<concat>' [ STRTERM | INTTERM | LISTTERM ] + '</concat>'
          | '<concat vname=" VNAME '">' [ STRTERM | INTTERM | LISTTERM ] + '</concat>'
 
 ;; In the first form, the value is a STR made by concatinating all
-;; strings made from the arguments as below:
+;; the strings made from the arguments as below:
 ;;    STRTERM gives a string contained in it.
 ;;    INTTERM gives a string of a character whose code is INTTERM's integer.
-;;    LSTTERM must contain only INTTERMs, and give a string containing
+;;    LISTTERM must contain only INTTERMs, and give a string containing
 ;;      characters whose codes are INTTERM's integer.
 
-;; In the second form, the value of the variable VNAM must be a STR,
+;; In the second form, the value of the variable VNAME must be a STR,
 ;; and that STR is modified destructively by concatinating the
 ;; arguments in the same manner as the previous case.  The value is
 ;; the resulting STR.
 
 LENGTH = '<length>' [ STRTERM | LISTTERM ] '</length>'
 NTH = '<nth>' INTTERM [ STRTERM | LISTTERM ] '</nth>'
-COPY = '<copy>' LISTTERM '</nth>'
+COPY = '<copy>' [ STRTERM | LISTTERM ] '</nth>'
 INS = '<ins vname="' VNAME '">' INTTERM [ STRTERM | LISTTERM ] '</ins>'
 DEL = '<del vname="' VNAME '">' INTTERM INTTERM '</ins>'
 
@@ -204,7 +203,7 @@ NOT = '<not>' XXXTERM '</not>'
 EQUAL = '<equal>' XXXTERM1 XXXTERM2 '</equal>'
 
 ;; If XXX1 equals to XXX2, the value is 1.  Otherwise the value is 0.
-;; The equality of terms are decided as below:
+;; The equality of terms is decided as below:
 ;;   INT: INT1 equals to INT2 iff they contain the same integer values.
 ;;   STR: STR1 equals to STR2 iff they contain strings of the same characters.
 ;;   SYM: SYM1 equals to SSYM2 iff they contain the same symbol.
@@ -230,7 +229,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>'