jython-checkins Mailing List for Jython (Page 82)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5246
          http://jython.svn.sourceforge.net/jython/?rev=5246&view=rev
Author:   fwierzbicki
Date:     2008-08-25 20:36:04 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
Fixed fplist, subscripts (especially extslice) and enable Interactive
and Expression (single and eval).  regrtest.py is now running.

Modified Paths:
--------------
    branches/nowalker/grammar/Python.g
    branches/nowalker/src/org/python/antlr/ExpressionParser.java
    branches/nowalker/src/org/python/antlr/GrammarActions.java
    branches/nowalker/src/org/python/antlr/InteractiveParser.java

Modified: branches/nowalker/grammar/Python.g
===================================================================

--- branches/nowalker/grammar/Python.g	2008-08-25 18:44:46 UTC (rev 5245)
+++ branches/nowalker/grammar/Python.g	2008-08-25 20:36:04 UTC (rev 5246)
@@ -76,8 +76,6 @@
     DEDENT;
 
     PYNODE;
-    Interactive;
-    Expression;
 }
 
 @header {
@@ -110,6 +108,7 @@
 import org.python.antlr.ast.excepthandlerType;
 import org.python.antlr.ast.Exec;
 import org.python.antlr.ast.Expr;
+import org.python.antlr.ast.Expression;
 import org.python.antlr.ast.exprType;
 import org.python.antlr.ast.expr_contextType;
 import org.python.antlr.ast.ExtSlice;
@@ -122,6 +121,7 @@
 import org.python.antlr.ast.Import;
 import org.python.antlr.ast.ImportFrom;
 import org.python.antlr.ast.Index;
+import org.python.antlr.ast.Interactive;
 import org.python.antlr.ast.keywordType;
 import org.python.antlr.ast.ListComp;
 import org.python.antlr.ast.Lambda;
@@ -272,10 +272,23 @@
 }
 
 //single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
-single_input : NEWLINE* EOF -> ^(Interactive)
-             | simple_stmt NEWLINE* EOF -> ^(Interactive simple_stmt)
-             | compound_stmt NEWLINE+ EOF -> ^(Interactive compound_stmt)
-             ;
+single_input
+@init {
+    modType mtype = null;
+}
+@after {
+    $single_input.tree = mtype;
+}
+    : NEWLINE* EOF {
+        mtype = new Interactive($single_input.start, new stmtType[0]);
+    }
+    | simple_stmt NEWLINE* EOF {
+        mtype = new Interactive($single_input.start, actions.makeStmts($simple_stmt.stypes));
+    }
+    | compound_stmt NEWLINE+ EOF {
+        mtype = new Interactive($single_input.start, actions.makeStmts($compound_stmt.tree));
+    }
+    ;
 
 //file_input: (NEWLINE | stmt)* ENDMARKER
 file_input
@@ -294,8 +307,17 @@
     ;
 
 //eval_input: testlist NEWLINE* ENDMARKER
-eval_input : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* EOF -> ^(Expression testlist)
-           ;
+eval_input
+@init {
+    modType mtype = null;
+}
+@after {
+    $eval_input.tree = mtype;
+}
+    : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* EOF {
+        mtype = new Expression($eval_input.start, (exprType)$testlist.tree);
+    }
+    ;
 
 //not in CPython's Grammar file
 dotted_attr returns [exprType etype]
@@ -422,9 +444,9 @@
 fpdef[expr_contextType ctype] : NAME 
      -> ^(PYNODE<Name>[$NAME, $NAME.text, ctype])
       | (LPAREN fpdef[null] COMMA) => LPAREN fplist RPAREN
+     -> ^(LPAREN<Tuple>[$fplist.start, actions.makeExprs($fplist.etypes), expr_contextType.Store])
+      | LPAREN fplist RPAREN
      -> fplist
-      | LPAREN fplist RPAREN
-     -> ^(LPAREN<Tuple>[$fplist.start, actions.makeExprs($fplist.etypes), expr_contextType.Store])
       ;
 
 //fplist: fpdef (',' fpdef)* [',']
