Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1869] trunk/src
|
From: <jom...@us...> - 2016-01-04 15:15:42
|
Revision: 1869
http://sourceforge.net/p/jason/svn/1869
Author: jomifred
Date: 2016-01-04 15:15:40 +0000 (Mon, 04 Jan 2016)
Log Message:
-----------
fix bug reported by Federico Xella
Modified Paths:
--------------
trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
trunk/src/jason/asSyntax/parser/as2j.java
trunk/src/jason/mas2j/AgentParameters.java
trunk/src/test/NSTest.java
Modified: trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
===================================================================
--- trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2015-12-24 09:26:31 UTC (rev 1868)
+++ trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-01-04 15:15:40 UTC (rev 1869)
@@ -609,7 +609,8 @@
NS = new Atom(tns.image);
}
|
- NS = var(NS) { if (NS.hasAnnot())
+ NS = var(Literal.DefaultNS)
+ { if (NS.hasAnnot())
throw new ParseException(getSourceRef(NS)+" name space cannot have annotations.");
}
)
Modified: trunk/src/jason/asSyntax/parser/as2j.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2j.java 2015-12-24 09:26:31 UTC (rev 1868)
+++ trunk/src/jason/asSyntax/parser/as2j.java 2016-01-04 15:15:40 UTC (rev 1869)
@@ -909,7 +909,7 @@
break;
case VAR:
case UNNAMEDVAR:
- NS = var(NS);
+ NS = var(Literal.DefaultNS);
if (NS.hasAnnot())
{if (true) throw new ParseException(getSourceRef(NS)+" name space cannot have annotations.");}
break;
@@ -1644,13 +1644,13 @@
return false;
}
- final private boolean jj_3R_115() {
- if (jj_3R_122()) return true;
+ final private boolean jj_3R_61() {
+ if (jj_3R_66()) return true;
return false;
}
- final private boolean jj_3R_61() {
- if (jj_3R_66()) return true;
+ final private boolean jj_3R_115() {
+ if (jj_3R_122()) return true;
return false;
}
@@ -1712,6 +1712,12 @@
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_47() {
if (jj_scan_token(34)) return true;
return false;
@@ -1722,9 +1728,11 @@
return false;
}
- final private boolean jj_3R_53() {
- if (jj_scan_token(52)) return true;
- if (jj_3R_38()) return true;
+ 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;
}
@@ -1733,14 +1741,6 @@
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_32() {
Token xsp;
xsp = jj_scanpos;
@@ -1794,6 +1794,14 @@
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;
+ return false;
+ }
+
final private boolean jj_3_2() {
Token xsp;
xsp = jj_scanpos;
@@ -1806,14 +1814,6 @@
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;
- return false;
- }
-
final private boolean jj_3R_16() {
Token xsp;
xsp = jj_scanpos;
@@ -1899,13 +1899,13 @@
return false;
}
- final private boolean jj_3R_59() {
- if (jj_scan_token(TK_LABEL_AT)) return true;
+ final private boolean jj_3R_56() {
+ if (jj_3R_42()) return true;
return false;
}
- final private boolean jj_3R_56() {
- if (jj_3R_42()) return true;
+ final private boolean jj_3R_59() {
+ if (jj_scan_token(TK_LABEL_AT)) return true;
return false;
}
@@ -2008,18 +2008,13 @@
return false;
}
- final private boolean jj_3R_45() {
- if (jj_scan_token(34)) return true;
- return false;
- }
-
final private boolean jj_3R_120() {
if (jj_3R_19()) return true;
return false;
}
- final private boolean jj_3R_128() {
- if (jj_3R_20()) return true;
+ final private boolean jj_3R_45() {
+ if (jj_scan_token(34)) return true;
return false;
}
@@ -2029,11 +2024,23 @@
return false;
}
+ final private boolean jj_3R_128() {
+ if (jj_3R_20()) 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;
+ return false;
+ }
+
final private boolean jj_3R_136() {
if (jj_scan_token(37)) return true;
return false;
@@ -2044,13 +2051,6 @@
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;
- return false;
- }
-
final private boolean jj_3R_41() {
if (jj_3R_57()) return true;
Token xsp;
@@ -2137,6 +2137,18 @@
return false;
}
+ final private boolean jj_3R_109() {
+ if (jj_scan_token(NUMBER)) 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;
+ return false;
+ }
+
final private boolean jj_3R_130() {
if (jj_scan_token(34)) return true;
return false;
@@ -2161,18 +2173,6 @@
return false;
}
- final private boolean jj_3R_109() {
- if (jj_scan_token(NUMBER)) 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;
- return false;
- }
-
final private boolean jj_3R_102() {
Token xsp;
xsp = jj_scanpos;
@@ -2252,13 +2252,13 @@
return false;
}
- final private boolean jj_3R_43() {
- if (jj_scan_token(30)) return true;
+ final private boolean jj_3R_107() {
+ if (jj_scan_token(TK_INTMOD)) return true;
return false;
}
- final private boolean jj_3R_107() {
- if (jj_scan_token(TK_INTMOD)) return true;
+ final private boolean jj_3R_43() {
+ if (jj_scan_token(30)) return true;
return false;
}
@@ -2348,11 +2348,6 @@
return false;
}
- final private boolean jj_3R_22() {
- if (jj_3R_40()) return true;
- return false;
- }
-
final private boolean jj_3R_96() {
Token xsp;
xsp = jj_scanpos;
@@ -2364,6 +2359,11 @@
return false;
}
+ final private boolean jj_3R_22() {
+ if (jj_3R_40()) return true;
+ return false;
+ }
+
final private boolean jj_3R_77() {
if (jj_3R_95()) return true;
Token xsp;
@@ -2395,6 +2395,11 @@
return false;
}
+ final private boolean jj_3R_90() {
+ if (jj_3R_42()) return true;
+ return false;
+ }
+
final private boolean jj_3R_35() {
Token xsp;
xsp = jj_scanpos;
@@ -2409,13 +2414,13 @@
return false;
}
- final private boolean jj_3R_90() {
- if (jj_3R_42()) return true;
+ final private boolean jj_3R_89() {
+ if (jj_3R_78()) return true;
return false;
}
- final private boolean jj_3R_89() {
- if (jj_3R_78()) return true;
+ final private boolean jj_3R_88() {
+ if (jj_3R_77()) return true;
return false;
}
@@ -2432,11 +2437,6 @@
return false;
}
- final private boolean jj_3R_88() {
- if (jj_3R_77()) return true;
- return false;
- }
-
final private boolean jj_3R_129() {
if (jj_scan_token(TK_ELSE)) return true;
return false;
@@ -2447,6 +2447,11 @@
return false;
}
+ final private boolean jj_3R_86() {
+ if (jj_scan_token(57)) return true;
+ return false;
+ }
+
final private boolean jj_3R_125() {
Token xsp;
xsp = jj_scanpos;
@@ -2455,13 +2460,13 @@
return false;
}
- final private boolean jj_3R_86() {
- if (jj_scan_token(57)) return true;
+ final private boolean jj_3R_85() {
+ if (jj_scan_token(56)) return true;
return false;
}
- final private boolean jj_3R_85() {
- if (jj_scan_token(56)) return true;
+ final private boolean jj_3R_84() {
+ if (jj_scan_token(55)) return true;
return false;
}
@@ -2470,11 +2475,6 @@
return false;
}
- final private boolean jj_3R_84() {
- if (jj_scan_token(55)) return true;
- return false;
- }
-
final private boolean jj_3R_83() {
if (jj_scan_token(54)) return true;
return false;
@@ -2551,13 +2551,13 @@
return false;
}
- final private boolean jj_3R_26() {
- if (jj_3R_44()) return true;
+ final private boolean jj_3R_73() {
+ if (jj_3R_78()) return true;
return false;
}
- final private boolean jj_3R_73() {
- if (jj_3R_78()) return true;
+ final private boolean jj_3R_26() {
+ if (jj_3R_44()) return true;
return false;
}
@@ -2571,6 +2571,18 @@
return false;
}
+ final private boolean jj_3R_66() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_72()) {
+ jj_scanpos = xsp;
+ if (jj_3R_73()) return true;
+ }
+ xsp = jj_scanpos;
+ if (jj_3R_74()) jj_scanpos = xsp;
+ return false;
+ }
+
final private boolean jj_3R_14() {
Token xsp;
while (true) {
@@ -2593,18 +2605,6 @@
return false;
}
- final private boolean jj_3R_66() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_72()) {
- jj_scanpos = xsp;
- if (jj_3R_73()) return true;
- }
- xsp = jj_scanpos;
- if (jj_3R_74()) jj_scanpos = xsp;
- return false;
- }
-
final private boolean jj_3R_119() {
if (jj_3R_108()) return true;
return false;
Modified: trunk/src/jason/mas2j/AgentParameters.java
===================================================================
--- trunk/src/jason/mas2j/AgentParameters.java 2015-12-24 09:26:31 UTC (rev 1868)
+++ trunk/src/jason/mas2j/AgentParameters.java 2016-01-04 15:15:40 UTC (rev 1869)
@@ -105,22 +105,31 @@
public void setAgClass(String c) {
- if (c != null) agClass = new ClassParameters(c);
+ if (c != null)
+ agClass = new ClassParameters(c);
}
public void addArchClass(String... cs) {
+ if (cs == null)
+ return;
for (String c: cs)
archClasses.add(new ClassParameters(c));
}
public void addArchClass(Collection<String> cs) {
+ if (cs == null)
+ return;
for (String c: cs)
archClasses.add(new ClassParameters(c));
}
public void addArchClass(ClassParameters... cps) {
+ if (cps == null)
+ return;
for (ClassParameters c: cps)
archClasses.add(c);
}
public void insertArchClass(ClassParameters... cps) {
+ if (cps == null)
+ return;
for (ClassParameters c: cps)
archClasses.add(0,c);
}
Modified: trunk/src/test/NSTest.java
===================================================================
--- trunk/src/test/NSTest.java 2015-12-24 09:26:31 UTC (rev 1868)
+++ trunk/src/test/NSTest.java 2016-01-04 15:15:40 UTC (rev 1869)
@@ -205,7 +205,7 @@
assertEquals(p1.compareTo(p1), 0);
}
- public void testParserNS() throws ParseException, JasonException {
+ public void testParserNS1() throws ParseException, JasonException {
as2j parser = new as2j(new StringReader("b(10). b(20). b(tell). ns71::b(30). default::b(40). !g(ok). +!g(X) <- .print(kk, 10, X). "));
parser.setNS(new Atom("ns33"));
@@ -233,4 +233,13 @@
}
+ public void testParserNS2() throws ParseException, JasonException {
+
+ as2j parser = new as2j(new StringReader("+NS::tick <- .print(NS). "));
+ parser.setNS(new Atom("ns33"));
+ Agent a = new Agent();
+ a.initAg();
+ parser.agent(a);
+ assertTrue(a.getPL().toString().contains("[source(self)] +NS::tick <- .print(ns33::NS)."));
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
