X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=xex.xml;h=4462666d287969879a799aff3f51cfc770a0fc40;hb=ddaf242f412b3aedd301517435f1f05f27df7182;hp=95511b0b684035cf2d446b75c5abd540c0ba3215;hpb=8a17409fb12437f25e19caa83c588d1f2e616ec1;p=m17n%2Fm17n-lib-cs.git

diff --git a/xex.xml b/xex.xml
index 95511b0..4462666 100644
--- a/xex.xml
+++ b/xex.xml
@@ -23,23 +23,28 @@
   </defun>
 
   <defun fname="looptest">
-    <args><fixed vname="l"/></args>
-    <foreach vname="term"><varref vname="l"/>
-      <eval><varref vname="term"/></eval>
-    </foreach>
+    <args-unevalled><fixed vname="l"/></args-unevalled>
+    <loop><loop>
+      <foreach vname="term"><varref vname="l"/>
+	<eval><varref vname="term"/></eval>
+      </foreach>
+    </loop></loop>
+    <symbol>looptest-finished</symbol>
   </defun>
 
-    <funcall fname="looptest">
-      <list>
-	<set vname="i"><integer>0</integer></set>
-	<return><symbol>returned</symbol></return>
-	<add vname="i"><integer>1</integer></add>
-	<varref vname="i"/>
-      </list>
-    </funcall>
   <set vname="x"><integer>10</integer></set>
   <set vname="str"><string>ABC</string></set>
   <append>
+    <catch><symbol>tag</symbol>
+      <funcall fname="looptest">
+	<list>
+	  <set vname="i"><integer>0</integer></set>
+	  <throw><symbol>tag</symbol><symbol>returned</symbol></throw>
+	  <add vname="i"><integer>1</integer></add>
+	  <varref vname="i"/>
+	</list>
+      </funcall>
+    </catch>
     <funcall fname="factorial"><varref vname="x"/></funcall>
     <ins vname="str"><integer>1</integer><string>123</string></ins>
     <del vname="str"><integer>2</integer><integer>4</integer></del>
@@ -51,7 +56,7 @@
     </cond>
     <foreach vname="a">
       <list><integer>10</integer><integer>11</integer></list>
-      <add vname="x"><varref vname="a"/></add>
+      <funcall fname="add" vname="x"><varref vname="a"/></funcall>
     </foreach>
     <varref vname="x"/>
     <eval><varref vname="x"/></eval>
@@ -60,5 +65,7 @@
 	<quote><add><varref vname="x"/><integer>1</integer></add></quote>
       </eval>
     </eval>
+    <concat><integer>?a</integer><integer>?b</integer></concat>
+    <quote><add><varref vname="x"/><integer>1</integer></add></quote>
   </append>
 </expr>