diff --git a/src/ludus/parser.clj b/src/ludus/parser.clj index 9091d8d..ea1bc28 100644 --- a/src/ludus/parser.clj +++ b/src/ludus/parser.clj @@ -622,7 +622,7 @@ ::token/lbracket (parse-list-pattern parser) - ::token/starthash (parse-dict-pattern parser) + ::token/startdict (parse-dict-pattern parser) ::token/startstruct (parse-struct-pattern parser) @@ -996,7 +996,7 @@ ::token/startset (parse-set parser) - ::token/starthash (parse-dict parser) + ::token/startdict (parse-dict parser) ::token/startstruct (parse-struct parser) @@ -1046,7 +1046,7 @@ (parser) (parse-script))) -(do +(comment (def pp pp/pprint) (def source "let #{a, b} = #{:a 1, :b 2} diff --git a/src/ludus/scanner.clj b/src/ludus/scanner.clj index a0a0363..2c6c853 100644 --- a/src/ludus/scanner.clj +++ b/src/ludus/scanner.clj @@ -267,10 +267,10 @@ ;; oh god, monads ;; additional arrow possibilities: >> ||> ~> => !> - ;; hashmap #{ + ;; dict #{ \# (if (= next \{) - (add-token (advance scanner) ::token/starthash) - (add-error scanner (str "Expected beginning of hash: #{. Got " char next))) + (add-token (advance scanner) ::token/startdict) + (add-error scanner (str "Expected beginning of dict: #{. Got " char next))) ;; set ${ \$ (if (= next \{)