Apple-2-SW/robotwar
1
0
Fork 0
mirror of https://github.com/richardharrington/robotwar.git synced 2024-07-06 05:28:54 +00:00
Code Issues Projects Releases Wiki Activity

in the middle of trying to debug the addition operator

Browse Source
This commit is contained in:
Richard Harrington 2013-07-28 13:36:51 -04:00
parent d1a25796cf
commit bab5171d80
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rw/exec.clj
View File

@ -1,5 +1,6 @@
(ns rw.exec
(:require (rw [lexicon :as lexicon])))
(:require (rw [lexicon :as lexicon]))
(:use [clojure.pprint :only [pprint]]))
(def op-map (zipmap lexicon/op-commands
(map (fn [op]
@ -49,6 +50,7 @@
inc-instr-ptr #(assoc % :instr-ptr (inc instr-ptr))
skip-next-instr-ptr #(assoc % :instr-ptr (+ instr-ptr 2))
resolve #(resolve-arg % registers labels)]
;(pprint [command (op-map command) acc arg (resolve arg)])
(case command
"GOTO" (assoc state :instr-ptr (resolve arg))
"GOSUB" (assoc (assoc state :call-stack (conj call-stack (inc instr-ptr)))
@ -58,8 +60,13 @@
:instr-ptr
(peek call-stack))
("IF" ",") (inc-instr-ptr (assoc state :acc (resolve arg)))
("+" "-" "*" "/") (inc-instr-ptr (assoc state :acc (op-map (resolve arg))))
("=" ">" "<" "#") (if (op-map (resolve arg))
("+" "-" "*" "/") (do (pprint [(op-map command)
acc
(resolve arg)
state
(assoc state :acc ((op-map command) acc (resolve arg)))])
(inc-instr-ptr (assoc state :acc ((op-map command) acc (resolve arg)))))
("=" ">" "<" "#") (if ((op-map command) acc (resolve arg))
(inc-instr-ptr state)
(skip-next-instr-ptr state))
"TO" (let [return-state (inc-instr-ptr (assoc-in state [:registers unresolved-arg-val] acc))]