diff --git a/janet/parser.janet b/janet/parser.janet index 2281565..80b5a56 100644 --- a/janet/parser.janet +++ b/janet/parser.janet @@ -858,7 +858,7 @@ (expect parser :pkg) (advance parser) (def name (-> parser pkg-name (get :data))) (expect parser :lbrace) (advance parser) - (accept-many parser ;terminators) + (while (separates? parser) (advance parser)) (def data @[]) (while (not (check parser :rbrace)) (when (check parser :eof) @@ -877,7 +877,7 @@ (def kw-ast {:type :keyword :data key :token origin}) (array/push data {:type :pair :data [key value] :token origin})) (panic parser "expected pkg term")) - (terminator parser)) + (separators parser)) (advance parser) @{:type :pkg :data data :token origin :name name}) ([err] err))) @@ -1113,15 +1113,15 @@ ) -# (do -(comment +(do +# (comment (def source ` -Foo :bar :Baz +pkg Foo {foo, bar, :baz 42} `) (def scanned (s/scan source)) (print "\n***NEW PARSE***\n") (def a-parser (new-parser scanned)) -(def parsed (expr a-parser)) +(def parsed (toplevel a-parser)) # (print (pp-ast parsed)) # (pp scanned)