twc/ludus
4
0
Fork 0
Code Issues 32 Pull Requests Packages Projects 8 Releases Wiki Activity

Start work on words, add double-colon, fix terminators

Browse Source
This commit is contained in:
Scott Richmond 2022-02-05 19:24:39 -05:00
parent eb5f5233b6
commit 2eb7960cc9
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ludus/scanner.clj
View File

@ -6,7 +6,6 @@
"List of Ludus reserved words." "List of Ludus reserved words."
;; see ludus-spec repo for more info ;; see ludus-spec repo for more info
#{ #{
"as"
"cond" "cond"
"else" "else"
"false" "false"
@ -77,13 +76,20 @@
(defn- nonzero-digit? [c] (defn- nonzero-digit? [c]
(char-in-range? \1 \9 c)) (char-in-range? \1 \9 c))
;; for now, use very basic ASCII charset in words
(defn- alpha? [c] (defn- alpha? [c]
(boolean (re-find #"\p{L}" (str c)))) (or (char-in-range? \a \z c) (char-in-range? \A \Z c)))
;; legal characters in words
(def word-chars #{\_ \? \! \* \/})
(defn- word-char? [c]
(or (alpha? c) (digit? c) (contains? word-chars c)))
(defn- whitespace? [c] (defn- whitespace? [c]
(or (= c \space) (= c \tab))) (or (= c \space) (= c \tab)))
(def terminators #{\: \; \newline \{ \( \[ \$ \# \- \< \& \,}) (def terminators #{\: \; \newline \{ \} \( \) \[ \] \$ \# \- \< \& \, \|})
(defn- terminates? [c] (defn- terminates? [c]
(or (whitespace? c) (contains? terminators c))) (or (whitespace? c) (contains? terminators c)))
@ -100,6 +106,7 @@
(::line scanner) (::line scanner)
(::start scanner))))) (::start scanner)))))
;; TODO: errors should also be
(defn- add-error [scanner msg] (defn- add-error [scanner msg]
(update scanner ::errors conj {:msg msg :line (::line scanner) :start (::start scanner)})) (update scanner ::errors conj {:msg msg :line (::line scanner) :start (::start scanner)}))
@ -134,7 +141,11 @@
(add-error scanner "Unterminated string.") (add-error scanner "Unterminated string.")
(recur (advance scanner) (str string char))))))) (recur (advance scanner) (str string char)))))))
(defn- add-word [scanner]) (defn- add-word
[scanner]
(loop [scanner scanner
word ""])
(let [char (current-char scanner)]))
(defn- skip-comment [scanner] (defn- skip-comment [scanner]
(if (= \newline (current-char scanner)) (if (= \newline (current-char scanner))
@ -161,10 +172,10 @@
;; two-character tokens ;; two-character tokens
;; -> ;; ->
;; have to fix this: negative numbers \- (cond
\- (if (= next \>) (= next \>) (add-token (advance scanner) ::token/rarrow)
(add-token (advance scanner) ::token/rarrow) (digit? next) (add-number scanner)
(add-error scanner (str "Expected ->. Got " char next))) (add-error scanner ("Expected -> or negative number. Got " char next)))
;; <- ;; <-
\< (if (= next \-) \< (if (= next \-)
@ -176,10 +187,8 @@
(add-token (advance scanner) ::token/pipeline) (add-token (advance scanner) ::token/pipeline)
(add-error scanner (str "Expected |>. Got " char next))) (add-error scanner (str "Expected |>. Got " char next)))
;; possible additional operator: => (bind) ;; possible additional operator: => (bind/result)
\= (if (= next \>) ;; possible additional operator: ~> (bind/some)
(add-token (advance scanner) ::token/bind)
(add-error scanner (str "Expected =>. Got " char next)))
;; hashmap #{ ;; hashmap #{
\# (if (= next \{) \# (if (= next \{)
@ -198,10 +207,14 @@
;; comments ;; comments
;; & ;; &
;; TODO: include comments in scanned file
\& (skip-comment scanner) \& (skip-comment scanner)
;; keywords ;; keywords
\: (add-keyword scanner) \: (cond
(= \: next) (add-token (advance scanner) ::token/doublecolon))
(alpha? next) (add-word scanner)
:else (add-error scanner (str "Expected keyword. Got " char next))
;; strings ;; strings
\" (add-string scanner) \" (add-string scanner)