fix panic off-by-one-error
This commit is contained in:
parent
0eb212dd45
commit
942f55fb39
|
@ -328,9 +328,12 @@
|
|||
(array/push (ast :data) (capture nonbinding parser))
|
||||
ast)
|
||||
|
||||
|
||||
### XXX: We've got an off-by-one error here
|
||||
# We're expecting a terminator, we panic until we get to a terminator, and we then return back to something that expects a terminator, and now we've started parsing again *at the terminator*
|
||||
(defn- terminator [parser]
|
||||
(if-not (terminates? parser) (panic parser "expected terminator"))
|
||||
(if-not (terminates? parser)
|
||||
# this line panics, captures the panic, advances the parser, and re-throws the error
|
||||
(try (panic parser "expected terminator") ([e] (advance parser) (error e))))
|
||||
(advance parser)
|
||||
(while (terminates? parser) (advance parser)))
|
||||
|
||||
|
@ -511,14 +514,16 @@
|
|||
(import ./scanner :as s)
|
||||
(do
|
||||
#(comment
|
||||
(def source "when {
|
||||
foo -> bar
|
||||
(def source `when {
|
||||
foo -> bar quux
|
||||
bar -> baz
|
||||
}
|
||||
")
|
||||
`)
|
||||
(def scanned (s/scan source))
|
||||
(def a-parser (new-parser scanned))
|
||||
(def parsed (whenn a-parser))
|
||||
(-> parsed)
|
||||
# (map (fn [t] (t :type)) (scanned :tokens))
|
||||
)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user