Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1874] trunk
|
From: <jom...@us...> - 2016-03-01 10:18:43
|
Revision: 1874
http://sourceforge.net/p/jason/svn/1874
Author: jomifred
Date: 2016-03-01 10:18:40 +0000 (Tue, 01 Mar 2016)
Log Message:
-----------
update kqmlPlans to support NS
manage local namespaces in unification and .namespace
.include support the namespace as parameter
Modified Paths:
--------------
trunk/applications/as-unit-test/src/jason/tests/TestNS.java
trunk/src/asl/kqmlPlans.asl
trunk/src/jason/asSemantics/Unifier.java
trunk/src/jason/asSyntax/ASSyntax.java
trunk/src/jason/asSyntax/LiteralImpl.java
trunk/src/jason/asSyntax/directives/NameSpace.java
trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
trunk/src/jason/asSyntax/parser/as2j.java
trunk/src/jason/bb/DefaultBeliefBase.java
trunk/src/jason/stdlib/include.java
trunk/src/test/BeliefBaseTest.java
trunk/src/test/NSTest.java
trunk/src/xml/agInspection.xsl
Added Paths:
-----------
trunk/src/jason/stdlib/namespace.java
Removed Paths:
-------------
trunk/src/jason/stdlib/name_space.java
Modified: trunk/applications/as-unit-test/src/jason/tests/TestNS.java
===================================================================
--- trunk/applications/as-unit-test/src/jason/tests/TestNS.java 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/applications/as-unit-test/src/jason/tests/TestNS.java 2016-03-01 10:18:40 UTC (rev 1874)
@@ -37,10 +37,10 @@
" .findall(FV, NS::b(FV,_::_), L); "+
" jason.asunit.print(L); "+
". \n" +
- "+!ia : .name_space(ns1) <- "+
- " .findall(J, .name_space(J), L); "+
+ "+!ia : .namespace(ns1) <- "+
+ " .findall(J, .namespace(J), L); "+
" jason.asunit.print(L); "+
- " .findall(X, .name_space(NS) & NS::b(X,_::_), L2); "+
+ " .findall(X, .namespace(NS) & NS::b(X,_::_), L2); "+
" jason.asunit.print(L2); "+
" .findall(NS, NS::b(_,o), L3); "+ // all name spaces with b(_,o)
" jason.asunit.print(L3); "+
@@ -56,8 +56,10 @@
" jason.asunit.print(V); "+
" N::Y =.. [ns,p,[10,20],[a1]]; "+
" jason.asunit.print(N,\"::\",Y); "+
- " jason.asunit.print(N::Y); "+
- ". "
+ " jason.asunit.print(N::Y). "+
+ "{ begin namespace(k2,local) }" +
+ " b(550, ink2). "+
+ "{ end }"
);
}
Modified: trunk/src/asl/kqmlPlans.asl
===================================================================
--- trunk/src/asl/kqmlPlans.asl 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/src/asl/kqmlPlans.asl 2016-03-01 10:18:40 UTC (rev 1874)
@@ -11,12 +11,12 @@
/* ---- tell performatives ---- */
@kqmlReceivedTellStructure
-+!kqml_received(Sender, tell, Content, _)
++!kqml_received(Sender, tell, NS::Content, _)
: .literal(Content) &
.ground(Content) &
not .list(Content) &
.add_nested_source(Content, Sender, CA)
- <- +CA.
+ <- +NS::CA.
@kqmlReceivedTellList
+!kqml_received(Sender, tell, Content, _)
: .list(Content)
@@ -26,11 +26,11 @@
+!add_all_kqml_received(_,[]).
@kqmlReceivedTellList2
-+!add_all_kqml_received(Sender,[H|T])
++!add_all_kqml_received(Sender,[NS::H|T])
: .literal(H) &
.ground(H)
<- .add_nested_source(H, Sender, CA);
- +CA;
+ +NS::CA;
!add_all_kqml_received(Sender,T).
@kqmlReceivedTellList3
@@ -38,17 +38,17 @@
<- !add_all_kqml_received(Sender,T).
@kqmlReceivedUnTell
-+!kqml_received(Sender, untell, Content, _)
++!kqml_received(Sender, untell, NS::Content, _)
<- .add_nested_source(Content, Sender, CA);
- -CA.
+ -NS::CA.
/* ---- achieve performatives ---- */
@kqmlReceivedAchieve
-+!kqml_received(Sender, achieve, Content, _)
++!kqml_received(Sender, achieve, NS::Content, _)
: not .list(Content) & .add_nested_source(Content, Sender, CA)
- <- !!CA.
+ <- !!NS::CA.
@kqmlReceivedAchieveList
+!kqml_received(Sender, achieve, Content, _)
: .list(Content)
@@ -59,31 +59,31 @@
+!add_all_kqml_achieve(_,[]).
@kqmlReceivedAchieveList2
-+!add_all_kqml_achieve(Sender,[H|T])
++!add_all_kqml_achieve(Sender,[NS::H|T])
<- .add_nested_source(H, Sender, CA);
- !!CA;
+ !!NS::CA;
!add_all_kqml_achieve(Sender,T).
@kqmlReceivedUnAchieve[atomic]
-+!kqml_received(_, unachieve, Content, _)
- <- .drop_desire(Content).
++!kqml_received(_, unachieve, NS::Content, _)
+ <- .drop_desire(NS::Content).
/* ---- ask performatives ---- */
@kqmlReceivedAskOne1
-+!kqml_received(Sender, askOne, Content, MsgId)
- <- ?Content;
- .send(Sender, tell, Content, MsgId).
++!kqml_received(Sender, askOne, NS::Content, MsgId)
+ <- ?NS::Content;
+ .send(Sender, tell, NS::Content, MsgId).
@kqmlReceivedAskOne2 // error in askOne, send untell
--!kqml_received(Sender, askOne, Content, MsgId)
- <- .send(Sender, untell, Content, MsgId).
+-!kqml_received(Sender, askOne, NS::Content, MsgId)
+ <- .send(Sender, untell, NS::Content, MsgId).
@kqmlReceivedAskAll2
-+!kqml_received(Sender, askAll, Content, MsgId)
- <- .findall(Content, Content, List);
++!kqml_received(Sender, askAll, NS::Content, MsgId)
+ <- .findall(NS::Content, NS::Content, List);
.send(Sender, tell, List, MsgId).
Modified: trunk/src/jason/asSemantics/Unifier.java
===================================================================
--- trunk/src/jason/asSemantics/Unifier.java 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/src/jason/asSemantics/Unifier.java 2016-03-01 10:18:40 UTC (rev 1874)
@@ -36,6 +36,7 @@
import jason.asSyntax.Trigger;
import jason.asSyntax.UnnamedVar;
import jason.asSyntax.VarTerm;
+import jason.asSyntax.directives.NameSpace;
import java.util.HashMap;
import java.util.Iterator;
@@ -351,7 +352,9 @@
Literal lvl = (Literal)vl;
if (! unifiesNamespace(vt, lvl) )
return false;
- if (lvl.getNS() != Literal.DefaultNS)
+ if (lvl.getFunctor().startsWith(NameSpace.LOCAL_PREFIX)) // cannot unify a var with a local namespace
+ return false;
+ if (lvl.getNS() != Literal.DefaultNS)
vl = lvl.cloneNS(Literal.DefaultNS);
}
Modified: trunk/src/jason/asSyntax/ASSyntax.java
===================================================================
--- trunk/src/jason/asSyntax/ASSyntax.java 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/src/jason/asSyntax/ASSyntax.java 2016-03-01 10:18:40 UTC (rev 1874)
@@ -70,7 +70,9 @@
keywords.add(new PredicateIndicator("all_unifs", 0));
keywords.add(new PredicateIndicator("default", 0));
- keywords.add(new PredicateIndicator("source", 0));
+ keywords.add(new PredicateIndicator("this_ns", 0));
+
+ keywords.add(new PredicateIndicator("source", 1));
keywords.add(new PredicateIndicator("self", 0));
keywords.add(new PredicateIndicator("percept", 0));
Modified: trunk/src/jason/asSyntax/LiteralImpl.java
===================================================================
--- trunk/src/jason/asSyntax/LiteralImpl.java 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/src/jason/asSyntax/LiteralImpl.java 2016-03-01 10:18:40 UTC (rev 1874)
@@ -171,7 +171,7 @@
@Override
public Element getAsDOM(Document document) {
Element u = (Element) document.createElement("literal");
- u.setAttribute("name-space", getNS().getFunctor());
+ u.setAttribute("namespace", getNS().getFunctor());
if (negated()) {
u.setAttribute("negated", negated()+"");
}
Modified: trunk/src/jason/asSyntax/directives/NameSpace.java
===================================================================
--- trunk/src/jason/asSyntax/directives/NameSpace.java 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/src/jason/asSyntax/directives/NameSpace.java 2016-03-01 10:18:40 UTC (rev 1874)
@@ -14,6 +14,8 @@
/** Implementation of the <code>namespace</code> directive. */
public class NameSpace implements Directive {
+ public static final String LOCAL_PREFIX = "#";
+
static Logger logger = Logger.getLogger(NameSpace.class.getName());
private Map<Atom,Atom> localNSs = new HashMap<Atom,Atom>();
@@ -78,7 +80,7 @@
static private int nsCounter = 0;
private synchronized Atom addLocalNS(Atom ns) {
nsCounter++;
- Atom newNS = new Atom("#"+nsCounter+ns);
+ Atom newNS = new Atom(LOCAL_PREFIX+nsCounter+ns);
localNSs.put(ns,newNS);
return newNS;
}
Modified: trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
===================================================================
--- trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-03-01 10:18:40 UTC (rev 1874)
@@ -52,7 +52,10 @@
public class as2j {
private String asSource = null;
private Agent curAg = null;
- private Atom namespace = Literal.DefaultNS;
+
+ private Atom namespace = Literal.DefaultNS;
+ private Atom thisnamespace = Literal.DefaultNS;
+
private DirectiveProcessor directiveProcessor = new DirectiveProcessor();
private NameSpace nsDirective = (NameSpace)directiveProcessor.getInstance("namespace");
@@ -61,7 +64,7 @@
private static Config config = Config.get(false);
public void setAg(Agent ag) { curAg = ag; }
- public void setNS(Atom ns) { namespace = ns; }
+ public void setNS(Atom ns) { namespace = ns; thisnamespace = ns; }
public Atom getNS() { return namespace; }
private String getSourceRef(SourceInfo s) {
@@ -610,23 +613,32 @@
/* Literal */
Literal literal() :
{ Pred F = null; Pred V; Token k; boolean type = Literal.LPos;
- Atom NS = namespace; Token tns = null; }
+ Atom NS = namespace; Token tns = null; boolean explicitAbstractNS = true; }
{
( (
// namespace
[ LOOKAHEAD(10)
+ [
(tns = <ATOM> { if (tns.image.equals("default"))
NS = Literal.DefaultNS;
- else
+ else if (tns.image.equals("this_ns"))
+ NS = thisnamespace;
+ else
NS = new Atom(tns.image);
+ explicitAbstractNS = false;
}
|
NS = var(Literal.DefaultNS)
{ if (NS.hasAnnot())
throw new ParseException(getSourceRef(NS)+" name space cannot have annotations.");
+ explicitAbstractNS = false;
}
- )
+ )
+ ]
"::"
+ { if (explicitAbstractNS)
+ NS = thisnamespace;
+ }
]
[ <TK_NEG> { type = Literal.LNeg; }
@@ -668,7 +680,9 @@
}
/* Annotated Formulae */
-Pred pred() : { Token K; Pred p; List l; ListTerm lt; Term b; }
+Pred pred() : { Token K; Pred p; List l; ListTerm lt; Term b;
+ Atom ons = namespace; namespace = Literal.DefaultNS; // do not replace abstract namespace for terms
+ }
{
(
K=<ATOM>
@@ -685,12 +699,12 @@
"(" l = terms()
")" { p.setTerms(l); }
]
- //( b=rule_plan_term() { p.addTerm(b); }
- //)*
[
lt = list() { p.setAnnots(lt); }
]
- { return p; }
+ { namespace = ons;
+ return p;
+ }
}
Modified: trunk/src/jason/asSyntax/parser/as2j.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2j.java 2016-02-24 19:59:41 UTC (rev 1873)
+++ trunk/src/jason/asSyntax/parser/as2j.java 2016-03-01 10:18:40 UTC (rev 1874)
@@ -21,7 +21,10 @@
public class as2j implements as2jConstants {
private String asSource = null;
private Agent curAg = null;
- private Atom namespace = Literal.DefaultNS;
+
+ private Atom namespace = Literal.DefaultNS;
+ private Atom thisnamespace = Literal.DefaultNS;
+
private DirectiveProcessor directiveProcessor = new DirectiveProcessor();
private NameSpace nsDirective = (NameSpace)directiveProcessor.getInstance("namespace");
@@ -30,7 +33,7 @@
private static Config config = Config.get(false);
public void setAg(Agent ag) { curAg = ag; }
- public void setNS(Atom ns) { namespace = ns; }
+ public void setNS(Atom ns) { namespace = ns; thisnamespace = ns; }
public Atom getNS() { return namespace; }
private String getSourceRef(SourceInfo s) {
@@ -133,6 +136,7 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
+ case 47:
;
break;
default:
@@ -216,6 +220,7 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
+ case 47:
;
break;
default:
@@ -485,6 +490,7 @@
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!");}
break;
@@ -524,6 +530,7 @@
case 40:
case 42:
case 44:
+ case 47:
R = plan_body();
break;
default:
@@ -723,6 +730,7 @@
case 37:
case 38:
case 42:
+ case 47:
B = log_expr();
break;
default:
@@ -851,6 +859,7 @@
case 40:
case 42:
case 44:
+ case 47:
B = plan_body();
break;
default:
@@ -901,7 +910,7 @@
/* Literal */
final public Literal literal() throws ParseException {
Pred F = null; Pred V; Token k; boolean type = Literal.LPos;
- Atom NS = namespace; Token tns = null;
+ Atom NS = namespace; Token tns = null; boolean explicitAbstractNS = true;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR:
case TK_NEG:
@@ -909,27 +918,43 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
+ case 47:
if (jj_2_4(10)) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case VAR:
case ATOM:
- tns = jj_consume_token(ATOM);
+ case UNNAMEDVAR:
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ATOM:
+ tns = jj_consume_token(ATOM);
if (tns.image.equals("default"))
NS = Literal.DefaultNS;
+ else if (tns.image.equals("this_ns"))
+ NS = thisnamespace;
else
NS = new Atom(tns.image);
- break;
- case VAR:
- case UNNAMEDVAR:
- NS = var(Literal.DefaultNS);
+ explicitAbstractNS = false;
+ break;
+ case VAR:
+ case UNNAMEDVAR:
+ NS = var(Literal.DefaultNS);
if (NS.hasAnnot())
{if (true) throw new ParseException(getSourceRef(NS)+" name space cannot have annotations.");}
+ explicitAbstractNS = false;
+ break;
+ default:
+ jj_la1[32] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
break;
default:
- jj_la1[32] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ jj_la1[33] = jj_gen;
+ ;
}
jj_consume_token(47);
+ if (explicitAbstractNS)
+ NS = thisnamespace;
} else {
;
}
@@ -939,7 +964,7 @@
type = Literal.LNeg;
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[34] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -956,7 +981,7 @@
{if (true) return vt;}
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[35] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -970,7 +995,7 @@
{if (true) return Literal.LFalse;}
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[36] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1001,6 +1026,7 @@
/* Annotated Formulae */
final public Pred pred() throws ParseException {
Token K; Pred p; List l; ListTerm lt; Term b;
+ Atom ons = namespace; namespace = Literal.DefaultNS;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ATOM:
K = jj_consume_token(ATOM);
@@ -1012,7 +1038,7 @@
K = jj_consume_token(TK_END);
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[37] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1026,7 +1052,7 @@
p.setTerms(l);
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[38] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1035,9 +1061,10 @@
p.setAnnots(lt);
break;
default:
- jj_la1[38] = jj_gen;
+ jj_la1[39] = jj_gen;
;
}
+ namespace = ons;
{if (true) return p;}
throw new Error("Missing return statement in function");
}
@@ -1054,7 +1081,7 @@
;
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[40] = jj_gen;
break label_9;
}
jj_consume_token(48);
@@ -1089,10 +1116,11 @@
case 37:
case 38:
case 42:
+ case 47:
o = log_expr();
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[41] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1118,6 +1146,7 @@
case 37:
case 38:
case 42:
+ case 47:
case 49:
f = term_in_list();
last = lt.append(f); lt.setSrcInfo(f.getSrcInfo());
@@ -1128,7 +1157,7 @@
;
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[42] = jj_gen;
break label_10;
}
jj_consume_token(48);
@@ -1152,18 +1181,18 @@
last = last.concat((ListTerm)f);
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[43] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[44] = jj_gen;
;
}
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[45] = jj_gen;
;
}
jj_consume_token(51);
@@ -1190,6 +1219,7 @@
case 37:
case 38:
case 42:
+ case 47:
o = arithm_expr();
break;
case STRING:
@@ -1199,7 +1229,7 @@
o = rule_plan_term();
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[46] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1218,7 +1248,7 @@
{if (true) return new LogExpr((LogicalFormula)t1,LogicalOp.or,(LogicalFormula)t2);}
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[47] = jj_gen;
;
}
{if (true) return t1;}
@@ -1235,7 +1265,7 @@
{if (true) return new LogExpr((LogicalFormula)t1,LogicalOp.and,(LogicalFormula)t2);}
break;
default:
- jj_la1[47] = jj_gen;
+ jj_la1[48] = jj_gen;
;
}
{if (true) return t1;}
@@ -1263,11 +1293,12 @@
case 37:
case 38:
case 42:
+ case 47:
t = rel_expr();
{if (true) return t;}
break;
default:
- jj_la1[48] = jj_gen;
+ jj_la1[49] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1298,13 +1329,14 @@
case 37:
case 38:
case 42:
+ case 47:
op1 = arithm_expr();
break;
case STRING:
op1 = string();
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[50] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1351,7 +1383,7 @@
operator = RelationalOp.literalBuilder;
break;
default:
- jj_la1[50] = jj_gen;
+ jj_la1[51] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1368,6 +1400,7 @@
case 37:
case 38:
case 42:
+ case 47:
op2 = arithm_expr();
break;
case STRING:
@@ -1380,7 +1413,7 @@
op2 = rule_plan_term();
break;
default:
- jj_la1[51] = jj_gen;
+ jj_la1[52] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1391,7 +1424,7 @@
{if (true) return new RelExpr((Term)op1, operator, (Term)op2);}
break;
default:
- jj_la1[52] = jj_gen;
+ jj_la1[53] = jj_gen;
;
}
{if (true) return op1;}
@@ -1411,7 +1444,7 @@
;
break;
default:
- jj_la1[53] = jj_gen;
+ jj_la1[54] = jj_gen;
break label_11;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1424,7 +1457,7 @@
op = ArithmeticOp.minus;
break;
default:
- jj_la1[54] = jj_gen;
+ jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1455,7 +1488,7 @@
;
break;
default:
- jj_la1[55] = jj_gen;
+ jj_la1[56] = jj_gen;
break label_12;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1476,7 +1509,7 @@
op = ArithmeticOp.mod;
break;
default:
- jj_la1[56] = jj_gen;
+ jj_la1[57] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1511,7 +1544,7 @@
{if (true) return new ArithExpr((NumberTerm)t1, op, (NumberTerm)t2);}
break;
default:
- jj_la1[57] = jj_gen;
+ jj_la1[58] = jj_gen;
;
}
{if (true) return t1;}
@@ -1557,11 +1590,12 @@
case TK_END:
case ATOM:
case UNNAMEDVAR:
+ case 47:
t = function();
{if (true) return t;}
break;
default:
- jj_la1[58] = jj_gen;
+ jj_la1[59] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1596,7 +1630,7 @@
v = UnnamedVar.create(ns, K.image);
break;
default:
- jj_la1[59] = jj_gen;
+ jj_la1[60] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1606,7 +1640,7 @@
v.setAnnots(lt);
break;
default:
- jj_la1[60] = jj_gen;
+ jj_la1[61] = jj_gen;
;
}
{if (true) return v;}
@@ -1650,47 +1684,9 @@
finally { jj_save(3, xla); }
}
- final private boolean jj_3R_108() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_114()) {
- jj_scanpos = xsp;
- if (jj_3R_115()) {
- jj_scanpos = xsp;
- if (jj_3R_116()) {
- jj_scanpos = xsp;
- if (jj_3R_117()) return true;
- }
- }
- }
- xsp = jj_scanpos;
- if (jj_3R_118()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_119()) jj_scanpos = xsp;
- return false;
- }
-
- final private boolean jj_3R_101() {
- if (jj_3R_108()) return true;
- return false;
- }
-
- final private boolean jj_3R_53() {
- if (jj_scan_token(52)) return true;
- if (jj_3R_38()) return true;
- return false;
- }
-
- final private boolean jj_3R_38() {
- 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_39() {
- if (jj_scan_token(50)) return true;
+ final private boolean jj_3_3() {
+ if (jj_3R_19()) return true;
+ if (jj_scan_token(32)) return true;
if (jj_3R_20()) return true;
return false;
}
@@ -1700,10 +1696,8 @@
return false;
}
- final private boolean jj_3_3() {
- if (jj_3R_19()) return true;
- if (jj_scan_token(32)) return true;
- if (jj_3R_20()) return true;
+ final private boolean jj_3R_72() {
+ if (jj_3R_68()) return true;
return false;
}
@@ -1712,17 +1706,22 @@
return false;
}
- final private boolean jj_3R_34() {
+ final private boolean jj_3R_33() {
if (jj_scan_token(41)) return true;
return false;
}
- final private boolean jj_3R_33() {
+ final private boolean jj_3R_32() {
if (jj_scan_token(36)) return true;
return false;
}
- final private boolean jj_3R_32() {
+ final private boolean jj_3R_71() {
+ if (jj_3R_77()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_31() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_47()) {
@@ -1732,11 +1731,8 @@
return false;
}
- final private boolean jj_3R_20() {
- if (jj_3R_38()) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_39()) jj_scanpos = xsp;
+ final private boolean jj_3R_70() {
+ if (jj_3R_76()) return true;
return false;
}
@@ -1749,19 +1745,45 @@
final private boolean jj_3R_18() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_33()) {
+ if (jj_3R_32()) {
jj_scanpos = xsp;
- if (jj_3R_34()) return true;
+ if (jj_3R_33()) return true;
}
return false;
}
- final private boolean jj_3R_31() {
+ 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;
return false;
}
- final private boolean jj_3R_30() {
+ 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;
return false;
}
@@ -1772,11 +1794,26 @@
return false;
}
- final private boolean jj_3R_29() {
+ 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;
return false;
}
+ final private boolean jj_3R_95() {
+ if (jj_scan_token(VAR)) return true;
+ return false;
+ }
+
final private boolean jj_3_2() {
Token xsp;
xsp = jj_scanpos;
@@ -1792,20 +1829,20 @@
final private boolean jj_3R_16() {
Token xsp;
xsp = jj_scanpos;
+ if (jj_3R_28()) {
+ jj_scanpos = xsp;
if (jj_3R_29()) {
jj_scanpos = xsp;
- if (jj_3R_30()) {
- jj_scanpos = xsp;
- if (jj_3R_31()) return true;
+ if (jj_3R_30()) return true;
}
}
xsp = jj_scanpos;
- if (jj_3R_32()) jj_scanpos = xsp;
+ if (jj_3R_31()) jj_scanpos = xsp;
if (jj_3R_19()) return true;
return false;
}
- final private boolean jj_3R_67() {
+ final private boolean jj_3R_68() {
if (jj_scan_token(30)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -1813,198 +1850,137 @@
xsp = jj_scanpos;
if (jj_3_3()) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_101()) jj_scanpos = xsp;
+ if (jj_3R_102()) jj_scanpos = xsp;
if (jj_scan_token(31)) return true;
return false;
}
- final private boolean jj_3R_71() {
- if (jj_3R_67()) return true;
- return false;
- }
-
- final private boolean jj_3R_70() {
- if (jj_3R_78()) return true;
- return false;
- }
-
- final private boolean jj_3R_69() {
- if (jj_3R_77()) return true;
- return false;
- }
-
- final private boolean jj_3R_68() {
+ final private boolean jj_3R_62() {
if (jj_3R_42()) return true;
return false;
}
- final private boolean jj_3R_65() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_68()) {
- jj_scanpos = xsp;
- if (jj_3R_69()) {
- jj_scanpos = xsp;
- if (jj_3R_70()) {
- jj_scanpos = xsp;
- if (jj_3R_71()) return true;
- }
- }
- }
- return false;
- }
-
- final private boolean jj_3R_94() {
- if (jj_3R_42()) return true;
- return false;
- }
-
- final private boolean jj_3R_93() {
- if (jj_scan_token(UNNAMEDVAR)) return true;
- return false;
- }
-
- final private boolean jj_3R_78() {
- if (jj_scan_token(STRING)) return true;
- return false;
- }
-
final private boolean jj_3R_92() {
- if (jj_scan_token(VAR)) return true;
- return false;
- }
-
- final private boolean jj_3R_56() {
- if (jj_3R_42()) return true;
- return false;
- }
-
- final private boolean jj_3R_76() {
if (jj_scan_token(50)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_92()) {
+ if (jj_3R_95()) {
jj_scanpos = xsp;
- if (jj_3R_93()) {
+ if (jj_3R_96()) {
jj_scanpos = xsp;
- if (jj_3R_94()) return true;
+ if (jj_3R_97()) return true;
}
}
return false;
}
- final private boolean jj_3R_75() {
+ final private boolean jj_3R_91() {
if (jj_scan_token(48)) return true;
- if (jj_3R_65()) return true;
+ if (jj_3R_66()) return true;
return false;
}
- final private boolean jj_3R_55() {
+ final private boolean jj_3R_61() {
if (jj_scan_token(UNNAMEDVAR)) return true;
return false;
}
- final private boolean jj_3R_54() {
+ final private boolean jj_3R_60() {
if (jj_scan_token(VAR)) return true;
return false;
}
- final private boolean jj_3R_59() {
- if (jj_scan_token(TK_LABEL_AT)) return true;
- return false;
- }
-
- final private boolean jj_3R_58() {
- if (jj_3R_65()) return true;
+ final private boolean jj_3R_56() {
+ if (jj_3R_66()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_75()) { jj_scanpos = xsp; break; }
+ if (jj_3R_91()) { jj_scanpos = xsp; break; }
}
xsp = jj_scanpos;
- if (jj_3R_76()) jj_scanpos = xsp;
+ if (jj_3R_92()) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_40() {
+ final private boolean jj_3R_54() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_54()) {
+ if (jj_3R_60()) {
jj_scanpos = xsp;
- if (jj_3R_55()) return true;
+ if (jj_3R_61()) return true;
}
xsp = jj_scanpos;
- if (jj_3R_56()) jj_scanpos = xsp;
+ if (jj_3R_62()) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_46() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_59()) jj_scanpos = xsp;
- if (jj_3R_16()) return true;
- return false;
- }
-
final private boolean jj_3R_42() {
if (jj_scan_token(49)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_58()) jj_scanpos = xsp;
+ if (jj_3R_56()) jj_scanpos = xsp;
if (jj_scan_token(51)) return true;
return false;
}
- final private boolean jj_3R_64() {
+ final private boolean jj_3R_65() {
if (jj_3R_20()) return true;
return false;
}
- final private boolean jj_3R_63() {
- if (jj_3R_67()) return true;
+ final private boolean jj_3R_64() {
+ if (jj_3R_68()) return true;
return false;
}
- final private boolean jj_3R_62() {
+ 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_62()) {
- jj_scanpos = xsp;
if (jj_3R_63()) {
jj_scanpos = xsp;
- if (jj_3R_64()) return true;
+ if (jj_3R_64()) {
+ jj_scanpos = xsp;
+ if (jj_3R_65()) return true;
}
}
return false;
}
- final private boolean jj_3R_120() {
+ 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_79() {
+ final private boolean jj_3R_78() {
if (jj_scan_token(48)) return true;
- if (jj_3R_57()) return true;
+ if (jj_3R_55()) return true;
return false;
}
- final private boolean jj_3R_45() {
- if (jj_scan_token(34)) return true;
+ final private boolean jj_3R_114() {
+ if (jj_3R_121()) return true;
return false;
}
final private boolean jj_3R_113() {
- if (jj_3R_120()) return true;
- return false;
- }
-
- final private boolean jj_3R_112() {
if (jj_scan_token(42)) return true;
if (jj_3R_20()) return true;
if (jj_scan_token(43)) return true;
@@ -2012,48 +1988,70 @@
}
final private boolean jj_3R_41() {
- if (jj_3R_57()) return true;
+ if (jj_3R_55()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_79()) { jj_scanpos = xsp; break; }
+ if (jj_3R_78()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_128() {
- if (jj_3R_20()) return true;
+ final private boolean jj_3R_112() {
+ if (jj_scan_token(37)) 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(37)) return true;
- if (jj_3R_102()) return true;
+ if (jj_scan_token(38)) return true;
+ if (jj_3R_103()) return true;
return false;
}
- final private boolean jj_3R_136() {
- if (jj_scan_token(37)) return true;
+ final private boolean jj_3R_23() {
+ if (jj_3R_42()) return true;
return false;
}
- final private boolean jj_3R_127() {
- if (jj_3R_67()) return true;
+ final private boolean jj_3R_110() {
+ if (jj_scan_token(NUMBER)) return true;
return false;
}
- final private boolean jj_3R_139() {
- if (jj_scan_token(46)) return true;
+ final private boolean jj_3R_22() {
+ if (jj_scan_token(42)) return true;
+ if (jj_3R_41()) return true;
+ if (jj_scan_token(43)) return true;
return false;
}
- final private boolean jj_3R_24() {
- if (jj_3R_42()) return true;
+ final private boolean jj_3R_129() {
+ if (jj_3R_20()) return true;
return false;
}
- final private boolean jj_3R_138() {
- if (jj_scan_token(45)) return true;
+ final private boolean jj_3R_103() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_110()) {
+ jj_scanpos = xsp;
+ if (jj_3R_111()) {
+ jj_scanpos = xsp;
+ if (jj_3R_112()) {
+ jj_scanpos = xsp;
+ if (jj_3R_113()) {
+ jj_scanpos = xsp;
+ if (jj_3R_114()) return true;
+ }
+ }
+ }
+ }
return false;
}
@@ -2062,73 +2060,73 @@
return false;
}
- final private boolean jj_3R_134() {
- if (jj_scan_token(38)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_136()) jj_scanpos = xsp;
+ final private boolean jj_3R_128() {
+ if (jj_3R_68()) return true;
return false;
}
- final private boolean jj_3R_110() {
- if (jj_scan_token(38)) return true;
- if (jj_3R_102()) return true;
+ final private boolean jj_3R_140() {
+ if (jj_scan_token(46)) return true;
return false;
}
- final private boolean jj_3R_135() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_137()) {
- jj_scanpos = xsp;
- if (jj_3R_138()) {
- jj_scanpos = xsp;
- if (jj_3R_139()) return true;
- }
- }
+ final private boolean jj_3R_139() {
+ if (jj_scan_token(45)) return true;
return false;
}
- final private boolean jj_3R_109() {
- if (jj_scan_token(NUMBER)) return true;
+ final private boolean jj_3R_138() {
+ if (jj_scan_token(37)) return true;
return false;
}
- final private boolean jj_3R_23() {
- if (jj_scan_token(42)) return true;
- if (jj_3R_41()) return true;
- if (jj_scan_token(43)) return true;
+ final private boolean jj_3R_135() {
+ if (jj_scan_token(38)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_137()) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_102() {
+ final private boolean jj_3R_136() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_109()) {
+ if (jj_3R_138()) {
jj_scanpos = xsp;
- if (jj_3R_110()) {
+ if (jj_3R_139()) {
jj_scanpos = xsp;
- if (jj_3R_111()) {
- jj_scanpos = xsp;
- if (jj_3R_112()) {
- jj_scanpos = xsp;
- if (jj_3R_113()) return true;
+ if (jj_3R_140()) return true;
}
}
- }
- }
return false;
}
- final private boolean jj_3R_133() {
+ final private boolean jj_3R_134() {
if (jj_scan_token(37)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_135()) jj_scanpos = xsp;
+ if (jj_3R_136()) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_132() {
+ final private boolean jj_3R_13() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(23)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(14)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(15)) return true;
+ }
+ }
+ xsp = jj_scanpos;
+ if (jj_3R_22()) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_23()) jj_scanpos = xsp;
+ return false;
+ }
+
+ final private boolean jj_3R_133() {
if (jj_scan_token(40)) return true;
return false;
}
@@ -2138,28 +2136,28 @@
return false;
}
- final private boolean jj_3R_131() {
+ final private boolean jj_3R_132() {
if (jj_scan_token(44)) return true;
return false;
}
- final private boolean jj_3R_130() {
+ final private boolean jj_3R_131() {
if (jj_scan_token(34)) return true;
return false;
}
- final private boolean jj_3R_126() {
+ final private boolean jj_3R_127() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_130()) {
- jj_scanpos = xsp;
if (jj_3R_131()) {
jj_scanpos = xsp;
if (jj_3R_132()) {
jj_scanpos = xsp;
if (jj_3R_133()) {
jj_scanpos = xsp;
- if (jj_3R_134()) return true;
+ if (jj_3R_134()) {
+ jj_scanpos = xsp;
+ if (jj_3R_135()) return true;
}
}
}
@@ -2167,145 +2165,126 @@
return false;
}
- final private boolean jj_3R_124() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_126()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_127()) {
- jj_scanpos = xsp;
- if (jj_3R_128()) return true;
- }
+ final private boolean jj_3R_104() {
+ if (jj_scan_token(61)) return true;
+ if (jj_3R_98()) return true;
return false;
}
- final private boolean jj_3R_13() {
+ final private boolean jj_3R_98() {
+ if (jj_3R_103()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(23)) {
- jj_scanpos = xsp;
- if (jj_scan_token(14)) {
- jj_scanpos = xsp;
- if (jj_scan_token(15)) return true;
- }
- }
- xsp = jj_scanpos;
- if (jj_3R_23()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_24()) jj_scanpos = xsp;
+ if (jj_3R_104()) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_103() {
- if (jj_scan_token(61)) return true;
- if (jj_3R_97()) return true;
- return false;
- }
-
- final private boolean jj_3R_97() {
- if (jj_3R_102()) return true;
+ final private boolean jj_3R_125() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_103()) jj_scanpos = xsp;
+ if (jj_3R_127()) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_128()) {
+ jj_scanpos = xsp;
+ if (jj_3R_129()) return true;
+ }
return false;
}
- final private boolean jj_3R_123() {
- if (jj_scan_token(TK_WHILE)) return true;
- if (jj_scan_token(42)) return true;
- if (jj_3R_20()) return true;
- if (jj_scan_token(43)) return true;
- if (jj_3R_67()) return true;
+ final private boolean jj_3R_108() {
+ if (jj_scan_token(TK_INTMOD)) return true;
return false;
}
final private boolean jj_3R_107() {
- if (jj_scan_token(TK_INTMOD)) return true;
+ if (jj_scan_token(TK_INTDIV)) return true;
return false;
}
final private boolean jj_3R_106() {
- if (jj_scan_token(TK_INTDIV)) return true;
+ if (jj_scan_token(60)) return true;
return false;
}
final private boolean jj_3R_105() {
- if (jj_scan_token(60)) return true;
- return false;
- }
-
- final private boolean jj_3R_104() {
if (jj_scan_token(59)) return true;
return false;
}
- final private boolean jj_3R_98() {
+ final private boolean jj_3R_99() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_104()) {
- jj_scanpos = xsp;
if (jj_3R_105()) {
jj_scanpos = xsp;
if (jj_3R_106()) {
jj_scanpos = xsp;
- if (jj_3R_107()) return true;
+ if (jj_3R_107()) {
+ jj_scanpos = xsp;
+ if (jj_3R_108()) return true;
}
}
}
- if (jj_3R_97()) return true;
+ if (jj_3R_98()) return true;
return false;
}
- final private boolean jj_3R_95() {
- if (jj_3R_97()) return true;
+ final private boolean jj_3R_93() {
+ if (jj_3R_98()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_98()) { jj_scanpos = xsp; break; }
+ if (jj_3R_99()) { jj_scanpos = xsp; break; }
}
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;
+ final private boolean jj_3R_124() {
+ if (jj_scan_token(TK_WHILE)) return true;
+ if (jj_scan_token(42)) return true;
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(43)) return true;
+ if (jj_3R_68()) return true;
return false;
}
- final private boolean jj_3R_37() {
+ final private boolean jj_3R_36() {
if (jj_scan_token(TK_FALSE)) return true;
return false;
}
- final private boolean jj_3R_36() {
+ final private boolean jj_3R_35() {
if (jj_scan_token(TK_TRUE)) return true;
return false;
}
final private boolean jj_3R_51() {
- if (jj_3R_40()) return true;
+ if (jj_3R_54()) return true;
return false;
}
- final private boolean jj_3R_43() {
- if (jj_scan_token(30)) return true;
+ final private boolean jj_3R_101() {
+ if (jj_scan_token(38)) return true;
return false;
}
- final private boolean jj_3R_50() {
- if (jj_3R_13()) return true;
+ final private boolean jj_3R_100() {
+ if (jj_scan_token(37)) return true;
return false;
}
- final private boolean jj_3R_100() {
- if (jj_scan_token(38)) return true;
+ final private boolean jj_3R_50() {
+ if (jj_3R_13()) return true;
return false;
}
- final private boolean jj_3R_99() {
- if (jj_scan_token(37)) return true;
+ final private boolean jj_3R_94() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_100()) {
+ jj_scanpos = xsp;
+ if (jj_3R_101()) return true;
+ }
+ if (jj_3R_93()) return true;
return false;
}
@@ -2314,69 +2293,50 @@
return false;
}
- final private boolean jj_3R_122() {
- if (jj_scan_token(TK_FOR)) return true;
- if (jj_scan_token(42)) return true;
- if (jj_3R_20()) return true;
- if (jj_scan_token(43)) return true;
- if (jj_3R_67()) return true;
+ 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_96() {
+ final private boolean jj_3R_76() {
+ if (jj_3R_93()) return true;
Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_99()) {
- jj_scanpos = xsp;
- if (jj_3R_100()) return true;
- }
- if (jj_3R_95()) return true;
- return false;
- }
-
- final private boolean jj_3R_77() {
- if (jj_3R_95()) return true;
- Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_96()) { jj_scanpos = xsp; break; }
+ if (jj_3R_94()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_22() {
- if (jj_3R_40()) return true;
+ final private boolean jj_3R_43() {
+ if (jj_scan_token(30)) return true;
return false;
}
- final private boolean jj_3R_21() {
- if (jj_scan_token(ATOM)) return true;
+ final private boolean jj_3R_123() {
+ if (jj_scan_token(TK_FOR)) return true;
+ if (jj_scan_token(42)) return true;
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(43)) return true;
+ if (jj_3R_68()) return true;
return false;
}
- final private boolean jj_3R_91() {
- if (jj_3R_67()) return true;
+ final private boolean jj_3R_40() {
+ if (jj_3R_54()) return true;
return false;
}
- final private boolean jj_3_4() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_21()) {
- jj_scanpos = xsp;
- if (jj_3R_22()) return true;
- }
- if (jj_scan_token(47)) return true;
- return false;
- }
-
final private boolean jj_3R_90() {
- if (jj_3R_42()) return true;
+ if (jj_3R_68()) return true;
return false;
}
final private boolean jj_3R_89() {
- if (jj_3R_78()) return true;
+ if (jj_3R_42()) return true;
return false;
}
@@ -2385,89 +2345,93 @@
return false;
}
- final private boolean jj_3R_35() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3_4()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_49()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_50()) {
- jj_scanpos = xsp;
- if (jj_3R_51()) return true;
- }
+ final private boolean jj_3R_87() {
+ if (jj_3R_76()) return true;
return false;
}
- final private boolean jj_3R_87() {
+ final private boolean jj_3R_86() {
if (jj_scan_token(58)) return true;
return false;
}
- final private boolean jj_3R_19() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_35()) {
- jj_scanpos = xsp;
- if (jj_3R_36()) {
- jj_scanpos = xsp;
- if (jj_3R_37()) return true;
- }
- }
+ final private boolean jj_3R_39() {
+ if (jj_scan_token(ATOM)) return true;
return false;
}
- final private boolean jj_3R_86() {
+ final private boolean jj_3R_85() {
if (jj_scan_token(57)) return true;
return false;
}
- final private boolean jj_3R_85() {
- if (jj_scan_token(56)) return true;
+ final private boolean jj_3R_21() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_39()) {
+ jj_scanpos = xsp;
+ if (jj_3R_40()) return true;
+ }
return false;
}
final private boolean jj_3R_84() {
- if (jj_scan_token(55)) return true;
+ if (jj_scan_token(56)) return true;
return false;
}
final private boolean jj_3R_83() {
- if (jj_scan_token(54)) return true;
+ if (jj_scan_token(55)) return true;
return false;
}
- final private boolean jj_3R_129() {
- if (jj_scan_token(TK_ELSE)) return true;
+ final private boolean jj_3_4() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_21()) jj_scanpos = xsp;
+ if (jj_scan_token(47)) return true;
return false;
}
final private boolean jj_3R_82() {
- if (jj_scan_token(46)) return true;
+ if (jj_scan_token(54)) return true;
return false;
}
final private boolean jj_3R_81() {
- if (jj_scan_token(53)) return true;
+ if (jj_scan_token(46)) return true;
return false;
}
- final private boolean jj_3R_125() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_129()) jj_scanpos = xsp;
- if (jj_3R_67()) return true;
+ final private boolean jj_3R_80() {
+ if (jj_scan_token(53)) return true;
return false;
}
- final private boolean jj_3R_80() {
+ final private boolean jj_3R_79() {
if (jj_scan_token(45)) return true;
return false;
}
- final private boolean jj_3R_74() {
+ final private boolean jj_3R_34() {
Token xsp;
xsp = jj_scanpos;
+ if (jj_3_4()) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_49()) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_50()) {
+ jj_scanpos = xsp;
+ if (jj_3R_51()) return true;
+ }
+ return false;
+ }
+
+ final private boolean jj_3R_75() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_79()) {
+ jj_scanpos = xsp;
if (jj_3R_80()) {
jj_scanpos = xsp;
if (jj_3R_81()) {
@@ -2480,9 +2444,7 @@
jj_scanpos = xsp;
if (jj_3R_85()) {
jj_scanpos = xsp;
- if (jj_3R_86()) {
- jj_scanpos = xsp;
- if (jj_3R_87()) return true;
+ if (jj_3R_86()) return true;
}
}
}
@@ -2491,87 +2453,138 @@
}
}
xsp = jj_scanpos;
+ if (jj_3R_87()) {
+ jj_scanpos = xsp;
if (jj_3R_88()) {
jj_scanpos = xsp;
if (jj_3R_89()) {
jj_scanpos = xsp;
- if (jj_3R_90()) {
- jj_scanpos = xsp;
- if (jj_3R_91()) return true;
+ if (jj_3R_90()) return true;
}
}
}
return false;
}
- final private boolean jj_3R_73() {
- if (jj_3R_78()) return true;
+ final private boolean jj_3R_19() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_34()) {
+ jj_scanpos = xsp;
+ if (jj_3R_35()) {
+ jj_scanpos = xsp;
+ if (jj_3R_36()) return true;
+ }
+ }
return false;
}
- final private boolean jj_3R_72() {
+ final private boolean jj_3R_74() {
if (jj_3R_77()) return true;
return false;
}
- final private boolean jj_3R_121() {
- if (jj_scan_token(TK_IF)) return true;
- if (jj_scan_token(42)) return true;
- if (jj_3R_20()) return true;
- if (jj_scan_token(43)) return true;
- if (jj_3R_67()) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_125()) jj_scanpos = xsp;
+ final private boolean jj_3R_73() {
+ if (jj_3R_76()) return true;
return false;
}
- final private boolean jj_3R_28() {
- if (jj_3R_46()) return true;
+ final private boolean jj_3R_130() {
+ if (jj_scan_token(TK_ELSE)) return true;
return false;
}
- final private boolean jj_3R_66() {
+ final private boolean jj_3R_67() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_72()) {
+ if (jj_3R_73()) {
jj_scanpos = xsp;
- if (jj_3R_73()) return true;
+ if (jj_3R_74()) return true;
}
xsp = jj_scanpos;
- if (jj_3R_74()) jj_scanpos = xsp;
+ if (jj_3R_75()) jj_scanpos = xsp;
return false;
}
+ final private boolean jj_3R_126() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_130()) jj_scanpos = xsp;
+ if (jj_3R_68()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_122() {
+ if (jj_scan_token(TK_IF)) return true;
+ if (jj_scan_token(42)) return true;
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(43)) return true;
+ if (jj_3R_68()) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_126()) jj_scanpos = xsp;
+ return false;
+ }
+
final private boolean jj_3R_27() {
+ if (jj_3R_46()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_26() {
if (jj_3R_45()) return true;
return false;
}
- final private boolean jj_3R_26() {
+ final private boolean jj_3R_59() {
+ if (jj_3R_67()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_25() {
if (jj_3R_44()) return true;
return false;
}
- final private boolean jj_3R_119() {
- if (jj_3R_108()) return true;
+ final private boolean jj_3R_120() {
+ if (jj_3R_109()) return true;
return false;
}
- final private boolean jj_3R_118() {
+ 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_119() {
if (jj_scan_token(41)) return true;
return false;
}
- final private boolean jj_3R_25() {
+ final private boolean jj_3R_24() {
if (jj_3R_43()) 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_14() {
Token xsp;
while (true) {
xsp = jj_scanpos;
+ if (jj_3R_24()) { jj_scanpos = xsp; break; }
+ }
+ while (true) {
+ xsp = jj_scanpos;
if (jj_3R_25()) { jj_scanpos = xsp; break; }
}
while (true) {
@@ -2582,25 +2595,35 @@
xsp = jj_scanpos;
if (jj_3R_27()) { jj_scanpos = xsp; break; }
}
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_28()) { jj_scanpos = xsp; break; }
- }
if (jj_scan_token(0)) return true;
return false;
}
- final private boolean jj_3R_61() {
- if (jj_3R_66()) return true;
+ final private boolean jj_3R_53() {
+ if (jj_scan_token(52)) return true;
+ if (jj_3R_37()) return true;
return false;
}
- final private boolean jj_3R_60() {
- if (jj_scan_token(TK_NOT)) return true;
+ 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_38() {
+ if (jj_scan_token(50)) return true;
+ if (jj_3R_20()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_118() {
+ if (jj_3R_125()) return true;
+ return false;
+ }
+
final private boolean jj_3R_117() {
if (jj_3R_124()) return true;
return false;
@@ -2611,13 +2634,11 @@
return false;
}
- final private boolean jj_3R_52() {
+ final private boolean jj_3R_20() {
+ if (jj_3R_37()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_60()) {
- jj_scanpos = xsp;
- if (jj_3R_61()) return true;
- }
+ if (jj_3R_38()) jj_scanpos = xsp;
return false;
}
@@ -2626,11 +2647,31 @@
return false;
}
- final private boolean jj_3R_114() {
- if (jj_3R_121()) return true;
+ final private boolean jj_3R_109() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_115()) {
+ jj_scanpos = xsp;
+ if (jj_3R_116()) {
+ jj_scanpos = xsp;
+ if (jj_3R_117()) {
+ jj_scanpos = xsp;
+ if (jj_3R_118()) return true;
+ }
+ }
+ }
+ xsp = jj_scanpos;
+ if (jj_3R_119()) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_120()) jj_scanpos = xsp;
return false;
}
+ final private boolean jj_3R_102() {
+ if (jj_3R_109()) return true;
+ return false;
+ }
+
public as2jTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
@@ -2640,7 +2681,7 @@
public boolean lookingAhead = false;
private boolean jj_semLA;
private int jj_gen;
- final private int[] jj_la1 = new int[61];
+ final private int[] jj_la1 = new int[62];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static {
@@ -2648,10 +2689,10 @@
jj_la1_1();
}
private static void jj_la1_0() {
- jj_la1_0 = new int[] {0x40000000,0x180cb80,0x40000000,0x0,0x40000000,0x10000,0x180cb80,0x40000000,0x80c000,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x41facf80,0x0,0x41facf80,0x40000,0x40040000,0x0,0x0,0x0,0x0,0x0,0x41e0cf80,0x10000,0x0,0x0,0x0,0x41facf80,0x1800080,0x800,0x180c080,0x180cb80,0x80c000,0x0,0x0,0x0,0x41e0cf80,0x0,0x1000080,0x0,0x41e0cb80,0x41e0cb80,0x0,0x0,0x1e0cf80,0x1e0cb80,0x0,0x41e0cb80,0x0,0x0,0x0,0x3000,0x3000,0x0,0x1a0cb80,0x1000080,0x0,};
+ jj_la1_0 = new int[] {0x40000000,0x180cb80,0x40000000,0x0,0x40000000,0x10000,0x180cb80,0x40000000,0x80c000,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x41facf80,0x0,0x41facf80,0x40000,0x40040000,0x0,0x0,0x0,0x0,0x0,0x41e0cf80,0x10000,0x0,0x0,0x0,0x41facf80,0x1800080,0x1800080,0x800,0x180c080,0x180cb80,0x80c000,0x0,0x0,0x0,0x41e0cf80,0x0,0x1000080,0x0,0x41e0cb80,0x41e0cb80,0x0,0x0,0x1e0cf80,0x1e0cb80,0x0,0x41e0cb80,0x0,0x0,0x0,0x3000,0x3000,0x0,0x1a0cb80,0x1000080,0x0,};
}
private static void jj_la1_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x4,0x0,0xe0,0x0,0x0,0x0,0x1,0x0,0x8,0x10,0xe0,0x104,0x104,0x1564,0x200,0x1564,0x0,0x0,0x6020,0x6020,0x20,0x1164,0x1164,0x460,0x0,0x8,0x210,0x210,0x1564,0x0,0x0,0x0,0x0,0x0,0x400,0x20000,0x10000,0x20460,0x10000,0x20000,0x40000,0x20460,0x20460,0x40000,0x100000,0x460,0x460,0x7e06000,0x20460,0x7e06000,0x60,0x60,0x18000000,0x18000000,0x20000000,0x460,0x0,0x20000,};
+ jj_la1_1 = new int[] {0x0,0x8000,0x0,0x4,0x0,0xe0,0x8000,0x0,0x0,0x1,0x0,0x8,0x10,0xe0,0x104,0x104,0x9564,0x200,0x9564,0x0,0x0,0x6020,0x6020,0x20,0x1164,0x1164,0x8460,0x0,0x8,0x210,0x210,0x9564,0x0,0x0,0x0,0x0,0x8000,0x0,0x400,0x20000,0x10000,0x28460,0x10000,0x20000,0x40000,0x28460,0x28460,0x40000,0x100000,0x8460,0x8460,0x7e06000,0x28460,0x7e06000,0x60,0x60,0x18000000,0x18000000,0x20000000,0x8460,0x0,0x20000,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[4];
private boolean jj_rescan = false;
@@ -2666,7 +2707,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 61; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 62; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2679,7 +2720,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 61; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 62; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2689,7 +2730,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 61; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 62; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2699,7 +2740,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 61; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 62; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2708,7 +2749,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 61; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 62; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2717,7 +2758,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 61; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 62; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2836,7 +2877,7 @@
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 61; i++) {
+ for (int i = 0; i < 62; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
Modified: trunk/src/jason/bb/DefaultBeliefBase.java
===================================================================
--- trunk/src/jason/bb/DefaultBeli...
[truncated message content] |
