aboutsummaryrefslogtreecommitdiff
path: root/src/lang/parser.clj
diff options
context:
space:
mode:
authorEduardo Julian2014-12-01 01:05:17 -0400
committerEduardo Julian2014-12-01 01:05:17 -0400
commitce096da3d8a6c28da0983a230e2e9d561618809e (patch)
tree8c8cb49ec045fb47f10658d031f62e16037bc5f7 /src/lang/parser.clj
parent60cf264468d4833fd2cb8b103b0fc29a17d55eec (diff)
Doing some basic compilation.
Diffstat (limited to 'src/lang/parser.clj')
-rw-r--r--src/lang/parser.clj19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/lang/parser.clj b/src/lang/parser.clj
index 2abb75cf5..7f1337558 100644
--- a/src/lang/parser.clj
+++ b/src/lang/parser.clj
@@ -114,6 +114,20 @@
=record (apply-m parse-form (list ?record))]
(return [::set ?tag =value =record])))
+(defparser ^:private parse-static-access
+ [::&lexer/list ([[::&lexer/ident "_.."] [::&lexer/ident ?class] [::&lexer/ident ?member]] :seq)]
+ (return [::static-access ?class ?member]))
+
+(defparser ^:private parse-dynamic-access
+ [::&lexer/list ([[::&lexer/ident "_."] ?object ?call] :seq)]
+ (exec [=object (apply-m parse-form (list ?object))
+ =call (apply-m parse-form (list ?call))]
+ (return [::dynamic-access =object =call])))
+
+(defparser ^:private parse-string
+ [::&lexer/string ?string]
+ (return [::string ?string]))
+
(defparser ^:private parse-fn-call
[::&lexer/list ([?f & ?args] :seq)]
(exec [=f (apply-m parse-form (list ?f))
@@ -124,6 +138,7 @@
(def ^:private parse-form
(try-all-m [parse-int
parse-float
+ parse-string
parse-ident
parse-tuple
parse-record
@@ -136,6 +151,8 @@
parse-get
parse-set
parse-remove
+ parse-static-access
+ parse-dynamic-access
parse-fn-call]))
;; [Interface]
@@ -144,7 +161,7 @@
[::&util/ok [?state ?forms]]
(if (empty? ?state)
?forms
- (assert false (str "Unconsumed input: " ?state)))
+ (assert false (str "Unconsumed input: " (pr-str ?state))))
[::&util/failure ?message]
(assert false ?message)))