Menu
▾
▴
[Jython-checkins] CVS: jython/org/python/parser PythonGrammar.java,2.12,2.13 PythonGrammarTokenManager.java,2.10,2.11
|
From: Finn B. <bc...@us...> - 2001-07-20 13:43:06
|
Update of /cvsroot/jython/jython/org/python/parser
In directory usw-pr-cvs1:/tmp/cvs-serv20057
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.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** PythonGrammar.java 2001/04/25 18:56:18 2.12
--- PythonGrammar.java 2001/07/20 13:43:03 2.13
***************
*** 6600,6604 ****
public PythonGrammarTokenManager token_source;
- ASCII_CharStream jj_input_stream;
public Token token, jj_nt;
private int jj_ntk;
--- 6600,6603 ----
***************
*** 6617,6623 ****
private int jj_gc = 0;
! public PythonGrammar(java.io.InputStream stream) {
! jj_input_stream = new ASCII_CharStream(stream, 1, 1);
! token_source = new PythonGrammarTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
--- 6616,6621 ----
private int jj_gc = 0;
! public PythonGrammar(CharStream stream) {
! token_source = new PythonGrammarTokenManager(stream);
token = new Token();
jj_ntk = -1;
***************
*** 6627,6654 ****
}
! public void ReInit(java.io.InputStream stream) {
! jj_input_stream.ReInit(stream, 1, 1);
! token_source.ReInit(jj_input_stream);
! token = new Token();
! jj_ntk = -1;
! jjtree.reset();
! jj_gen = 0;
! for (int i = 0; i < 104; i++) jj_la1[i] = -1;
! for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
! }
!
! public PythonGrammar(java.io.Reader stream) {
! jj_input_stream = new ASCII_CharStream(stream, 1, 1);
! token_source = new PythonGrammarTokenManager(jj_input_stream);
! token = new Token();
! jj_ntk = -1;
! jj_gen = 0;
! for (int i = 0; i < 104; i++) jj_la1[i] = -1;
! for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
! }
!
! public void ReInit(java.io.Reader stream) {
! jj_input_stream.ReInit(stream, 1, 1);
! token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
--- 6625,6630 ----
}
! public void ReInit(CharStream stream) {
! token_source.ReInit(stream);
token = new Token();
jj_ntk = -1;
Index: PythonGrammarTokenManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** PythonGrammarTokenManager.java 2001/04/25 18:56:18 2.10
--- PythonGrammarTokenManager.java 2001/07/20 13:43:03 2.11
***************
*** 2419,2423 ****
0x0L, 0xff8780000000L,
};
! private ASCII_CharStream input_stream;
private final int[] jjrounds = new int[52];
private final int[] jjstateSet = new int[104];
--- 2419,2423 ----
0x0L, 0xff8780000000L,
};
! private CharStream input_stream;
private final int[] jjrounds = new int[52];
private final int[] jjstateSet = new int[104];
***************
*** 2426,2441 ****
int lengthOfMatch;
protected char curChar;
! public PythonGrammarTokenManager(ASCII_CharStream stream)
{
- if (ASCII_CharStream.staticFlag)
- throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
input_stream = stream;
}
! public PythonGrammarTokenManager(ASCII_CharStream stream, int lexState)
{
this(stream);
SwitchTo(lexState);
}
! public void ReInit(ASCII_CharStream stream)
{
jjmatchedPos = jjnewStateCnt = 0;
--- 2426,2439 ----
int lengthOfMatch;
protected char curChar;
! public PythonGrammarTokenManager(CharStream stream)
{
input_stream = stream;
}
! public PythonGrammarTokenManager(CharStream stream, int lexState)
{
this(stream);
SwitchTo(lexState);
}
! public void ReInit(CharStream stream)
{
jjmatchedPos = jjnewStateCnt = 0;
***************
*** 2451,2455 ****
jjrounds[i] = 0x80000000;
}
! public void ReInit(ASCII_CharStream stream, int lexState)
{
ReInit(stream);
--- 2449,2453 ----
jjrounds[i] = 0x80000000;
}
! public void ReInit(CharStream stream, int lexState)
{
ReInit(stream);
***************
*** 2662,2666 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
if (parens == 0) {
indent = 0;
--- 2660,2664 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (parens == 0) {
indent = 0;
***************
*** 2676,2680 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
indent = (indent/8+1)*8;
if (indent == indentation[level])
--- 2674,2678 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
indent = (indent/8+1)*8;
if (indent == indentation[level])
***************
*** 2687,2691 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
indent += 1;
if (indent == indentation[level])
--- 2685,2689 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
indent += 1;
if (indent == indentation[level])
***************
*** 2698,2702 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
indent = 0;
if (indent == indentation[level])
--- 2696,2700 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
indent = 0;
if (indent == indentation[level])
***************
*** 2709,2713 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
if (parens == 0 && single_input && indent==0) {
//System.out.println("force newline");
--- 2707,2711 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (parens == 0 && single_input && indent==0) {
//System.out.println("force newline");
***************
*** 2730,2734 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
indent = 0;
break;
--- 2728,2732 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
indent = 0;
break;
***************
*** 2746,2750 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen)));
jjimageLen = 0;
image.setLength(image.length()-3);
--- 2744,2748 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
image.setLength(image.length()-3);
***************
*** 2754,2758 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen)));
jjimageLen = 0;
image.setLength(image.length()-2);
--- 2752,2756 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
image.setLength(image.length()-2);
***************
*** 2762,2766 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen)));
jjimageLen = 0;
int l = image.length();
--- 2760,2764 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
int l = image.length();
***************
*** 2772,2776 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen)));
jjimageLen = 0;
image.setCharAt(image.length()-1, '\n');
--- 2770,2774 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
else
! image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
image.setCharAt(image.length()-1, '\n');
***************
*** 2788,2792 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
matchedToken.kind = NEWLINE;
break;
--- 2786,2790 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
matchedToken.kind = NEWLINE;
break;
***************
*** 2795,2799 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
Token t1 = matchedToken;
//System.out.println("final_newline: "+level);
--- 2793,2797 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
Token t1 = matchedToken;
//System.out.println("final_newline: "+level);
***************
*** 2807,2811 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
if (indent > indentation[level]) {
level++;
--- 2805,2809 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (indent > indentation[level]) {
level++;
***************
*** 2874,2878 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
matchedToken.image = image.toString();
break;
--- 2872,2876 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
matchedToken.image = image.toString();
break;
***************
*** 2881,2885 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
matchedToken.image = image.toString();
break;
--- 2879,2883 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
matchedToken.image = image.toString();
break;
***************
*** 2888,2892 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
matchedToken.image = image.toString();
break;
--- 2886,2890 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
matchedToken.image = image.toString();
break;
***************
*** 2895,2899 ****
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
matchedToken.image = image.toString();
break;
--- 2893,2897 ----
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
else
! image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
matchedToken.image = image.toString();
break;
|
