[Jython-checkins] CVS: jython/org/python/parser PythonGrammar.java,2.14,2.15 PythonGrammarTokenManager.java,2.13,2.14

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

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

Modified Files:
	PythonGrammar.java PythonGrammarTokenManager.java 
Log Message:
Comitting generated files.



Index: PythonGrammar.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** PythonGrammar.java	2001/10/30 20:37:33	2.14
--- PythonGrammar.java	2001/12/20 17:19:03	2.15
***************
*** 5463,5474 ****
    }
  
-   final private boolean jj_3_20() {
-     if (jj_scan_token(COMMA)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_40()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3_19() {
      if (jj_scan_token(COMMA)) return true;
--- 5463,5466 ----
***************
*** 6595,6598 ****
--- 6587,6598 ----
    final private boolean jj_3_21() {
      if (jj_3R_44()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3_20() {
+     if (jj_scan_token(COMMA)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_40()) return true;
      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.13
retrieving revision 2.14
diff -C2 -d -r2.13 -r2.14
*** PythonGrammarTokenManager.java	2001/10/30 20:37:33	2.13
--- PythonGrammarTokenManager.java	2001/12/20 17:19:06	2.14
***************
*** 2770,2774 ****
           else
              image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
!           indent = 0;
           break;
        default :
--- 2770,2778 ----
           else
              image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
!         indent = 0;
!         if (indent == indentation[level])
!             SwitchTo(INDENTATION_UNCHANGED);
!         else
!             SwitchTo(INDENTING);
           break;
        default :