Apple-2-SW/robotwar
1
0
Fork 0
mirror of https://github.com/richardharrington/robotwar.git synced 2024-05-31 11:41:29 +00:00
Code Issues Projects Releases Wiki Activity

fixed bug in lexing operators -- still more bugs in lexer to fix

Browse Source
This commit is contained in:
Richard Harrington 2013-07-03 22:14:41 -04:00
parent f06ae14164
commit 87dfd37cc6
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hs_robotwar/core.clj
View File

@ -1,10 +1,5 @@
(ns hs-robotwar.core)
(defn add-column-metadata
[s n]
{:string s,
:column n})
(def registers (set (concat (map #(-> % char str) (range 65 91))
["AIM" "SHOT" "RADAR" "DAMAGE" "SPEEDX" "SPEEDY" "RANDOM" "INDEX"])))
@ -21,7 +16,8 @@
partial-token ""
pos 0
result []]
(let [conj-to-result (fn [s] (conj result (add-column-metadata s pos)))
(let [conj-with-metadata (fn [coll s n]
(conj coll {:string s, :column n}))
new-pos (fn [] (- (count initial-line) (count line)))
previous-token (last result)
parsing-token? (not (empty? partial-token))
@ -29,17 +25,28 @@
rest-of-line (rest line)]
(cond
(or (empty? line) (= \; first-char)) (if parsing-token?
(conj-to-result partial-token)
(conj-with-metadata result partial-token pos)
result)
(#{\space \tab} first-char) (if parsing-token?
(recur rest-of-line "" pos (conj-to-result partial-token))
(recur rest-of-line "" pos (conj-with-metadata result
partial-token
pos))
(recur rest-of-line "" pos result))
(= \- first-char) (when (and (int-str? (str (second line)))
(not (or (int-str? previous-token)
(registers previous-token))))
; if true => the minus sign is the beginning of a number
; when true => the minus sign is the beginning of a number
(recur rest-of-line (str first-char) (new-pos) result))
(operators first-char) (recur rest-of-line "" (new-pos) (conj-to-result (str first-char)))
(operators first-char) (if parsing-token?
(recur rest-of-line
""
(new-pos)
(conj-with-metadata (conj-with-metadata result partial-token pos)
(str first-char)
(new-pos)))
(recur rest-of-line "" (new-pos) (conj-with-metadata result
(str first-char)
(new-pos))))
:else (recur rest-of-line (str partial-token first-char) pos result)))))