*** empty log message ***
[m17n/m17n-lib-cs.git] / xex.xml
diff --git a/xex.xml b/xex.xml
index 49f71cb..6f24c55 100644 (file)
--- a/xex.xml
+++ b/xex.xml
@@ -1,34 +1,31 @@
 <?xml version='1.0'?>
-<expr>
+<expr xmlns="http://www.m17n.org/MIM">
   <defun fname="factorial">
-    <args><variable vname="x"/></args>
-    <body>
-      <if><lt><variable vname="x"/><integer>2</integer></lt>
-       <variable vname="x"/>
-       <mul>
-         <variable vname="x"/>
-         <funcall fname="factorial">
-           <sub vname="x"><integer>1</integer></sub>
-         </funcall>
-       </mul>
-      </if>
-    </body>
+    <args><fixed vname="x"/></args>
+    <if><lt><varref vname="x"/><integer>2</integer></lt>
+      <varref vname="x"/>
+      <mul>
+       <varref vname="x"/>
+       <funcall fname="factorial">
+         <sub vname="x"><integer>1</integer></sub>
+       </funcall>
+      </mul>
+    </if>
   </defun>
 
   <defun fname="temp">
-    <args-unevalled><variable vname="x"/>
-      <optional/><variable vname="y"/>
-      <rest/><variable vname="rest"/>
+    <args-unevalled>
+      <fixed vname="x"/>
+      <optional vname="y"/>
+      <rest vname="rest"/>
     </args-unevalled>
-    <body>
-      <list><variable vname="x"/></list>
-    </body>
+    <eval><varref vname="x"/></eval>
   </defun>
 
   <set vname="x"><integer>10</integer></set>
   <set vname="str"><string>ABC</string></set>
   <append>
-    <funcall fname="factorial"><variable vname="x"/></funcall>
+    <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>
     <cond>
     </cond>
     <foreach vname="a">
       <list><integer>10</integer><integer>11</integer></list>
-      <add vname="x"><variable vname="a"/></add>
+      <add vname="x"><varref vname="a"/></add>
     </foreach>
-    <variable vname="x"/>
-    <eval><variable vname="x"/></eval>
+    <varref vname="x"/>
+    <eval><varref vname="x"/></eval>
     <eval>
       <eval>
-       <quote><add><variable vname="x"/><integer>1</integer></add></quote>
+       <quote><add><varref vname="x"/><integer>1</integer></add></quote>
       </eval>
     </eval>
   </append>