You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/05/07 18:18:00 UTC
svn commit: r404789 - in
/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser:
ExpressionParser.java ExpressionParserTokenManager.java
Author: aadamchik
Date: Sun May 7 09:17:53 2006
New Revision: 404789
URL: http://svn.apache.org/viewcvs?rev=404789&view=rev
Log:
these two classes are generated, so I am overriding earlier
unused import cleanup with the generated version
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParser.java
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParserTokenManager.java
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParser.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParser.java?rev=404789&r1=404788&r2=404789&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParser.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParser.java Sun May 7 09:17:53 2006
@@ -59,6 +59,9 @@
*/
package org.objectstyle.cayenne.exp.parser;
+import java.io.*;
+import java.util.*;
+import java.math.*;
import org.objectstyle.cayenne.exp.*;
/**
@@ -93,6 +96,7 @@
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 1:
+ ;
break;
default:
jj_la1[0] = jj_gen;
@@ -132,6 +136,7 @@
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 2:
+ ;
break;
default:
jj_la1[1] = jj_gen;
@@ -566,6 +571,7 @@
break;
default:
jj_la1[8] = jj_gen;
+ ;
}
}
@@ -723,6 +729,7 @@
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 19:
+ ;
break;
default:
jj_la1[12] = jj_gen;
@@ -893,6 +900,7 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 20:
case 21:
+ ;
break;
default:
jj_la1[15] = jj_gen;
@@ -968,6 +976,7 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 22:
case 23:
+ ;
break;
default:
jj_la1[17] = jj_gen;
@@ -1052,6 +1061,7 @@
break;
default:
jj_la1[19] = jj_gen;
+ ;
}
numericPrimary();
break;
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParserTokenManager.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParserTokenManager.java?rev=404789&r1=404788&r2=404789&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParserTokenManager.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/ExpressionParserTokenManager.java Sun May 7 09:17:53 2006
@@ -58,8 +58,10 @@
* copyright (c) 2002, Drew Davidson and Luke Blanshard
*/
package org.objectstyle.cayenne.exp.parser;
-
+import java.io.*;
+import java.util.*;
import java.math.*;
+import org.objectstyle.cayenne.exp.*;
public class ExpressionParserTokenManager implements ExpressionParserConstants
{
@@ -653,13 +655,19 @@
jjCheckNAdd(jjnextStates[start]);
} while (start++ != end);
}
+private final void jjCheckNAddStates(int start)
+{
+ jjCheckNAdd(jjnextStates[start]);
+ jjCheckNAdd(jjnextStates[start + 1]);
+}
private final int jjMoveNfa_0(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 36;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -983,6 +991,11 @@
}
else
{
+ int hiByte = (int)(curChar >> 8);
+ int i1 = hiByte >> 6;
+ long l1 = 1L << (hiByte & 077);
+ int i2 = (curChar & 0xff) >> 6;
+ long l2 = 1L << (curChar & 077);
MatchLoop: do
{
switch(jjstateSet[--i])
@@ -1004,6 +1017,26 @@
catch(java.io.IOException e) { return curPos; }
}
}
+private final int jjStopStringLiteralDfa_1(int pos, long active0)
+{
+ switch (pos)
+ {
+ default :
+ return -1;
+ }
+}
+private final int jjStartNfa_1(int pos, long active0)
+{
+ return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_1(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_1(state, pos + 1);
+}
private final int jjMoveStringLiteralDfa0_1()
{
switch(curChar)
@@ -1022,11 +1055,12 @@
};
private final int jjMoveNfa_1(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 6;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -1095,7 +1129,7 @@
}
else
{
- int hiByte = (curChar >> 8);
+ int hiByte = (int)(curChar >> 8);
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
@@ -1125,6 +1159,26 @@
catch(java.io.IOException e) { return curPos; }
}
}
+private final int jjStopStringLiteralDfa_2(int pos, long active0)
+{
+ switch (pos)
+ {
+ default :
+ return -1;
+ }
+}
+private final int jjStartNfa_2(int pos, long active0)
+{
+ return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_2(state, pos + 1);
+}
private final int jjMoveStringLiteralDfa0_2()
{
switch(curChar)
@@ -1137,11 +1191,12 @@
}
private final int jjMoveNfa_2(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 6;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -1210,7 +1265,7 @@
}
else
{
- int hiByte = (curChar >> 8);
+ int hiByte = (int)(curChar >> 8);
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
@@ -1348,6 +1403,8 @@
public Token getNextToken()
{
+ int kind;
+ Token specialToken = null;
Token matchedToken;
int curPos = 0;