Merge pull request #1 from nyampass/feature/turn

add turn

resources/move2.ks

@@ -0,0 +1,6 @@
+move "right"
+move "test"
+move "left"
+move "up"
+move "down"
+move "back"

resources/turn.ks

@@ -0,0 +1,6 @@
+turn "left"
+turn "right"
+turn "forward"
+turn "left"
+turn "left"
+turn "right"

src/keystone/core.clj

@@ -11,9 +11,10 @@
   block ::= {stat}
   <stat> ::= <space> ( define | op | loop | functioncall | label | if | for name '=' exp ',' exp [',' exp] do block end | for namelist in explist do block end | function funcname funcbody | local function name funcbody | local namelist ['=' explist] ) <'\n'*>
   <space> ::= #\"\\s*\"
-  op ::= ( print | move ) <space> exp <space> 
+  op ::= ( print | move | turn ) <space> exp <space> 
   print ::= 'print'
   move ::= 'move'
+  turn ::= 'turn'
   define ::=  name <space> '=' <space> exp
   loop ::= 'loop' <space> exp <space> <'\n'*> block <'\n'*> <end>
   if ::= 'if' <space> exp <space> <'\n'*> block <'\n'*> <end>
@@ -169,7 +170,7 @@
                 (for [_ (range condition)]
                   (-eval args env))
                 (-eval rest env))
-        (if (contains? #{:print :move} op)
+        (if (contains? #{:print :move :turn} op)
           (concat [{:op op :args (-eval-exps args @env)}] (-eval rest env))
           (concat [code] (-eval rest env)))))))
 

test/keystone/eval_test.clj

@@ -5,9 +5,17 @@
 (testing "hello"
   (is (= (run (slurp "./resources/hello.ks")) [{:op :print :args '("hello")}])))
 
+(testing "move2"
+  (is (= (run (slurp "./resources/move2.ks")) 
+      [{:op :move :args '("right")} {:op :move :args '("test")} {:op :move :args '("left")} {:op :move :args '("up")} {:op :move :args '("down")} {:op :move :args '("back")}])))
+
 (testing "move"
   (is (= (run (slurp "./resources/move.ks"))
-         [{:op :move :args '("right")} {:op :move :args '("right")} {:op :move :args '("left")} {:op :move :args '("up")} {:op :move :args '("down")}])))
+        [{:op :move :args '("right")} {:op :move :args '("right")} {:op :move :args '("left")} {:op :move :args '("up")} {:op :move :args '("down")}])))
+
+(testing "turn"
+  (is (= (run (slurp "./resources/turn.ks"))
+        [{:op :turn :args '("left")} {:op :turn :args '("right")} {:op :turn :args '("forward")} {:op :turn :args '("left")} {:op :turn :args '("left")} {:op :turn :args '("right")}])))
 
 (testing "variable"
   (is (= (run (slurp "./resources/variable.ks"))