[Jython-checkins] CVS: jython/org/python/parser PythonGrammar.java,2.18,2.19 PythonGrammarTokenManager.java,2.17,2.18 PythonGrammarTreeConstants.java,2.10,2.11

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/parser
In directory usw-pr-cvs1:/tmp/cvs-serv26834

Modified Files:
	PythonGrammar.java PythonGrammarTokenManager.java 
	PythonGrammarTreeConstants.java 
Log Message:
Commit generated code.



Index: PythonGrammar.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** PythonGrammar.java	11 Jun 2002 12:09:45 -0000	2.18
--- PythonGrammar.java	15 Oct 2002 14:28:46 -0000	2.19
***************
*** 18,23 ****
          if (s.endsWith("L") || s.endsWith("l")) {
              s = s.substring(0, s.length()-1);
!             if (radix != 10)
!                 return Py.newLong(new java.math.BigInteger(s, radix));
          }
          int ndigits = s.length();
--- 18,22 ----
          if (s.endsWith("L") || s.endsWith("l")) {
              s = s.substring(0, s.length()-1);
!             return Py.newLong(new java.math.BigInteger(s, radix));
[...1357 lines suppressed...]
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_43() {
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_3R_65()) {
+     jj_scanpos = xsp;
+     if (jj_3R_66()) {
+     jj_scanpos = xsp;
+     if (jj_3R_67()) {
+     jj_scanpos = xsp;
+     if (jj_3R_68()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }

Index: PythonGrammarTokenManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -d -r2.17 -r2.18
*** PythonGrammarTokenManager.java	11 Jun 2002 12:09:45 -0000	2.17
--- PythonGrammarTokenManager.java	15 Oct 2002 14:28:46 -0000	2.18
***************
*** 17,20 ****
--- 17,21 ----
      boolean compound = false;
      public boolean forcedNewline = false;
+     public boolean generator_allowed = false;
  
      static Token addDedent(Token previous) {
***************
*** 54,57 ****
--- 55,62 ----
                  }
              }
+         } else if (t.kind == YIELD) {
+             if (!generator_allowed) {
+                 t.kind = NAME;
+             }
          }
      }
***************
*** 2967,2971 ****
                  matchedToken.image = "<INDENT>";
              }
!             else {
                  Token t = matchedToken;
                  level -= 1;
--- 2972,2976 ----
                  matchedToken.image = "<INDENT>";
              }
!             else if (level > 0) {
                  Token t = matchedToken;
                  level -= 1;

Index: PythonGrammarTreeConstants.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTreeConstants.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** PythonGrammarTreeConstants.java	11 Jun 2002 12:09:45 -0000	2.10
--- PythonGrammarTreeConstants.java	15 Oct 2002 14:28:47 -0000	2.11
***************
*** 1,3 ****
! /* Generated By:JJTree: Do not edit this line. D:/jython/CVS2/org/python/parser\PythonGrammarTreeConstants.java */
  
  package org.python.parser;
--- 1,3 ----
! /* Generated By:JJTree: Do not edit this line. D:/jython/CVS.generator/org/python/parser\PythonGrammarTreeConstants.java */
  
  package org.python.parser;