Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1880] trunk/src/jason
|
From: <jom...@us...> - 2016-03-21 18:51:07
|
Revision: 1880
http://sourceforge.net/p/jason/svn/1880
Author: jomifred
Date: 2016-03-21 18:51:04 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
initial syntax for |&| and |||
Modified Paths:
--------------
trunk/src/jason/asSemantics/TransitionSystem.java
trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
trunk/src/jason/asSyntax/parser/as2j.java
trunk/src/jason/asSyntax/parser/as2jConstants.java
trunk/src/jason/asSyntax/parser/as2jTokenManager.java
trunk/src/jason/stdlib/fork.java
Modified: trunk/src/jason/asSemantics/TransitionSystem.java
===================================================================
--- trunk/src/jason/asSemantics/TransitionSystem.java 2016-03-13 20:16:54 UTC (rev 1879)
+++ trunk/src/jason/asSemantics/TransitionSystem.java 2016-03-21 18:51:04 UTC (rev 1880)
@@ -652,19 +652,24 @@
logger.log(Level.SEVERE, msg);
return;
}
- h = (PlanBody)bTerm;
- if (h.getPlanSize() > 1) { // the case of A unified with {a;b;c}
- h.add(im.getCurrentStep().getBodyNext());
- im.insertAsNextStep(h.getBodyNext());
- }
- bTerm = h.getBodyTerm();
}
}
-
+
+ if (bTerm.isPlanBody()) {
+ h = (PlanBody)bTerm;
+ if (h.getPlanSize() > 1) {
+ h = (PlanBody)bTerm.clone();
+ h.add(im.getCurrentStep().getBodyNext());
+ im.insertAsNextStep(h.getBodyNext());
+ }
+ bTerm = h.getBodyTerm();
+ }
+
Literal body = null;
if (bTerm instanceof Literal)
body = (Literal)bTerm;
+
switch (h.getBodyType()) {
case none: break;
Modified: trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
===================================================================
--- trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-03-13 20:16:54 UTC (rev 1879)
+++ trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-03-21 18:51:04 UTC (rev 1880)
@@ -166,6 +166,9 @@
| <TK_FOR: "for" >
| <TK_WHILE: "while" >
+| <TK_PAND: "|&|" >
+| <TK_POR: "|||" >
+
// Numbers
| <NUMBER: ["0"-"9"] (["0"-"9"])*
| (["0"-"9"])* "." (["0"-"9"])+ (["e","E"] (["+","-"])? (["0"-"9"])+)?
@@ -380,35 +383,69 @@
/* Plan body */
-PlanBody plan_body() : { Object F; PlanBody R = null; boolean hasPV = false; boolean isControl = true; }
+PlanBody plan_body() : { Object F; PlanBody R = null; }
{
-( F = stmtIF()
-| F = stmtFOR()
-| F = stmtWHILE()
-| F = body_formula() { isControl = false; if (!(F instanceof PlanBody)) throw new ParseException(getSourceRef(F)+" "+F+" is not a body literal!"); }
-)
- // TODO: NOTE: in future releases, when old syntax for if/while/for could be forgotten,
- // change to:
- // ( F = stmtIF() ( R = plan_body() | "." )
- // | F = stmtFOR() ( R = plan_body() | "." )
- // | F = stmtWHILE() ( R = plan_body() | "." )
- // | F = body_formula() (";" R = plan_body() | ".")
-
- [ ";" { hasPV = true; }
- ]
- [ R = plan_body() ]
- { if (R != null) {
- if (!isControl && !hasPV) {
- throw new ParseException(getSourceRef(F)+" Expected ';' after '"+F+"'.");
- }
+F = plan_body_term()
+
+[ ";" ][ R = plan_body() ]
+
+ { if (R != null) {
+ //if (!isControl && !hasPV) {
+ // throw new ParseException(getSourceRef(F)+" Expected ';' after '"+F+"'.");
+ //}
((PlanBody)F).setBodyNext( R );
- }
-
- return (PlanBody)F;
- }
+ }
+ return (PlanBody)F;
+ }
+
}
+PlanBody plan_body_term() : { Object F; PlanBody R = null; Literal stmtLiteral; }
+{
+F = plan_body_factor()
+[ <TK_POR> R = plan_body_term() ]
+
+ {
+ if (R == null)
+ return (PlanBody)F;
+ try {
+ stmtLiteral = new InternalActionLiteral(ASSyntax.createStructure(".fork", jason.stdlib.fork.aOr, (Term)F, (Term)R), curAg);
+ stmtLiteral.setSrcInfo( ((Term)F).getSrcInfo() );
+ return new PlanBodyImpl(BodyType.internalAction, stmtLiteral);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
+
+PlanBody plan_body_factor() : { Object F; PlanBody R = null; Literal stmtLiteral; } // boolean hasPV = false; boolean isControl = true; }
+{
+
+( F = stmtIF()
+| F = stmtFOR()
+| F = stmtWHILE()
+| F = body_formula() { //isControl = false;
+ if (!(F instanceof PlanBody)) throw new ParseException(getSourceRef(F)+" "+F+" is not a body literal!"); }
+)
+
+ //[ ";" { hasPV = true; }
+ //]
+ [ <TK_PAND> R = plan_body_factor() ]
+ {
+ if (R == null)
+ return (PlanBody)F;
+ try {
+ stmtLiteral = new InternalActionLiteral(ASSyntax.createStructure(".fork", jason.stdlib.fork.aAnd, (Term)F, (Term)R), curAg);
+ stmtLiteral.setSrcInfo( ((Term)F).getSrcInfo() );
+ return new PlanBodyImpl(BodyType.internalAction, stmtLiteral);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
+
+
PlanBody stmtIF() : { Object B; Term T1; Term T2 = null; Literal stmtLiteral; boolean useElse = false; }
{
<TK_IF>
@@ -606,7 +643,6 @@
if (B == null)
B = new PlanBodyImpl();
B.setAsBodyTerm(true);
-
return B;
}
}
Modified: trunk/src/jason/asSyntax/parser/as2j.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2j.java 2016-03-13 20:16:54 UTC (rev 1879)
+++ trunk/src/jason/asSyntax/parser/as2j.java 2016-03-21 18:51:04 UTC (rev 1880)
@@ -117,7 +117,7 @@
label_1:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 30:
+ case 32:
;
break;
default:
@@ -138,7 +138,7 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
- case 47:
+ case 49:
;
break;
default:
@@ -150,7 +150,7 @@
label_3:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 30:
+ case 32:
;
break;
default:
@@ -164,7 +164,7 @@
label_4:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 34:
+ case 36:
;
break;
default:
@@ -176,7 +176,7 @@
label_5:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 30:
+ case 32:
;
break;
default:
@@ -191,9 +191,9 @@
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TK_LABEL_AT:
- case 37:
- case 38:
case 39:
+ case 40:
+ case 41:
;
break;
default:
@@ -222,7 +222,7 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
- case 47:
+ case 49:
;
break;
default:
@@ -243,7 +243,7 @@
label_8:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 30:
+ case 32:
;
break;
default:
@@ -270,11 +270,11 @@
Agent bakAg = curAg;
boolean isEOF = false;
Atom oldNS = null;
- jj_consume_token(30);
+ jj_consume_token(32);
if (jj_2_1(4)) {
jj_consume_token(TK_BEGIN);
dir = pred();
- jj_consume_token(31);
+ jj_consume_token(33);
Agent innerAg = new Agent(); innerAg.initAg();
dir = new Pred(namespace, dir);
Directive d = directiveProcessor.getInstance(dir);
@@ -291,7 +291,7 @@
case TK_END:
case ATOM:
dir = pred();
- jj_consume_token(31);
+ jj_consume_token(33);
if (dir.toString().equals("end"))
{if (true) return true;}
dir = new Pred(namespace, dir);
@@ -323,8 +323,8 @@
{if (true) throw new ParseException(getSourceRef(h)+" variables cannot be beliefs!");}
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 32:
- jj_consume_token(32);
+ case 34:
+ jj_consume_token(34);
t = log_expr();
h = new Rule(h,(LogicalFormula)t);
// warning only not parsed files
@@ -339,7 +339,7 @@
jj_la1[9] = jj_gen;
;
}
- jj_consume_token(33);
+ jj_consume_token(35);
{if (true) return h;}
throw new Error("Missing return statement in function");
}
@@ -347,9 +347,9 @@
/* Initial goals */
final public Literal initial_goal() throws ParseException {
Literal g;
- jj_consume_token(34);
+ jj_consume_token(36);
g = literal();
- jj_consume_token(33);
+ jj_consume_token(35);
if (g.isVar()) {
{if (true) throw new ParseException(getSourceRef(g)+". a variable cannot be a goal!");}
}
@@ -378,8 +378,8 @@
// use literal to allow namespace
T = trigger();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 35:
- k = jj_consume_token(35);
+ case 37:
+ k = jj_consume_token(37);
C = log_expr();
if (start == -1) start = k.beginLine;
break;
@@ -388,8 +388,8 @@
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 36:
- k = jj_consume_token(36);
+ case 38:
+ k = jj_consume_token(38);
B = plan_body();
if (start == -1) start = k.beginLine;
break;
@@ -397,7 +397,7 @@
jj_la1[12] = jj_gen;
;
}
- k = jj_consume_token(33);
+ k = jj_consume_token(35);
if (start == -1) start = k.beginLine;
end = k.beginLine;
InternalActionLiteral ial = null;
@@ -418,16 +418,16 @@
TEType teType = TEType.belief;
Literal F;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 37:
- jj_consume_token(37);
+ case 39:
+ jj_consume_token(39);
teOp = TEOperator.add;
break;
- case 38:
- jj_consume_token(38);
+ case 40:
+ jj_consume_token(40);
teOp = TEOperator.del;
break;
- case 39:
- jj_consume_token(39);
+ case 41:
+ jj_consume_token(41);
teOp = TEOperator.goalState;
break;
default:
@@ -436,15 +436,15 @@
throw new ParseException();
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 34:
- case 40:
+ case 36:
+ case 42:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 34:
- jj_consume_token(34);
+ case 36:
+ jj_consume_token(36);
teType = TEType.achieve;
break;
- case 40:
- jj_consume_token(40);
+ case 42:
+ jj_consume_token(42);
teType = TEType.test;
break;
default:
@@ -464,17 +464,17 @@
/* Plan body */
final public PlanBody plan_body() throws ParseException {
- Object F; PlanBody R = null; boolean hasPV = false; boolean isControl = true;
+ Object F; PlanBody R = null;
+ F = plan_body_term();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case TK_IF:
- F = stmtIF();
+ case 43:
+ jj_consume_token(43);
break;
- case TK_FOR:
- F = stmtFOR();
- break;
- case TK_WHILE:
- F = stmtWHILE();
- break;
+ default:
+ jj_la1[16] = jj_gen;
+ ;
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR:
case TK_TRUE:
case TK_FALSE:
@@ -482,36 +482,73 @@
case TK_NEG:
case TK_BEGIN:
case TK_END:
+ case TK_IF:
+ case TK_FOR:
+ case TK_WHILE:
case NUMBER:
case STRING:
case ATOM:
case UNNAMEDVAR:
- case 30:
- case 34:
- case 37:
- case 38:
+ case 32:
+ case 36:
+ case 39:
case 40:
case 42:
case 44:
- case 47:
- F = body_formula();
- isControl = false; if (!(F instanceof PlanBody)) {if (true) throw new ParseException(getSourceRef(F)+" "+F+" is not a body literal!");}
+ case 46:
+ case 49:
+ R = plan_body();
break;
default:
- jj_la1[16] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ jj_la1[17] = jj_gen;
+ ;
}
+ if (R != null) {
+ //if (!isControl && !hasPV) {
+ // throw new ParseException(getSourceRef(F)+" Expected ';' after '"+F+"'.");
+ //}
+ ((PlanBody)F).setBodyNext( R );
+ }
+ {if (true) return (PlanBody)F;}
+ throw new Error("Missing return statement in function");
+ }
+
+ final public PlanBody plan_body_term() throws ParseException {
+ Object F; PlanBody R = null; Literal stmtLiteral;
+ F = plan_body_factor();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 41:
- jj_consume_token(41);
- hasPV = true;
+ case TK_POR:
+ jj_consume_token(TK_POR);
+ R = plan_body_term();
break;
default:
- jj_la1[17] = jj_gen;
+ jj_la1[18] = jj_gen;
;
}
+ if (R == null)
+ {if (true) return (PlanBody)F;}
+ try {
+ stmtLiteral = new InternalActionLiteral(ASSyntax.createStructure(".fork", jason.stdlib.fork.aOr, (Term)F, (Term)R), curAg);
+ stmtLiteral.setSrcInfo( ((Term)F).getSrcInfo() );
+ {if (true) return new PlanBodyImpl(BodyType.internalAction, stmtLiteral);}
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ throw new Error("Missing return statement in function");
+ }
+
+ final public PlanBody plan_body_factor() throws ParseException {
+ Object F; PlanBody R = null; Literal stmtLiteral;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case TK_IF:
+ F = stmtIF();
+ break;
+ case TK_FOR:
+ F = stmtFOR();
+ break;
+ case TK_WHILE:
+ F = stmtWHILE();
+ break;
case VAR:
case TK_TRUE:
case TK_FALSE:
@@ -519,61 +556,71 @@
case TK_NEG:
case TK_BEGIN:
case TK_END:
- case TK_IF:
- case TK_FOR:
- case TK_WHILE:
case NUMBER:
case STRING:
case ATOM:
case UNNAMEDVAR:
- case 30:
- case 34:
- case 37:
- case 38:
+ case 32:
+ case 36:
+ case 39:
case 40:
case 42:
case 44:
- case 47:
- R = plan_body();
+ case 46:
+ case 49:
+ F = body_formula();
+ //isControl = false;
+ if (!(F instanceof PlanBody)) {if (true) throw new ParseException(getSourceRef(F)+" "+F+" is not a body literal!");}
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[19] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case TK_PAND:
+ jj_consume_token(TK_PAND);
+ R = plan_body_factor();
+ break;
+ default:
+ jj_la1[20] = jj_gen;
;
}
- if (R != null) {
- if (!isControl && !hasPV) {
- {if (true) throw new ParseException(getSourceRef(F)+" Expected ';' after '"+F+"'.");}
- }
- ((PlanBody)F).setBodyNext( R );
- }
-
- {if (true) return (PlanBody)F;}
+ if (R == null)
+ {if (true) return (PlanBody)F;}
+ try {
+ stmtLiteral = new InternalActionLiteral(ASSyntax.createStructure(".fork", jason.stdlib.fork.aAnd, (Term)F, (Term)R), curAg);
+ stmtLiteral.setSrcInfo( ((Term)F).getSrcInfo() );
+ {if (true) return new PlanBodyImpl(BodyType.internalAction, stmtLiteral);}
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
throw new Error("Missing return statement in function");
}
final public PlanBody stmtIF() throws ParseException {
Object B; Term T1; Term T2 = null; Literal stmtLiteral; boolean useElse = false;
jj_consume_token(TK_IF);
- jj_consume_token(42);
+ jj_consume_token(44);
B = log_expr();
- jj_consume_token(43);
+ jj_consume_token(45);
T1 = rule_plan_term();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TK_ELSE:
- case 30:
+ case 32:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TK_ELSE:
jj_consume_token(TK_ELSE);
useElse = true;
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[21] = jj_gen;
;
}
T2 = rule_plan_term();
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[22] = jj_gen;
;
}
try {
@@ -603,9 +650,9 @@
final public PlanBody stmtFOR() throws ParseException {
Object B; Term T1; Literal stmtLiteral;
jj_consume_token(TK_FOR);
- jj_consume_token(42);
+ jj_consume_token(44);
B = log_expr();
- jj_consume_token(43);
+ jj_consume_token(45);
T1 = rule_plan_term();
try {
if (T1.isRule()) {
@@ -623,9 +670,9 @@
final public PlanBody stmtWHILE() throws ParseException {
Object B; Term T1; Literal stmtLiteral;
jj_consume_token(TK_WHILE);
- jj_consume_token(42);
+ jj_consume_token(44);
B = log_expr();
- jj_consume_token(43);
+ jj_consume_token(45);
T1 = rule_plan_term();
try {
if (T1.isRule()) {
@@ -643,80 +690,80 @@
final public Object body_formula() throws ParseException {
BodyType formType = BodyType.action; Object B;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 34:
- case 37:
- case 38:
+ case 36:
+ case 39:
case 40:
- case 44:
+ case 42:
+ case 46:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 34:
- jj_consume_token(34);
+ case 36:
+ jj_consume_token(36);
formType = BodyType.achieve;
break;
- case 44:
- jj_consume_token(44);
+ case 46:
+ jj_consume_token(46);
formType = BodyType.achieveNF;
break;
- case 40:
- jj_consume_token(40);
+ case 42:
+ jj_consume_token(42);
formType = BodyType.test;
break;
- case 37:
- jj_consume_token(37);
+ case 39:
+ jj_consume_token(39);
formType = BodyType.addBel;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 37:
- case 45:
- case 46:
+ case 39:
+ case 47:
+ case 48:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 37:
- jj_consume_token(37);
+ case 39:
+ jj_consume_token(39);
formType = BodyType.addBelNewFocus;
break;
- case 45:
- jj_consume_token(45);
+ case 47:
+ jj_consume_token(47);
formType = BodyType.addBel;
break;
- case 46:
- jj_consume_token(46);
+ case 48:
+ jj_consume_token(48);
formType = BodyType.addBelEnd;
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[23] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[24] = jj_gen;
;
}
break;
- case 38:
- jj_consume_token(38);
+ case 40:
+ jj_consume_token(40);
formType = BodyType.delBel;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 37:
- jj_consume_token(37);
+ case 39:
+ jj_consume_token(39);
formType = BodyType.delAddBel;
break;
default:
- jj_la1[23] = jj_gen;
+ jj_la1[25] = jj_gen;
;
}
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[26] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[27] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 30:
+ case 32:
B = rule_plan_term();
break;
case VAR:
@@ -730,14 +777,14 @@
case STRING:
case ATOM:
case UNNAMEDVAR:
- case 37:
- case 38:
- case 42:
- case 47:
+ case 39:
+ case 40:
+ case 44:
+ case 49:
B = log_expr();
break;
default:
- jj_la1[26] = jj_gen;
+ jj_la1[28] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -784,7 +831,7 @@
boolean pb = true; // pb = "only plan body"
Pred L = null;
Literal h = null; Object t = null;
- jj_consume_token(30);
+ jj_consume_token(32);
if (jj_2_2(4)) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TK_LABEL_AT:
@@ -793,41 +840,41 @@
pb = false;
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[29] = jj_gen;
;
}
T = trigger();
if (T.getType() != TEType.belief) pb = false;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 35:
- jj_consume_token(35);
+ case 37:
+ jj_consume_token(37);
C = log_expr();
pb = false;
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[30] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 36:
- case 41:
+ case 38:
+ case 43:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 36:
- jj_consume_token(36);
+ case 38:
+ jj_consume_token(38);
pb = false;
break;
- case 41:
- jj_consume_token(41);
+ case 43:
+ jj_consume_token(43);
if (!pb) {if (true) throw new ParseException(getSourceRef(T)+" Wrong place for ';'");}
break;
default:
- jj_la1[29] = jj_gen;
+ jj_la1[31] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[32] = jj_gen;
;
}
} else {
@@ -835,7 +882,7 @@
}
if (jj_2_3(50)) {
h = literal();
- jj_consume_token(32);
+ jj_consume_token(34);
t = log_expr();
} else {
;
@@ -855,21 +902,21 @@
case STRING:
case ATOM:
case UNNAMEDVAR:
- case 30:
- case 34:
- case 37:
- case 38:
+ case 32:
+ case 36:
+ case 39:
case 40:
case 42:
case 44:
- case 47:
+ case 46:
+ case 49:
B = plan_body();
break;
default:
- jj_la1[31] = jj_gen;
+ jj_la1[33] = jj_gen;
;
}
- jj_consume_token(31);
+ jj_consume_token(33);
if (h != null) {
Rule r = new Rule(h,(LogicalFormula)t);
r.setAsTerm(true);
@@ -905,7 +952,6 @@
if (B == null)
B = new PlanBodyImpl();
B.setAsBodyTerm(true);
-
{if (true) return B;}
throw new Error("Missing return statement in function");
}
@@ -921,7 +967,7 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
- case 47:
+ case 49:
if (jj_2_4(10)) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR:
@@ -946,16 +992,16 @@
explicitAbstractNS = false;
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[35] = jj_gen;
;
}
- jj_consume_token(47);
+ jj_consume_token(49);
if (explicitAbstractNS)
NS = thisnamespace;
} else {
@@ -967,7 +1013,7 @@
type = Literal.LNeg;
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[36] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -984,7 +1030,7 @@
{if (true) return vt;}
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[37] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -998,7 +1044,7 @@
{if (true) return Literal.LFalse;}
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[38] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1041,30 +1087,30 @@
K = jj_consume_token(TK_END);
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[39] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
p = new Pred(K.image);
p.setSrcInfo(new SourceInfo(asSource, K.beginLine));
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 42:
- jj_consume_token(42);
+ case 44:
+ jj_consume_token(44);
l = terms();
- jj_consume_token(43);
+ jj_consume_token(45);
p.setTerms(l);
break;
default:
- jj_la1[38] = jj_gen;
+ jj_la1[40] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 49:
+ case 51:
lt = list();
p.setAnnots(lt);
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[41] = jj_gen;
;
}
namespace = ons;
@@ -1080,14 +1126,14 @@
label_9:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 48:
+ case 50:
;
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[42] = jj_gen;
break label_9;
}
- jj_consume_token(48);
+ jj_consume_token(50);
v = term();
listTerms.add(v);
}
@@ -1099,10 +1145,10 @@
final public Term term() throws ParseException {
Object o;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 49:
+ case 51:
o = list();
break;
- case 30:
+ case 32:
o = rule_plan_term();
break;
case VAR:
@@ -1116,14 +1162,14 @@
case STRING:
case ATOM:
case UNNAMEDVAR:
- case 37:
- case 38:
- case 42:
- case 47:
+ case 39:
+ case 40:
+ case 44:
+ case 49:
o = log_expr();
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[43] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1133,7 +1179,7 @@
final public ListTermImpl list() throws ParseException {
ListTermImpl lt = new ListTermImpl(); ListTerm last; Token K; Term f;
- jj_consume_token(49);
+ jj_consume_token(51);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR:
case TK_TRUE:
@@ -1145,31 +1191,31 @@
case STRING:
case ATOM:
case UNNAMEDVAR:
- case 30:
- case 37:
- case 38:
- case 42:
- case 47:
+ case 32:
+ case 39:
+ case 40:
+ case 44:
case 49:
+ case 51:
f = term_in_list();
last = lt.append(f); lt.setSrcInfo(f.getSrcInfo());
label_10:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 48:
+ case 50:
;
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[44] = jj_gen;
break label_10;
}
- jj_consume_token(48);
+ jj_consume_token(50);
f = term_in_list();
last = last.append(f);
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 50:
- jj_consume_token(50);
+ case 52:
+ jj_consume_token(52);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR:
K = jj_consume_token(VAR);
@@ -1179,26 +1225,26 @@
K = jj_consume_token(UNNAMEDVAR);
last.setNext(UnnamedVar.create(K.image));
break;
- case 49:
+ case 51:
f = list();
last = last.concat((ListTerm)f);
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[45] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[46] = jj_gen;
;
}
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[47] = jj_gen;
;
}
- jj_consume_token(51);
+ jj_consume_token(53);
{if (true) return lt;}
throw new Error("Missing return statement in function");
}
@@ -1207,7 +1253,7 @@
final public Term term_in_list() throws ParseException {
Object o;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 49:
+ case 51:
o = list();
break;
case VAR:
@@ -1219,20 +1265,20 @@
case NUMBER:
case ATOM:
case UNNAMEDVAR:
- case 37:
- case 38:
- case 42:
- case 47:
+ case 39:
+ case 40:
+ case 44:
+ case 49:
o = arithm_expr();
break;
case STRING:
o = string();
break;
- case 30:
+ case 32:
o = rule_plan_term();
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[48] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1245,13 +1291,13 @@
Object t1, t2;
t1 = log_expr_trm();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 50:
- jj_consume_token(50);
+ case 52:
+ jj_consume_token(52);
t2 = log_expr();
{if (true) return new LogExpr((LogicalFormula)t1,LogicalOp.or,(LogicalFormula)t2);}
break;
default:
- jj_la1[47] = jj_gen;
+ jj_la1[49] = jj_gen;
;
}
{if (true) return t1;}
@@ -1262,13 +1308,13 @@
Object t1, t2;
t1 = log_expr_factor();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 52:
- jj_consume_token(52);
+ case 54:
+ jj_consume_token(54);
t2 = log_expr_trm();
{if (true) return new LogExpr((LogicalFormula)t1,LogicalOp.and,(LogicalFormula)t2);}
break;
default:
- jj_la1[48] = jj_gen;
+ jj_la1[50] = jj_gen;
;
}
{if (true) return t1;}
@@ -1293,15 +1339,15 @@
case STRING:
case ATOM:
case UNNAMEDVAR:
- case 37:
- case 38:
- case 42:
- case 47:
+ case 39:
+ case 40:
+ case 44:
+ case 49:
t = rel_expr();
{if (true) return t;}
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[51] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1329,64 +1375,64 @@
case NUMBER:
case ATOM:
case UNNAMEDVAR:
- case 37:
- case 38:
- case 42:
- case 47:
+ case 39:
+ case 40:
+ case 44:
+ case 49:
op1 = arithm_expr();
break;
case STRING:
op1 = string();
break;
default:
- jj_la1[50] = jj_gen;
+ jj_la1[52] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 45:
- case 46:
- case 53:
- case 54:
+ case 47:
+ case 48:
case 55:
case 56:
case 57:
case 58:
+ case 59:
+ case 60:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 45:
- jj_consume_token(45);
+ case 47:
+ jj_consume_token(47);
operator = RelationalOp.lt;
break;
- case 53:
- jj_consume_token(53);
+ case 55:
+ jj_consume_token(55);
operator = RelationalOp.lte;
break;
- case 46:
- jj_consume_token(46);
+ case 48:
+ jj_consume_token(48);
operator = RelationalOp.gt;
break;
- case 54:
- jj_consume_token(54);
+ case 56:
+ jj_consume_token(56);
operator = RelationalOp.gte;
break;
- case 55:
- jj_consume_token(55);
+ case 57:
+ jj_consume_token(57);
operator = RelationalOp.eq;
break;
- case 56:
- jj_consume_token(56);
+ case 58:
+ jj_consume_token(58);
operator = RelationalOp.dif;
break;
- case 57:
- jj_consume_token(57);
+ case 59:
+ jj_consume_token(59);
operator = RelationalOp.unify;
break;
- case 58:
- jj_consume_token(58);
+ case 60:
+ jj_consume_token(60);
operator = RelationalOp.literalBuilder;
break;
default:
- jj_la1[51] = jj_gen;
+ jj_la1[53] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1400,23 +1446,23 @@
case NUMBER:
case ATOM:
case UNNAMEDVAR:
- case 37:
- case 38:
- case 42:
- case 47:
+ case 39:
+ case 40:
+ case 44:
+ case 49:
op2 = arithm_expr();
break;
case STRING:
op2 = string();
break;
- case 49:
+ case 51:
op2 = list();
break;
- case 30:
+ case 32:
op2 = rule_plan_term();
break;
default:
- jj_la1[52] = jj_gen;
+ jj_la1[54] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1427,7 +1473,7 @@
{if (true) return new RelExpr((Term)op1, operator, (Term)op2);}
break;
default:
- jj_la1[53] = jj_gen;
+ jj_la1[55] = jj_gen;
;
}
{if (true) return op1;}
@@ -1442,25 +1488,25 @@
label_11:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 37:
- case 38:
+ case 39:
+ case 40:
;
break;
default:
- jj_la1[54] = jj_gen;
+ jj_la1[56] = jj_gen;
break label_11;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 37:
- jj_consume_token(37);
+ case 39:
+ jj_consume_token(39);
op = ArithmeticOp.plus;
break;
- case 38:
- jj_consume_token(38);
+ case 40:
+ jj_consume_token(40);
op = ArithmeticOp.minus;
break;
default:
- jj_la1[55] = jj_gen;
+ jj_la1[57] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1486,21 +1532,21 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TK_INTDIV:
case TK_INTMOD:
- case 59:
- case 60:
+ case 61:
+ case 62:
;
break;
default:
- jj_la1[56] = jj_gen;
+ jj_la1[58] = jj_gen;
break label_12;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 59:
- jj_consume_token(59);
+ case 61:
+ jj_consume_token(61);
op = ArithmeticOp.times;
break;
- case 60:
- jj_consume_token(60);
+ case 62:
+ jj_consume_token(62);
op = ArithmeticOp.div;
break;
case TK_INTDIV:
@@ -1512,7 +1558,7 @@
op = ArithmeticOp.mod;
break;
default:
- jj_la1[57] = jj_gen;
+ jj_la1[59] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1534,8 +1580,8 @@
t1 = arithm_expr_simple();
op = ArithmeticOp.none;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 61:
- jj_consume_token(61);
+ case 63:
+ jj_consume_token(63);
op = ArithmeticOp.pow;
t2 = arithm_expr_factor();
if (!(t1 instanceof NumberTerm)) {
@@ -1547,7 +1593,7 @@
{if (true) return new ArithExpr((NumberTerm)t1, op, (NumberTerm)t2);}
break;
default:
- jj_la1[58] = jj_gen;
+ jj_la1[60] = jj_gen;
;
}
{if (true) return t1;}
@@ -1563,26 +1609,26 @@
ni.setSrcInfo(new SourceInfo(asSource, K.beginLine));
{if (true) return ni;}
break;
- case 38:
- jj_consume_token(38);
+ case 40:
+ jj_consume_token(40);
t = arithm_expr_simple();
if (!(t instanceof NumberTerm)) {
{if (true) throw new ParseException(getSourceRef(t)+" The argument '"+t+"' of operator '-' is not numeric or variable.");}
}
{if (true) return new ArithExpr(ArithmeticOp.minus, (NumberTerm)t);}
break;
- case 37:
- jj_consume_token(37);
+ case 39:
+ jj_consume_token(39);
t = arithm_expr_simple();
if (!(t instanceof NumberTerm)) {
{if (true) throw new ParseException(getSourceRef(t)+" The argument '"+t+"' of operator '+' is not numeric or variable.");}
}
{if (true) return new ArithExpr(ArithmeticOp.plus, (NumberTerm)t);}
break;
- case 42:
- jj_consume_token(42);
+ case 44:
+ jj_consume_token(44);
t = log_expr();
- jj_consume_token(43);
+ jj_consume_token(45);
{if (true) return t;}
break;
case VAR:
@@ -1593,12 +1639,12 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
- case 47:
+ case 49:
t = function();
{if (true) return t;}
break;
default:
- jj_la1[59] = jj_gen;
+ jj_la1[61] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1633,17 +1679,17 @@
v = UnnamedVar.create(ns, K.image);
break;
default:
- jj_la1[60] = jj_gen;
+ jj_la1[62] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 49:
+ case 51:
lt = list();
v.setAnnots(lt);
break;
default:
- jj_la1[61] = jj_gen;
+ jj_la1[63] = jj_gen;
;
}
{if (true) return v;}
@@ -1687,48 +1733,11 @@
finally { jj_save(3, xla); }
}
- final private boolean jj_3R_48() {
- if (jj_scan_token(40)) return true;
- return false;
- }
-
- final private boolean jj_3_3() {
+ final private boolean jj_3R_117() {
if (jj_3R_19()) return true;
- if (jj_scan_token(32)) return true;
- if (jj_3R_20()) return true;
return false;
}
- final private boolean jj_3R_47() {
- if (jj_scan_token(34)) return true;
- return false;
- }
-
- final private boolean jj_3R_33() {
- if (jj_scan_token(41)) return true;
- return false;
- }
-
- final private boolean jj_3R_72() {
- if (jj_3R_68()) return true;
- return false;
- }
-
- final private boolean jj_3R_32() {
- if (jj_scan_token(36)) return true;
- return false;
- }
-
- final private boolean jj_3R_71() {
- if (jj_3R_77()) return true;
- return false;
- }
-
- final private boolean jj_3R_70() {
- if (jj_3R_76()) return true;
- return false;
- }
-
final private boolean jj_3R_31() {
Token xsp;
xsp = jj_scanpos;
@@ -1739,93 +1748,36 @@
return false;
}
- final private boolean jj_3R_17() {
- if (jj_scan_token(35)) return true;
- if (jj_3R_20()) return true;
- return false;
- }
-
- final private boolean jj_3R_18() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_32()) {
- jj_scanpos = xsp;
- if (jj_3R_33()) return true;
- }
- return false;
- }
-
- final private boolean jj_3R_69() {
- if (jj_3R_42()) return true;
- return false;
- }
-
final private boolean jj_3R_30() {
- if (jj_scan_token(39)) return true;
+ if (jj_scan_token(41)) return true;
return false;
}
- final private boolean jj_3R_66() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_69()) {
- jj_scanpos = xsp;
- if (jj_3R_70()) {
- jj_scanpos = xsp;
- if (jj_3R_71()) {
- jj_scanpos = xsp;
- if (jj_3R_72()) return true;
- }
- }
- }
- return false;
- }
-
- final private boolean jj_3R_97() {
- if (jj_3R_42()) return true;
- return false;
- }
-
final private boolean jj_3R_29() {
- if (jj_scan_token(38)) return true;
+ if (jj_scan_token(40)) return true;
return false;
}
- final private boolean jj_3R_15() {
- if (jj_scan_token(TK_LABEL_AT)) return true;
- if (jj_3R_13()) return true;
+ final private boolean jj_3R_78() {
+ if (jj_scan_token(50)) return true;
+ if (jj_3R_55()) return true;
return false;
}
- final private boolean jj_3R_96() {
- if (jj_scan_token(UNNAMEDVAR)) return true;
- return false;
- }
-
- final private boolean jj_3R_77() {
- if (jj_scan_token(STRING)) return true;
- return false;
- }
-
final private boolean jj_3R_28() {
- if (jj_scan_token(37)) return true;
+ if (jj_scan_token(39)) return true;
return false;
}
- final private boolean jj_3R_95() {
- if (jj_scan_token(VAR)) return true;
+ final private boolean jj_3R_114() {
+ if (jj_3R_117()) return true;
return false;
}
- final private boolean jj_3_2() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_15()) jj_scanpos = xsp;
- if (jj_3R_16()) return true;
- xsp = jj_scanpos;
- if (jj_3R_17()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_18()) jj_scanpos = xsp;
+ final private boolean jj_3R_113() {
+ if (jj_scan_token(44)) return true;
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(45)) return true;
return false;
}
@@ -1845,151 +1797,6 @@
return false;
}
- final private boolean jj_3R_68() {
- if (jj_scan_token(30)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3_2()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3_3()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_102()) jj_scanpos = xsp;
- if (jj_scan_token(31)) return true;
- return false;
- }
-
- final private boolean jj_3R_62() {
- if (jj_3R_42()) return true;
- return false;
- }
-
- final private boolean jj_3R_92() {
- if (jj_scan_token(50)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_95()) {
- jj_scanpos = xsp;
- if (jj_3R_96()) {
- jj_scanpos = xsp;
- if (jj_3R_97()) return true;
- }
- }
- return false;
- }
-
- final private boolean jj_3R_91() {
- if (jj_scan_token(48)) return true;
- if (jj_3R_66()) return true;
- return false;
- }
-
- final private boolean jj_3R_61() {
- if (jj_scan_token(UNNAMEDVAR)) return true;
- return false;
- }
-
- final private boolean jj_3R_60() {
- if (jj_scan_token(VAR)) return true;
- return false;
- }
-
- final private boolean jj_3R_56() {
- if (jj_3R_66()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_91()) { jj_scanpos = xsp; break; }
- }
- xsp = jj_scanpos;
- if (jj_3R_92()) jj_scanpos = xsp;
- return false;
- }
-
- final private boolean jj_3R_54() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_60()) {
- jj_scanpos = xsp;
- if (jj_3R_61()) return true;
- }
- xsp = jj_scanpos;
- if (jj_3R_62()) jj_scanpos = xsp;
- return false;
- }
-
- final private boolean jj_3R_42() {
- if (jj_scan_token(49)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_56()) jj_scanpos = xsp;
- if (jj_scan_token(51)) return true;
- return false;
- }
-
- final private boolean jj_3R_65() {
- if (jj_3R_20()) return true;
- return false;
- }
-
- final private boolean jj_3R_64() {
- if (jj_3R_68()) return true;
- return false;
- }
-
- final private boolean jj_3R_63() {
- if (jj_3R_42()) return true;
- return false;
- }
-
- final private boolean jj_3R_57() {
- if (jj_scan_token(TK_LABEL_AT)) return true;
- return false;
- }
-
- final private boolean jj_3R_55() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_63()) {
- jj_scanpos = xsp;
- if (jj_3R_64()) {
- jj_scanpos = xsp;
- if (jj_3R_65()) return true;
- }
- }
- return false;
- }
-
- final private boolean jj_3R_46() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_57()) jj_scanpos = xsp;
- if (jj_3R_16()) return true;
- return false;
- }
-
- final private boolean jj_3R_121() {
- if (jj_3R_19()) return true;
- return false;
- }
-
- final private boolean jj_3R_78() {
- if (jj_scan_token(48)) return true;
- if (jj_3R_55()) return true;
- return false;
- }
-
- final private boolean jj_3R_114() {
- if (jj_3R_121()) return true;
- return false;
- }
-
- final private boolean jj_3R_113() {
- if (jj_scan_token(42)) return true;
- if (jj_3R_20()) return true;
- if (jj_scan_token(43)) return true;
- return false;
- }
-
final private boolean jj_3R_41() {
if (jj_3R_55()) return true;
Token xsp;
@@ -2001,18 +1808,13 @@
}
final private boolean jj_3R_112() {
- if (jj_scan_token(37)) return true;
+ if (jj_scan_token(39)) return true;
if (jj_3R_103()) return true;
return false;
}
- final private boolean jj_3R_45() {
- if (jj_scan_token(34)) return true;
- return false;
- }
-
final private boolean jj_3R_111() {
- if (jj_scan_token(38)) return true;
+ if (jj_scan_token(40)) return true;
if (jj_3R_103()) return true;
return false;
}
@@ -2022,23 +1824,33 @@
return false;
}
+ final private boolean jj_3R_132() {
+ if (jj_3R_20()) return true;
+ return false;
+ }
+
final private boolean jj_3R_110() {
if (jj_scan_token(NUMBER)) return true;
return false;
}
final private boolean jj_3R_22() {
- if (jj_scan_token(42)) return true;
+ if (jj_scan_token(44)) return true;
if (jj_3R_41()) return true;
- if (jj_scan_token(43)) return true;
+ if (jj_scan_token(45)) return true;
return false;
}
- final private boolean jj_3R_129() {
- if (jj_3R_20()) return true;
+ final private boolean jj_3R_140() {
+ if (jj_scan_token(39)) return true;
return false;
}
+ final private boolean jj_3R_131() {
+ if (jj_3R_68()) return true;
+ return false;
+ }
+
final private boolean jj_3R_103() {
Token xsp;
xsp = jj_scanpos;
@@ -2058,64 +1870,72 @@
return false;
}
- final private boolean jj_3R_137() {
- if (jj_scan_token(37)) return true;
+ final private boolean jj_3R_143() {
+ if (jj_scan_token(48)) return true;
return false;
}
- final private boolean jj_3R_128() {
- if (jj_3R_68()) return true;
+ final private boolean jj_3R_142() {
+ if (jj_scan_token(47)) return true;
return false;
}
- final private boolean jj_3R_140() {
- if (jj_scan_token(46)) return true;
+ final private boolean jj_3R_141() {
+ if (jj_scan_token(39)) return true;
return false;
}
- final private boolean jj_3R_139() {
- if (jj_scan_token(45)) return true;
- return false;
- }
-
final private boolean jj_3R_138() {
- if (jj_scan_token(37)) return true;
- return false;
- }
-
- final private boolean jj_3R_135() {
- if (jj_scan_token(38)) return true;
+ if (jj_scan_token(40)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_137()) jj_scanpos = xsp;
+ if (jj_3R_140()) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_136() {
+ final private boolean jj_3R_139() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_138()) {
+ if (jj_3R_141()) {
jj_scanpos = xsp;
- if (jj_3R_139()) {
+ if (jj_3R_142()) {
jj_scanpos = xsp;
- if (jj_3R_140()) return true;
+ if (jj_3R_143()) return true;
}
}
return false;
}
- final private boolean jj_3R_134() {
- if (jj_scan_token(37)) return true;
+ final private boolean jj_3R_57() {
+ if (jj_scan_token(TK_LABEL_AT)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_46() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_136()) jj_scanpos = xsp;
+ if (jj_3R_57()) jj_scanpos = xsp;
+ if (jj_3R_16()) return true;
return false;
}
+ final private boolean jj_3R_137() {
+ if (jj_scan_token(39)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_139()) jj_scanpos = xsp;
+ return false;
+ }
+
+ final private boolean jj_3R_136() {
+ if (jj_scan_token(42)) return true;
+ return false;
+ }
+
final private boolean jj_3R_13() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(23)) {
+ if (jj_scan_token(25)) {
jj_scanpos = xsp;
if (jj_scan_token(14)) {
jj_scanpos = xsp;
@@ -2129,38 +1949,28 @@
return false;
}
- final private boolean jj_3R_133() {
- if (jj_scan_token(40)) return true;
+ final private boolean jj_3R_135() {
+ if (jj_scan_token(46)) return true;
return false;
}
- final private boolean jj_3R_44() {
- if (jj_3R_19()) return true;
+ final private boolean jj_3R_134() {
+ if (jj_scan_token(36)) return true;
return false;
}
- final private boolean jj_3R_132() {
- if (jj_scan_token(44)) return true;
- return false;
- }
-
- final private boolean jj_3R_131() {
- if (jj_scan_token(34)) return true;
- return false;
- }
-
- final private boolean jj_3R_127() {
+ final private boolean jj_3R_130() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_131()) {
+ if (jj_3R_134()) {
jj_scanpos = xsp;
- if (jj_3R_132()) {
+ if (jj_3R_135()) {
jj_scanpos = xsp;
- if (jj_3R_133()) {
+ if (jj_3R_136()) {
jj_scanpos = xsp;
- if (jj_3R_134()) {
+ if (jj_3R_137()) {
jj_scanpos = xsp;
- if (jj_3R_135()) return true;
+ if (jj_3R_138()) return true;
}
}
}
@@ -2169,7 +1979,7 @@
}
final private boolean jj_3R_104() {
- if (jj_scan_token(61)) return true;
+ if (jj_scan_token(63)) return true;
if (jj_3R_98()) return true;
return false;
}
@@ -2182,18 +1992,23 @@
return false;
}
- final private boolean jj_3R_125() {
+ final private boolean jj_3R_128() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_127()) jj_scanpos = xsp;
+ if (jj_3R_130()) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_128()) {
+ if (jj_3R_131()) {
jj_scanpos = xsp;
- if (jj_3R_129()) return true;
+ if (jj_3R_132()) return true;
}
return false;
}
+ final private boolean jj_3R_45() {
+ if (jj_scan_token(36)) return true;
+ return false;
+ }
+
final private boolean jj_3R_108() {
if (jj_scan_token(TK_INTMOD)) return true;
return false;
@@ -2205,12 +2020,12 @@
}
final private boolean jj_3R_106() {
- if (jj_scan_token(60)) return true;
+ if (jj_scan_token(62)) return true;
return false;
}
final private boolean jj_3R_105() {
- if (jj_scan_token(59)) return true;
+ if (jj_scan_token(61)) return true;
return false;
}
@@ -2241,11 +2056,11 @@
return false;
}
- final private boolean jj_3R_124() {
+ final private boolean jj_3R_127() {
if (jj_scan_token(TK_WHILE)) return true;
- if (jj_scan_token(42)) return true;
+ if (jj_scan_token(44)) return true;
if (jj_3R_20()) return true;
- if (jj_scan_token(43)) return true;
+ if (jj_scan_token(45)) return true;
if (jj_3R_68()) return true;
return false;
}
@@ -2266,12 +2081,17 @@
}
final private boolean jj_3R_101() {
- if (jj_scan_token(38)) return true;
+ if (jj_scan_token(40)) return true;
return false;
}
+ final private boolean jj_3R_44() {
+ if (jj_3R_19()) return true;
+ return false;
+ }
+
final private boolean jj_3R_100() {
- if (jj_scan_token(37)) return true;
+ if (jj_scan_token(39)) return true;
return false;
}
@@ -2296,14 +2116,6 @@
return false;
}
- final private boolean jj_3_1() {
- if (jj_scan_token(TK_BEGIN)) return true;
- if (jj_3R_13()) return true;
- if (jj_scan_token(31)) return true;
- if (jj_3R_14()) return true;
- return false;
- }
-
final private boolean jj_3R_76() {
if (jj_3R_93()) return true;
Token xsp;
@@ -2314,16 +2126,11 @@
return false;
}
- final private boolean jj_3R_43() {
- if (jj_scan_token(30)) return true;
- return false;
- }
-
- final private boolean jj_3R_123() {
+ final private boolean jj_3R_126() {
if (jj_scan_token(TK_FOR)) return true;
- if (jj_scan_token(42)) return true;
+ if (jj_scan_token(44)) return true;
if (jj_3R_20()) return true;
- if (jj_scan_token(43)) return true;
+ if (jj_scan_token(45)) return true;
if (jj_3R_68()) return true;
return false;
}
@@ -2354,7 +2161,7 @@
}
final private boolean jj_3R_86() {
- if (jj_scan_token(58)) return true;
+ if (jj_scan_token(60)) return true;
return false;
}
@@ -2364,7 +2171,7 @@
}
final private boolean jj_3R_85() {
- if (jj_scan_token(57)) return true;
+ if (jj_scan_token(59)) return true;
return false;
}
@@ -2379,12 +2186,12 @@
}
final private boolean jj_3R_84() {
- if (jj_scan_token(56)) return true;
+ if (jj_scan_token(58)) return true;
return false;
}
final private boolean jj_3R_83() {
- if (jj_scan_token(55)) return true;
+ if (jj_scan_token(57)) return true;
return false;
}
@@ -2392,27 +2199,27 @@
Token xsp;
xsp = jj_scanpos;
if (jj_3R_21()) jj_scanpos = xsp;
- if (jj_scan_token(47)) return true;
+ if (jj_scan_token(49)) return true;
return false;
}
final private boolean jj_3R_82() {
- if (jj_scan_token(54)) return true;
+ if (jj_scan_token(56)) return true;
return false;
}
final private boolean jj_3R_81() {
- if (jj_scan_token(46)) return true;
+ if (jj_scan_token(48)) return true;
return false;
}
final private boolean jj_3R_80() {
- if (jj_scan_token(53)) return true;
+ if (jj_scan_token(55)) return true;
return false;
}
final private boolean jj_3R_79() {
- if (jj_scan_token(45)) return true;
+ if (jj_scan_token(47)) return true;
return false;
}
@@ -2492,11 +2299,32 @@
return false;
}
- final private boolean jj_3R_130() {
+ final private boolean jj_3_1() {
+ if (jj_scan_token(TK_BEGIN)) return true;
+ if (jj_3R_13()) return true;
+ if (jj_scan_token(33)) return true;
+ if (jj_3R_14()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_133() {
if (jj_scan_token(TK_ELSE)) return true;
return false;
}
+ final private boolean jj_3R_129() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_133()) jj_scanpos = xsp;
+ if (jj_3R_68()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_43() {
+ if (jj_scan_token(32)) return true;
+ return false;
+ }
+
final private boolean jj_3R_67() {
Token xsp;
xsp = jj_scanpos;
@@ -2509,77 +2337,270 @@
return false;
}
- final private boolean jj_3R_126() {
+ final private boolean jj_3R_125() {
+ if (jj_scan_token(TK_IF)) return true;
+ if (jj_scan_token(44)) return true;
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(45)) return true;
+ if (jj_3R_68()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_130()) jj_scanpos = xsp;
- if (jj_3R_68()) return true;
+ if (jj_3R_129()) jj_scanpos = xsp;
return false;
}
+ final private boolean jj_3R_59() {
+ if (jj_3R_67()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_58() {
+ if (jj_scan_token(TK_NOT)) return true;
+ if (jj_3R_52()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_124() {
+ if (jj_scan_token(TK_PAND)) return true;
+ if (jj_3R_118()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_52() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_58()) {
+ jj_scanpos = xsp;
+ if (jj_3R_59()) return true;
+ }
+ return false;
+ }
+
+ final private boolean jj_3R_53() {
+ if (jj_scan_token(54)) return true;
+ if (jj_3R_37()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_37() {
+ if (jj_3R_52()) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_53()) jj_scanpos = xsp;
+ return false;
+ }
+
+ final private boolean jj_3R_123() {
+ if (jj_3R_128()) return true;
+ return false;
+ }
+
...
[truncated message content] |
