Changeset 5336:fe802c9b09e9 in livinglogic.python.xist for src/ll/UL4.g

Timestamp:

02/11/13 13:46:43 (7 years ago)

Author:

Walter Doerwald <walter@…>

Branch:

default

Message:

Merge AST and Tag again.

Expressions are now allowed as the content of <?code tag?>, so they may sit at
the top level in tags.

Have the location object point back to the root template. With this we don't
have to pass along the keepws flag in eval().

Files:

• src/ll/UL4.g (modified) (17 diffs)

src/ll/UL4.g

@@ -141 +141 @@
 
 none returns [node]
-    : NONE { $node = ul4c.Const(None) }
+    : NONE { $node = ul4c.Const(self.location, None) }
     ;
 
 true_ returns [node]
-    : TRUE { $node = ul4c.Const(True) }
+    : TRUE { $node = ul4c.Const(self.location, True) }
     ;
 
 false_ returns [node]
-    : FALSE { $node = ul4c.Const(False) }
+    : FALSE { $node = ul4c.Const(self.location, False) }
     ;
 
 int_ returns [node]
-    : INT { $node = ul4c.Const(int($INT.text, 0)) }
+    : INT { $node = ul4c.Const(self.location, int($INT.text, 0)) }
     ;
 
 float_ returns [node]
-    : FLOAT { $node = ul4c.Const(float($FLOAT.text)) }
+    : FLOAT { $node = ul4c.Const(self.location, float($FLOAT.text)) }
     ;
 
 string returns [node]
-    : STRING { $node = ul4c.Const(ast.literal_eval($STRING.text)) }
+    : STRING { $node = ul4c.Const(self.location, ast.literal_eval($STRING.text)) }
     ;
 
 date returns [node]
-    : DATE { $node = ul4c.Const(datetime.datetime(*map(int, [f for f in ul4c.datesplitter.split($DATE.text[2:-1]) if f]))) }
+    : DATE { $node = ul4c.Const(self.location, datetime.datetime(*map(int, [f for f in ul4c.datesplitter.split($DATE.text[2:-1]) if f]))) }
     ;
 
 color returns [node]
-    : COLOR { $node = ul4c.Const(color.Color.fromrepr($COLOR.text)) }
+    : COLOR { $node = ul4c.Const(self.location, color.Color.fromrepr($COLOR.text)) }
     ;
 
 name returns [node]
-    : NAME { $node = ul4c.Var($NAME.text) }
+    : NAME { $node = ul4c.Var(self.location, $NAME.text) }
     ;
 
@@ -192 +192 @@
     :
         '['
-        ']' { $node = ul4c.List() }
+        ']' { $node = ul4c.List(self.location) }
     |
-        '[' {$node = ul4c.List() }
+        '[' {$node = ul4c.List(self.location) }
         e1=expr1 { $node.items.append($e1.node) }
         (
@@ -220 +220 @@
             condition=expr1 { _condition = $condition.node; }
         )?
-        ']' { $node = ul4c.ListComp($item.node, $n.varname, $container.node, _condition) }
+        ']' { $node = ul4c.ListComp(self.location, $item.node, $n.varname, $container.node, _condition) }
     ;
 
@@ -235 +235 @@
     :
         '{'
-        '}' { $node = ul4c.Dict() }
+        '}' { $node = ul4c.Dict(self.location) }
     |
-        '{' { $node = ul4c.Dict() }
+        '{' { $node = ul4c.Dict(self.location) }
         i1=dictitem { $node.items.append($i1.node) }
         (
@@ -265 +265 @@
             condition=expr1 { _condition = $condition.node; }
         )?
-        '}' { $node = ul4c.DictComp($key.node, $value.node, $n.varname, $container.node, _condition) }
+        '}' { $node = ul4c.DictComp(self.location, $key.node, $value.node, $n.varname, $container.node, _condition) }
     ;
 
@@ -282 +282 @@
             'if'
             condition=expr1 { _condition = $condition.node; }
-        )? { $node = ul4c.GenExpr($item.node, $n.varname, $container.node, _condition) }
+        )? { $node = ul4c.GenExpr(self.location, $item.node, $n.varname, $container.node, _condition) }
     ;
 
@@ -328 +328 @@
             /* Attribute access */
             '.'
-            n=name { $node = ul4c.GetAttr($node, $n.text) }
+            n=name { $node = ul4c.GetAttr(self.location, $node, $n.text) }
         |
             /* Function/method call */
-            '(' { $node = ul4c.CallMeth($node.obj, $node.attrname) if isinstance($node, ul4c.GetAttr) else ul4c.CallFunc($node) }
+            '(' { $node = ul4c.CallMeth(self.location, $node.obj, $node.attrname) if isinstance($node, ul4c.GetAttr) else ul4c.CallFunc(self.location, $node) }
             (
                 /* No arguments */
@@ -391 +391 @@
                 (
                     e2=expr1 { index2 = $e2.node; }
-                )? { $node = ul4c.GetSlice($node, None, index2) }
+                )? { $node = ul4c.GetSlice(self.location, $node, None, index2) }
             |
                 e2=expr1 { index1 = $e2.node; }
@@ -399 +399 @@
                         e3=expr1 { index2 = $e3.node; }
                     )?
-                )? { $node = ul4c.GetSlice($node, index1, index2) if slice else ul4c.GetItem($node, index1) }
+                )? { $node = ul4c.GetSlice(self.location, $node, index1, index2) if slice else ul4c.GetItem(self.location, $node, index1) }
             )
             ']'
@@ -418 +418 @@
             $node = $e.node;
             for i in range(count):
-                $node = ul4c.Neg.make($node);
+                $node = ul4c.Neg.make(self.location, $node);
         }
     ;
@@ -436 +436 @@
                 '%' { cls = ul4c.Mod; }
             )
-            e2=expr8 { $node = cls.make($node, $e2.node) }
+            e2=expr8 { $node = cls.make(self.location, $node, $e2.node) }
         )*
     ;
@@ -450 +450 @@
                 '-' { cls = ul4c.Sub; }
             )
-            e2=expr7 { $node = cls.make($node, $e2.node) }
+            e2=expr7 { $node = cls.make(self.location, $node, $e2.node) }
         )*
     ;
@@ -472 +472 @@
                 '>=' { cls = ul4c.GE; }
             )
-            e2=expr6 { $node = cls.make($node, $e2.node) }
+            e2=expr6 { $node = cls.make(self.location, $node, $e2.node) }
         )*
     ;
@@ -486 +486 @@
             )?
             'in'
-            e2=expr5 { $node = cls.make($node, $e2.node) }
+            e2=expr5 { $node = cls.make(self.location, $node, $e2.node) }
         )?
     ;
@@ -494 +494 @@
     :
         'not'
-        e=expr4 { $node = ul4c.Not.make($e.node) }
+        e=expr4 { $node = ul4c.Not.make(self.location, $e.node) }
     |
         e=expr4 { $node = $e.node; }
@@ -506 +506 @@
         (
             'and'
-            e2=expr3 { $node = ul4c.And($node, $e2.node) }
+            e2=expr3 { $node = ul4c.And(self.location, $node, $e2.node) }
         )*
     ;
@@ -516 +516 @@
         (
             'or'
-            e2=expr2 { $node = ul4c.Or($node, $e2.node) }
+            e2=expr2 { $node = ul4c.Or(self.location, $node, $e2.node) }
         )*
     ;