From 74d3233f7d7984ebcef0d4e6778f0596e867de6c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 20 Dec 2014 23:25:40 -0400
Subject: * Java interop is almost finished. % _. and _.. syntax has been
 replaced with ::

---
 src/lang/parser.clj | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/lang/parser.clj')

diff --git a/src/lang/parser.clj b/src/lang/parser.clj
index ea3f518f5..376e376d6 100644
--- a/src/lang/parser.clj
+++ b/src/lang/parser.clj
@@ -158,15 +158,11 @@
          =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)]
+(defparser ^:private parse-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])))
+    (return [::access =object =call])))
 
 (defparser ^:private parse-string
   [::&lexer/string ?string]
@@ -199,8 +195,7 @@
               parse-get
               parse-set
               parse-remove
-              parse-static-access
-              parse-dynamic-access
+              parse-access
               parse-defclass
               parse-definterface
               parse-import
-- 
cgit v1.2.3