modified the val to var

diff --git a/src/livemlparser.cpp b/src/livemlparser.cpp
index 30d7caf..549fef3 100644 (file)
--- a/src/livemlparser.cpp
+++ b/src/livemlparser.cpp
@@ -201,7 +201,7 @@ PARAM_ACTOR(registerParameterType(paramActor))
   po = reg->addParameter();
   po->set(0, PARAM_TEXT);
   po = reg->addParameter();
-  po->set(1, PARAM_VAR, "val");
+  po->set(1, PARAM_VAR, "var");
 
   // event
   reg = addTagType("event");
@@ -267,8 +267,8 @@ PARAM_ACTOR(registerParameterType(paramActor))
   // exit
   reg = addTagType("exit");
 
-  // val
-  reg = addTagType("val");
+  // var
+  reg = addTagType("var");
   po = reg->addParameter();
   po->set(0, PARAM_VAR, "name");
   po = reg->addParameter();

diff --git a/src/livemlrunner.cpp b/src/livemlrunner.cpp
index 4611b6b..1cb1a0f 100644 (file)
--- a/src/livemlrunner.cpp
+++ b/src/livemlrunner.cpp
@@ -193,10 +193,10 @@ namespace lmlCommand
     return LML_CMDRTN_STOP;
   }
 
-  LML_CMDFUNC(val)
+  LML_CMDFUNC(var)
   {
     variable_size id = *(variable_size*)param.get(0);
-    DCODE(printf("val[%d] = ", id);)
+    DCODE(printf("var[%d] = ", id);)
     param.getVariable(id)->setFixedFloat(id, param.getFixedFloat(1));
 
     return LML_CMDRTN_NEXT;
@@ -275,7 +275,7 @@ LiveMLRunner::LiveMLRunner(LiveMLParser *p)
 //  registerCommand("if", lmlCommand::rif);
   registerCommand("wait", lmlCommand::wait);
   registerCommand("exit", lmlCommand::exit);
-  registerCommand("val", lmlCommand::val);
+  registerCommand("var", lmlCommand::var);
   registerCommand("callAction", lmlCommand::callAction);
   registerCommand("callEvent", lmlCommand::callEvent);
   DCODE(printf("LiveMLRunner::LiveMLRunner() end.\n");)

diff --git a/test/test.xml b/test/test.xml
index ee642ff..9fd7768 100644 (file)
--- a/test/test.xml
+++ b/test/test.xml
@@ -6,7 +6,7 @@
     </event>
     <!-- Local Actions -->
     <action name="1">
-      <active val="g.ACTOR">actor</active>
+      <active var="g.ACTOR">actor</active>
       <!-- <callAction target="$g.ACTOR">action2</callAction> -->
     </action>
     <action name="2">
@@ -25,7 +25,7 @@
     <action name="action">
       <exit/>
       <!--
-      <val name="a">10</val>
+      <var name="a">10</var>
       <repeat count="$a">
         <print>roop[actor.action]</print>
         <wait>1</wait>