Compare commits
2 Commits
94adf5e9d5
...
70b6a1dcd7
Author | SHA1 | Date | |
---|---|---|---|
|
70b6a1dcd7 | ||
|
23128902bc |
|
@ -163,6 +163,12 @@
|
|||
(advance parser)
|
||||
{:type :keyword :data (curr :literal) :token curr})
|
||||
|
||||
(defn- pkg-kw [parser]
|
||||
(expect parser :pkg-kw)
|
||||
(def curr (-> parser current))
|
||||
(advance parser)
|
||||
{:type :pkg-kw :data (curr :literal) :token curr})
|
||||
|
||||
(defn- nill [parser]
|
||||
(expect parser :nil)
|
||||
(def curr (current parser))
|
||||
|
@ -255,7 +261,7 @@
|
|||
(panic parser (string "expected separator, got " (-> parser current type))))
|
||||
(while (separates? parser) (advance parser)))
|
||||
|
||||
(def sequels [:lparen :keyword])
|
||||
(def sequels [:lparen :keyword :pkg-kw])
|
||||
|
||||
(defn- word-expr [parser]
|
||||
(expect parser :word)
|
||||
|
@ -321,6 +327,7 @@
|
|||
(case (-> parser current type)
|
||||
:lparen (args parser)
|
||||
:keyword (kw-only parser)
|
||||
:pkg-kw (pkg-kw parser)
|
||||
))
|
||||
(array/push terms term)
|
||||
)
|
||||
|
@ -830,7 +837,9 @@
|
|||
(defn- pkg-name [parser]
|
||||
(expect parser :pkg-name)
|
||||
(def origin (current parser))
|
||||
(if (= :keyword (-> parser peek type)) (break (synthetic parser)))
|
||||
(def next-type (-> parser peek type))
|
||||
(when (or (= :keyword next-type) (= :pkg-kw next-type))
|
||||
(break (synthetic parser)))
|
||||
(advance parser)
|
||||
{:type :pkg-name :data (origin :lexeme) :token origin})
|
||||
|
||||
|
@ -1106,7 +1115,8 @@
|
|||
|
||||
# (do
|
||||
(comment
|
||||
(def source `a :b :c
|
||||
(def source `
|
||||
Foo :bar :Baz
|
||||
`)
|
||||
(def scanned (s/scan source))
|
||||
(print "\n***NEW PARSE***\n")
|
||||
|
@ -1115,9 +1125,9 @@
|
|||
|
||||
# (print (pp-ast parsed))
|
||||
# (pp scanned)
|
||||
# (pp parsed)
|
||||
(def cleaned (get-in parsed [:data 2]))
|
||||
(pp cleaned)
|
||||
(pp parsed)
|
||||
# (def cleaned (get-in parsed [:data 2]))
|
||||
# (pp cleaned)
|
||||
)
|
||||
|
||||
|
||||
|
|
|
@ -169,6 +169,15 @@
|
|||
:else (add-error scanner (string "Unexpected " char "after keyword :" key)))))
|
||||
(recur scanner ""))
|
||||
|
||||
(defn- add-pkg-kw [scanner]
|
||||
(defn recur [scanner key]
|
||||
(let [char (current-char scanner)]
|
||||
(cond
|
||||
(terminates? char) (add-token scanner :pkg-kw (keyword key))
|
||||
(word-char? char) (recur (advance scanner) (string key char))
|
||||
:else (add-error scanner (string "Unexpected " char " after pkg keyword :" key)))))
|
||||
(recur scanner ""))
|
||||
|
||||
(defn- read-literal [lit] (-> lit parse-all first))
|
||||
|
||||
### TODO: consider whether Janet's number rules are right for Ludus
|
||||
|
@ -299,7 +308,8 @@
|
|||
# XXX: make sure we want only lower-only keywords
|
||||
":" (cond
|
||||
(lower? next) (add-keyword scanner)
|
||||
:else (add-error scanner (string "Expected keyword. Got " char next)))
|
||||
(upper? next) (add-pkg-kw scanner)
|
||||
:else (add-error scanner (string "Expected keyword or pkg keyword. Got " char next)))
|
||||
|
||||
## splats
|
||||
"." (let [after_next (current-char (advance scanner))]
|
||||
|
|
Loading…
Reference in New Issue
Block a user