@@ -673,7 +695,7 @@
    $exec_stmt.tree = stype;
 }
     : EXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)? {
-         stype = new Exec($expr.start, (exprType)$expr.tree, (exprType)$t1.tree, (exprType)$t2.tree);
+         stype = new Exec($EXEC, (exprType)$expr.tree, (exprType)$t1.tree, (exprType)$t2.tree);
     }
     ;
 
@@ -1142,37 +1164,49 @@
 //subscriptlist: subscript (',' subscript)* [',']
 //FIXME: tuples not always created when commas are present.
 subscriptlist[Token begin] returns [exprType etype]
+@init {
+    exprType etype = null;
+}
 @after {
-   $subscriptlist.tree = $etype;
+   $subscriptlist.tree = etype;
 }
-    : sub+=subscript (options {greedy=true;}:COMMA sub+=subscript)* (COMMA)? {
-        sliceType s;
+    : sub+=subscript (options {greedy=true;}:c1=COMMA sub+=subscript)* (c2=COMMA)? {
+        boolean isTuple = false;
+        if ($c1 != null || $c2 != null) {
+            isTuple = true;
+        }
+        sliceType s = null;
         List sltypes = $sub;
-        if (sltypes.size() == 0) {
-            s = null;
-        } else if (sltypes.size() == 1){
-            s = (sliceType)sltypes.get(0);
-        } else {
+        boolean extslice = false;
+
+        //NEW LOGIC
+        if (isTuple) {
             sliceType[] st;
-            //FIXME: here I am using ClassCastException to decide if sltypes is populated with Index
-            //       only.  Clearly this is not the best way to do this but it's late. Somebody do
-            //       something better please :) -- (hopefully a note to self)
-            try {
-                Iterator iter = sltypes.iterator();
-                List etypes = new ArrayList();
-                while (iter.hasNext()) {
-                    Index i = (Index)iter.next();
+            List etypes = new ArrayList();
+            for (Object o : sltypes) {
+                if (o instanceof Index) {
+                    Index i = (Index)o;
                     etypes.add(i.value);
+                } else {
+                    extslice = true;
+                    break;
                 }
+            }
+            if (!extslice) {
                 exprType[] es = (exprType[])etypes.toArray(new exprType[etypes.size()]);
-                exprType t = new Tuple($subscriptlist.start, es, expr_contextType.Load);
-                s = new Index($subscriptlist.start, t);
-            } catch (ClassCastException cc) {
-                st = (sliceType[])sltypes.toArray(new sliceType[sltypes.size()]);
-                s = new ExtSlice($subscriptlist.start, st);
+                exprType t = new Tuple($begin, es, expr_contextType.Load);
+                s = new Index($begin, t);
             }
+        } else if (sltypes.size() == 1) {
+            s = (sliceType)sltypes.get(0);
+        } else if (sltypes.size() != 0) {
+            extslice = true;
         }
-        $etype = new Subscript($begin, null, s, $expr::ctype);
+        if (extslice) {
+            sliceType[] st = (sliceType[])sltypes.toArray(new sliceType[sltypes.size()]);
+            s = new ExtSlice($begin, st);
+        }
+        etype = new Subscript($begin, null, s, $expr::ctype);
     }
     ;
 
@@ -1194,7 +1228,8 @@
     ;
 
 //sliceop: ':' [test]
-sliceop : COLON (test[expr_contextType.Load])? -> test
+sliceop : COLON (test[expr_contextType.Load] -> test
+                )?
         ;
 
 //exprlist: expr (',' expr)* [',']

Modified: branches/nowalker/src/org/python/antlr/ExpressionParser.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ExpressionParser.java	2008-08-25 18:44:46 UTC (rev 5245)
+++ branches/nowalker/src/org/python/antlr/ExpressionParser.java	2008-08-25 20:36:04 UTC (rev 5246)
@@ -34,6 +34,7 @@
 
         try {
             PythonParser.eval_input_return r = parser.eval_input();
+            tree = (modType)r.tree;
             //CommonTreeNodeStream nodes = new CommonTreeNodeStream((Tree)r.tree);
             //nodes.setTokenStream(tokens);
             //PythonWalker walker = new PythonWalker(nodes);

Modified: branches/nowalker/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/nowalker/src/org/python/antlr/GrammarActions.java	2008-08-25 18:44:46 UTC (rev 5245)
+++ branches/nowalker/src/org/python/antlr/GrammarActions.java	2008-08-25 20:36:04 UTC (rev 5246)
@@ -185,6 +185,10 @@
         return o;
     }
 
+    stmtType[] makeStmts(PythonTree t) {
+        return new stmtType[]{(stmtType)t};
+    }
+
     stmtType[] makeStmts(List stmts) {
         if (stmts != null) {
             List<stmtType> result = new ArrayList<stmtType>();

Modified: branches/nowalker/src/org/python/antlr/InteractiveParser.java
===================================================================
--- branches/nowalker/src/org/python/antlr/InteractiveParser.java	2008-08-25 18:44:46 UTC (rev 5245)
+++ branches/nowalker/src/org/python/antlr/InteractiveParser.java	2008-08-25 20:36:04 UTC (rev 5246)
@@ -39,6 +39,7 @@
 
         try {
             PythonParser.single_input_return r = parser.single_input();
+            tree = (modType)r.tree;
             //CommonTreeNodeStream nodes = new CommonTreeNodeStream((Tree)r.tree);
             //nodes.setTokenStream(tokens);
             //PythonWalker walker = new PythonWalker(nodes);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (107)	Dec (67)
2001	Jan (76)	Feb (125)	Mar (72)	Apr (13)	May (18)	Jun (12)	Jul (129)	Aug (47)	Sep (1)	Oct (36)	Nov (128)	Dec (124)
2002	Jan (59)	Feb	Mar (14)	Apr (14)	May (72)	Jun (9)	Jul (3)	Aug (5)	Sep (18)	Oct (65)	Nov (28)	Dec (12)
2003	Jan (10)	Feb (2)	Mar (4)	Apr (33)	May (21)	Jun (9)	Jul (29)	Aug (34)	Sep (4)	Oct (8)	Nov (15)	Dec (4)
2004	Jan (26)	Feb (12)	Mar (11)	Apr (9)	May (7)	Jun	Jul (5)	Aug	Sep (3)	Oct (7)	Nov (1)	Dec (10)
2005	Jan (2)	Feb (72)	Mar (16)	Apr (39)	May (48)	Jun (97)	Jul (57)	Aug (13)	Sep (16)	Oct (24)	Nov (100)	Dec (24)
2006	Jan (15)	Feb (34)	Mar (33)	Apr (31)	May (79)	Jun (64)	Jul (41)	Aug (64)	Sep (31)	Oct (46)	Nov (55)	Dec (37)
2007	Jan (32)	Feb (61)	Mar (11)	Apr (58)	May (46)	Jun (30)	Jul (94)	Aug (93)	Sep (86)	Oct (69)	Nov (125)	Dec (177)
2008	Jan (169)	Feb (97)	Mar (74)	Apr (113)	May (120)	Jun (334)	Jul (215)	Aug (237)	Sep (72)	Oct (189)	Nov (126)	Dec (160)
2009	Jan (180)	Feb (45)	Mar (98)	Apr (140)	May (151)	Jun (71)	Jul (107)	Aug (119)	Sep (73)	Oct (121)	Nov (14)	Dec (6)
2010	Jan (13)	Feb (9)	Mar (10)	Apr (64)	May (3)	Jun (16)	Jul (7)	Aug (23)	Sep (17)	Oct (37)	Nov (5)	Dec (8)
2011	Jan (10)	Feb (11)	Mar (77)	Apr (11)	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

jython-checkins Mailing List for Jython (Page 82)

jython-checkins — For Jython checkin messages