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

removed ability to distinguish between unary and binary '-' operators in lexing function

Browse Source
This commit is contained in:
Richard Harrington 2013-07-11 15:25:38 -04:00
parent ee84ffedbf
commit 907d4d36d4
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hs_robotwar/core.clj
View File

@ -27,13 +27,6 @@
current-pos (- (count initial-line) (count line))
previous-token (:token (last result) "")
parsing-token? (not (empty? partial-token))
; a binary operator is any character on the operator list,
; unless it's a minus sign that is actually a unary operator
; because the token before it could not be a number
binary-op? #(and (operators %)
(or (not= % \-)
(digit? (last previous-token))
(registers previous-token)))
head (first line)
tail (rest line)]
(match [head parsing-token?]
@ -41,12 +34,10 @@
[(:or \; nil) false] result
[(:or \space \t) true ] (recur tail [] nil (close-partial-token))
[(:or \space \t) false] (recur tail [] nil result)
; if it's an operator of any kind and we're currently parsing a token,
; if it's an operator and we're currently parsing a token,
; close the partial token and recur on the same character.
[(_ :guard operators) true] (recur line [] nil (close-partial-token))
; we don't have to check here if the binary operator is false because
; if it weren't, it would have been caught by the less restrictive line above.
[(_ :guard binary-op?) _] (recur tail
[(_ :guard operators) true ] (recur line [] nil (close-partial-token))
[(_ :guard operators) false] (recur tail
[]
nil
(conj-with-metadata result (str head) current-pos))

3
test/hs_robotwar/core_test.clj
View File

@ -34,7 +34,8 @@
(def tokens3 [{:token "IF", :pos 0}
{:token "X", :pos 3}
{:token "<", :pos 4}
{:token "-5", :pos 5}
{:token "-", :pos 5}
{:token "5", :pos 6}
{:token "GOTO", :pos 8}
{:token "SCAN", :pos 13}])