From a333d2f5d389c064357dd66a85b411dce8522fbb Mon Sep 17 00:00:00 2001 From: Tim Vieira Date: Wed, 24 Jul 2013 14:05:43 -0400 Subject: [PATCH] added ':' operator. --- src/Dyna/Backend/Python/interpreter.py | 1 - src/Dyna/Backend/Python/utils.py | 5 +++-- src/Dyna/Term/SurfaceSyntax.hs | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Dyna/Backend/Python/interpreter.py b/src/Dyna/Backend/Python/interpreter.py index baf1b70..e5a8a05 100644 --- a/src/Dyna/Backend/Python/interpreter.py +++ b/src/Dyna/Backend/Python/interpreter.py @@ -324,7 +324,6 @@ class Interpreter(object): # update parser state self.pstate = parse_parser_state(env.parser_state) - for k, v in env.agg_decl.items(): self.new_fn(k, v) diff --git a/src/Dyna/Backend/Python/utils.py b/src/Dyna/Backend/Python/utils.py index 58a598e..2865ec5 100644 --- a/src/Dyna/Backend/Python/utils.py +++ b/src/Dyna/Backend/Python/utils.py @@ -143,9 +143,10 @@ def hide_ugly_filename(x, replacement=''): def lexer(term): return re.findall('"[^"]*"' # string + "|'[^']+'" # quoted functor '|[a-z][a-zA-Z_0-9]*' # functor - '|[A-Z_][a-zA-Z0-9_]*' # variable - '|[(), \[\]|]+' # parens and comma + '|[A-Z_][a-zA-Z0-9_]*' # variable + '|[(), \[\]|:]+' # parens and comma '|[^(), ]+', term) # everything else diff --git a/src/Dyna/Term/SurfaceSyntax.hs b/src/Dyna/Term/SurfaceSyntax.hs index e0c8456..db11ffe 100644 --- a/src/Dyna/Term/SurfaceSyntax.hs +++ b/src/Dyna/Term/SurfaceSyntax.hs @@ -82,6 +82,7 @@ defOperSpec = foldr (\(k,v) -> mapInOrCons k v) def more , ("with_key" ,[(4,PFIn AssocNone ) ]) , ("->" ,[(5,PFIn AssocNone ) ]) + , (":" ,[(5,PFIn AssocRight ) ]) , ("<=" ,[(4,PFIn AssocNone ) ]) , ("<" ,[(4,PFIn AssocNone ) ]) @@ -182,6 +183,7 @@ disposTab_prologish t = DisposTab s a , (("nil", 0),(SDQuote,[])) , (("cons", 2),(SDQuote,[ADEval,ADEval])) , (("->",2),(SDQuote,[ADQuote, ADQuote])) + , ((":",2),(SDQuote,[ADQuote, ADQuote])) ] -- | Make the default surface syntax more functional. Here, all functors @@ -213,6 +215,8 @@ disposTab_dyna t = DisposTab s a , (("$key" ,1),(SDEval,[ADQuote])) , (("with_key",2),(SDQuote,[ADEval, ADEval])) , (("->",2),(SDQuote,[ADQuote, ADQuote])) + , ((":",2),(SDQuote,[ADQuote, ADQuote])) + ] ------------------------------------------------------------------------}}} -- 2.50.1