[Mulgara-svn] r1583 - trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog
pag at mulgara.org
pag at mulgara.org
Tue Mar 3 07:38:37 UTC 2009
Author: pag
Date: 2009-03-02 23:38:36 -0800 (Mon, 02 Mar 2009)
New Revision: 1583
Modified:
trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParser.java
trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserConstants.java
trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserTokenManager.java
Log:
Removed the Base keyword as RLog needs base: to be 'mulgara'
Modified: trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParser.java
===================================================================
--- trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParser.java 2009-03-03 07:38:22 UTC (rev 1582)
+++ trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParser.java 2009-03-03 07:38:36 UTC (rev 1583)
@@ -57,7 +57,6 @@
if (s != null) sList.add(s);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PREFIX:
- case BASE:
case IMPLIED_BY:
case INVERT:
case IDENTIFIER:
@@ -84,10 +83,6 @@
prefix();
{if (true) return null;}
break;
- case BASE:
- base();
- {if (true) return null;}
- break;
case IMPLIED_BY:
case INVERT:
case IDENTIFIER:
@@ -390,15 +385,6 @@
context.registerDomain(d, ns);
}
-/* base := BASE uri DOT */
- final public void base() throws ParseException {
- String ns;
- jj_consume_token(BASE);
- ns = uri();
- jj_consume_token(DOT);
- context.setBase(ns);
- }
-
/* dom ::= DOMAIN */
final public String dom() throws ParseException {
Token d;
@@ -436,6 +422,34 @@
finally { jj_save(2, xla); }
}
+ final private boolean jj_3R_17() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_20()) jj_scanpos = xsp;
+ if (jj_scan_token(IDENTIFIER)) return true;
+ if (jj_scan_token(LPAR)) return true;
+ if (jj_3R_13()) return true;
+ if (jj_scan_token(COMMA)) return true;
+ if (jj_3R_21()) return true;
+ if (jj_scan_token(RPAR)) return true;
+ return false;
+ }
+
+ final private boolean jj_3_1() {
+ if (jj_3R_3()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_14() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_17()) {
+ jj_scanpos = xsp;
+ if (jj_3R_18()) return true;
+ }
+ return false;
+ }
+
final private boolean jj_3R_8() {
if (jj_scan_token(VARIABLE)) return true;
if (jj_scan_token(LPAR)) return true;
@@ -521,11 +535,6 @@
return false;
}
- final private boolean jj_3R_9() {
- if (jj_scan_token(DOMAIN)) return true;
- return false;
- }
-
final private boolean jj_3R_6() {
Token xsp;
xsp = jj_scanpos;
@@ -567,6 +576,11 @@
return false;
}
+ final private boolean jj_3R_9() {
+ if (jj_scan_token(DOMAIN)) return true;
+ return false;
+ }
+
final private boolean jj_3_3() {
Token xsp;
xsp = jj_scanpos;
@@ -609,34 +623,6 @@
return false;
}
- final private boolean jj_3R_17() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_20()) jj_scanpos = xsp;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(LPAR)) return true;
- if (jj_3R_13()) return true;
- if (jj_scan_token(COMMA)) return true;
- if (jj_3R_21()) return true;
- if (jj_scan_token(RPAR)) return true;
- return false;
- }
-
- final private boolean jj_3_1() {
- if (jj_3R_3()) return true;
- return false;
- }
-
- final private boolean jj_3R_14() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_17()) {
- jj_scanpos = xsp;
- if (jj_3R_18()) return true;
- }
- return false;
- }
-
public RlogParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
@@ -652,7 +638,7 @@
jj_la1_0();
}
private static void jj_la1_0() {
- jj_la1_0 = new int[] {0xb80c300,0xb80c000,0xb80c300,0xb80c000,0x9808000,0x8000000,0xb000000,0x8000000,0x9800000,0x8000000,0x8000000,0xb000000,0xfa00000,0x4200000,0x40000,};
+ jj_la1_0 = new int[] {0x5c06100,0x5c06000,0x5c06100,0x5c06000,0x4c04000,0x4000000,0x5800000,0x4000000,0x4c00000,0x4000000,0x4000000,0x5800000,0x7d00000,0x2100000,0x20000,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[3];
private boolean jj_rescan = false;
@@ -829,8 +815,8 @@
public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[28];
- for (int i = 0; i < 28; i++) {
+ boolean[] la1tokens = new boolean[27];
+ for (int i = 0; i < 27; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
@@ -846,7 +832,7 @@
}
}
}
- for (int i = 0; i < 28; i++) {
+ for (int i = 0; i < 27; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
Modified: trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserConstants.java
===================================================================
--- trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserConstants.java 2009-03-03 07:38:22 UTC (rev 1582)
+++ trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserConstants.java 2009-03-03 07:38:36 UTC (rev 1583)
@@ -6,25 +6,24 @@
int EOF = 0;
int COMMENT = 7;
int PREFIX = 8;
- int BASE = 9;
- int LOWER_CASE_LETTER = 10;
- int UPPER_CASE_LETTER = 11;
- int DIGIT = 12;
- int J_LETTER_DIGIT = 13;
- int IMPLIED_BY = 14;
- int INVERT = 15;
- int NEGATE = 16;
- int DOT = 17;
- int COMMA = 18;
- int LPAR = 19;
- int RPAR = 20;
- int STRING_LITERAL = 21;
- int URI = 22;
- int IDENTIFIER = 23;
- int VARIABLE = 24;
- int TYPE = 25;
- int INTEGER_LITERAL = 26;
- int DOMAIN = 27;
+ int LOWER_CASE_LETTER = 9;
+ int UPPER_CASE_LETTER = 10;
+ int DIGIT = 11;
+ int J_LETTER_DIGIT = 12;
+ int IMPLIED_BY = 13;
+ int INVERT = 14;
+ int NEGATE = 15;
+ int DOT = 16;
+ int COMMA = 17;
+ int LPAR = 18;
+ int RPAR = 19;
+ int STRING_LITERAL = 20;
+ int URI = 21;
+ int IDENTIFIER = 22;
+ int VARIABLE = 23;
+ int TYPE = 24;
+ int INTEGER_LITERAL = 25;
+ int DOMAIN = 26;
int DEFAULT = 0;
int IN_COMMENT = 1;
@@ -39,7 +38,6 @@
"\"--\"",
"<COMMENT>",
"\"@prefix\"",
- "\"@base\"",
"<LOWER_CASE_LETTER>",
"<UPPER_CASE_LETTER>",
"<DIGIT>",
Modified: trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserTokenManager.java
===================================================================
--- trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserTokenManager.java 2009-03-03 07:38:22 UTC (rev 1582)
+++ trunk/src/jar/content-rlog/javacc/org/mulgara/krule/rlog/RlogParserTokenManager.java 2009-03-03 07:38:36 UTC (rev 1583)
@@ -50,26 +50,26 @@
jjmatchedKind = 5;
return jjMoveNfa_0(0, 0);
case 40:
- jjmatchedKind = 19;
+ jjmatchedKind = 18;
return jjMoveNfa_0(0, 0);
case 41:
- jjmatchedKind = 20;
+ jjmatchedKind = 19;
return jjMoveNfa_0(0, 0);
case 44:
- jjmatchedKind = 18;
+ jjmatchedKind = 17;
return jjMoveNfa_0(0, 0);
case 45:
- jjmatchedKind = 16;
+ jjmatchedKind = 15;
return jjMoveStringLiteralDfa1_0(0x40L);
case 46:
- jjmatchedKind = 17;
+ jjmatchedKind = 16;
return jjMoveNfa_0(0, 0);
case 58:
- return jjMoveStringLiteralDfa1_0(0x4000L);
+ return jjMoveStringLiteralDfa1_0(0x2000L);
case 64:
- return jjMoveStringLiteralDfa1_0(0x300L);
+ return jjMoveStringLiteralDfa1_0(0x100L);
case 126:
- jjmatchedKind = 15;
+ jjmatchedKind = 14;
return jjMoveNfa_0(0, 0);
default :
return jjMoveNfa_0(0, 0);
@@ -89,18 +89,14 @@
jjmatchedKind = 6;
jjmatchedPos = 1;
}
- else if ((active0 & 0x4000L) != 0L)
+ else if ((active0 & 0x2000L) != 0L)
{
- jjmatchedKind = 14;
+ jjmatchedKind = 13;
jjmatchedPos = 1;
}
break;
- case 66:
- return jjMoveStringLiteralDfa2_0(active0, 0x200L);
case 80:
return jjMoveStringLiteralDfa2_0(active0, 0x100L);
- case 98:
- return jjMoveStringLiteralDfa2_0(active0, 0x200L);
case 112:
return jjMoveStringLiteralDfa2_0(active0, 0x100L);
default :
@@ -118,12 +114,8 @@
}
switch(curChar)
{
- case 65:
- return jjMoveStringLiteralDfa3_0(active0, 0x200L);
case 82:
return jjMoveStringLiteralDfa3_0(active0, 0x100L);
- case 97:
- return jjMoveStringLiteralDfa3_0(active0, 0x200L);
case 114:
return jjMoveStringLiteralDfa3_0(active0, 0x100L);
default :
@@ -143,12 +135,8 @@
{
case 69:
return jjMoveStringLiteralDfa4_0(active0, 0x100L);
- case 83:
- return jjMoveStringLiteralDfa4_0(active0, 0x200L);
case 101:
return jjMoveStringLiteralDfa4_0(active0, 0x100L);
- case 115:
- return jjMoveStringLiteralDfa4_0(active0, 0x200L);
default :
break;
}
@@ -164,22 +152,8 @@
}
switch(curChar)
{
- case 69:
- if ((active0 & 0x200L) != 0L)
- {
- jjmatchedKind = 9;
- jjmatchedPos = 4;
- }
- break;
case 70:
return jjMoveStringLiteralDfa5_0(active0, 0x100L);
- case 101:
- if ((active0 & 0x200L) != 0L)
- {
- jjmatchedKind = 9;
- jjmatchedPos = 4;
- }
- break;
case 102:
return jjMoveStringLiteralDfa5_0(active0, 0x100L);
default :
@@ -300,19 +274,19 @@
case 0:
if ((0x3fe000000000000L & l) != 0L)
{
- if (kind > 26)
- kind = 26;
+ if (kind > 25)
+ kind = 25;
jjCheckNAdd(14);
}
else if (curChar == 58)
{
- if (kind > 27)
- kind = 27;
+ if (kind > 26)
+ kind = 26;
}
else if (curChar == 48)
{
- if (kind > 26)
- kind = 26;
+ if (kind > 25)
+ kind = 25;
}
else if (curChar == 60)
jjCheckNAddTwoStates(10, 11);
@@ -328,8 +302,8 @@
jjCheckNAddStates(0, 2);
break;
case 4:
- if (curChar == 34 && kind > 21)
- kind = 21;
+ if (curChar == 34 && kind > 20)
+ kind = 20;
break;
case 5:
if ((0xff000000000000L & l) != 0L)
@@ -356,43 +330,43 @@
jjCheckNAddTwoStates(10, 11);
break;
case 11:
- if (curChar == 62 && kind > 22)
- kind = 22;
+ if (curChar == 62 && kind > 21)
+ kind = 21;
break;
case 12:
- if (curChar == 48 && kind > 26)
- kind = 26;
+ if (curChar == 48 && kind > 25)
+ kind = 25;
break;
case 13:
if ((0x3fe000000000000L & l) == 0L)
break;
- if (kind > 26)
- kind = 26;
+ if (kind > 25)
+ kind = 25;
jjCheckNAdd(14);
break;
case 14:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 26)
- kind = 26;
+ if (kind > 25)
+ kind = 25;
jjCheckNAdd(14);
break;
case 15:
- if (curChar == 58 && kind > 27)
- kind = 27;
+ if (curChar == 58 && kind > 26)
+ kind = 26;
break;
case 17:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 23)
- kind = 23;
+ if (kind > 22)
+ kind = 22;
jjstateSet[jjnewStateCnt++] = 17;
break;
case 20:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 25)
- kind = 25;
+ if (kind > 24)
+ kind = 24;
jjstateSet[jjnewStateCnt++] = 20;
break;
default : break;
@@ -409,14 +383,14 @@
case 0:
if ((0x7fffffeL & l) != 0L)
{
- if (kind > 24)
- kind = 24;
+ if (kind > 23)
+ kind = 23;
jjCheckNAdd(20);
}
else if ((0x7fffffe00000000L & l) != 0L)
{
- if (kind > 23)
- kind = 23;
+ if (kind > 22)
+ kind = 22;
jjCheckNAddStates(7, 9);
}
break;
@@ -438,15 +412,15 @@
case 16:
if ((0x7fffffe00000000L & l) == 0L)
break;
- if (kind > 23)
- kind = 23;
+ if (kind > 22)
+ kind = 22;
jjCheckNAddStates(7, 9);
break;
case 17:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 23)
- kind = 23;
+ if (kind > 22)
+ kind = 22;
jjCheckNAdd(17);
break;
case 18:
@@ -456,15 +430,15 @@
case 19:
if ((0x7fffffeL & l) == 0L)
break;
- if (kind > 24)
- kind = 24;
+ if (kind > 23)
+ kind = 23;
jjCheckNAdd(20);
break;
case 20:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 25)
- kind = 25;
+ if (kind > 24)
+ kind = 24;
jjCheckNAdd(20);
break;
default : break;
@@ -626,18 +600,18 @@
}
public static final String[] jjstrLiteralImages = {
"", null, null, null, null, null, null, null, null, null, null, null, null,
-null, "\72\55", "\176", "\55", "\56", "\54", "\50", "\51", null, null, null, null,
-null, null, null, };
+"\72\55", "\176", "\55", "\56", "\54", "\50", "\51", null, null, null, null, null, null,
+null, };
public static final String[] lexStateNames = {
"DEFAULT",
"IN_COMMENT",
};
public static final int[] jjnewLexState = {
-1, -1, -1, -1, -1, -1, 1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1,
+ -1, -1,
};
static final long[] jjtoToken = {
- 0xfffc301L,
+ 0x7ffe101L,
};
static final long[] jjtoSkip = {
0xbeL,
More information about the Mulgara-svn
mailing list