Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1680] trunk/src
|
From: <xsp...@us...> - 2012-04-11 18:31:09
|
Revision: 1680
http://jason.svn.sourceforge.net/jason/?rev=1680&view=rev
Author: xsplyter
Date: 2012-04-11 18:30:58 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Added CArtAgO artifact template
Removed artifact template
Modified Paths:
--------------
trunk/src/jason/asSyntax/parser/as2j.java
trunk/src/jason/asSyntax/parser/as2jTokenManager.java
trunk/src/jason/mas2j/parser/mas2jTokenManager.java
Added Paths:
-----------
trunk/src/templates/CArtAgOartifact
Removed Paths:
-------------
trunk/src/templates/artifact
Modified: trunk/src/jason/asSyntax/parser/as2j.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2j.java 2012-04-02 14:53:14 UTC (rev 1679)
+++ trunk/src/jason/asSyntax/parser/as2j.java 2012-04-11 18:30:58 UTC (rev 1680)
@@ -1575,11 +1575,6 @@
return false;
}
- final private boolean jj_3R_44() {
- if (jj_scan_token(40)) return true;
- return false;
- }
-
final private boolean jj_3R_52() {
Token xsp;
xsp = jj_scanpos;
@@ -1588,6 +1583,11 @@
return false;
}
+ final private boolean jj_3R_44() {
+ if (jj_scan_token(40)) return true;
+ return false;
+ }
+
final private boolean jj_3R_85() {
if (jj_3R_91()) return true;
return false;
@@ -1710,13 +1710,13 @@
return false;
}
- final private boolean jj_3R_41() {
- if (jj_scan_token(34)) return true;
+ final private boolean jj_3R_82() {
+ if (jj_3R_80()) return true;
return false;
}
- final private boolean jj_3R_82() {
- if (jj_3R_80()) return true;
+ final private boolean jj_3R_41() {
+ if (jj_scan_token(34)) return true;
return false;
}
@@ -1726,6 +1726,16 @@
return false;
}
+ final private boolean jj_3R_75() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_82()) {
+ jj_scanpos = xsp;
+ if (jj_3R_83()) return true;
+ }
+ return false;
+ }
+
final private boolean jj_3_2() {
Token xsp;
xsp = jj_scanpos;
@@ -1738,16 +1748,6 @@
return false;
}
- final private boolean jj_3R_75() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_82()) {
- jj_scanpos = xsp;
- if (jj_3R_83()) return true;
- }
- return false;
- }
-
final private boolean jj_3R_37() {
if (jj_scan_token(30)) return true;
Token xsp;
@@ -1854,13 +1854,13 @@
return false;
}
- final private boolean jj_3R_39() {
- if (jj_scan_token(30)) return true;
+ final private boolean jj_3R_74() {
+ if (jj_3R_37()) return true;
return false;
}
- final private boolean jj_3R_74() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_39() {
+ if (jj_scan_token(30)) return true;
return false;
}
@@ -1999,13 +1999,13 @@
return false;
}
- final private boolean jj_3R_26() {
- if (jj_3R_42()) return true;
+ final private boolean jj_3R_36() {
+ if (jj_3R_48()) return true;
return false;
}
- final private boolean jj_3R_36() {
- if (jj_3R_48()) return true;
+ final private boolean jj_3R_26() {
+ if (jj_3R_42()) return true;
return false;
}
@@ -2029,13 +2029,13 @@
return false;
}
- final private boolean jj_3R_24() {
- if (jj_3R_40()) return true;
+ final private boolean jj_3R_21() {
+ if (jj_3R_37()) return true;
return false;
}
- final private boolean jj_3R_21() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_24() {
+ if (jj_3R_40()) return true;
return false;
}
@@ -2049,17 +2049,17 @@
return false;
}
- final private boolean jj_3R_23() {
- if (jj_3R_39()) return true;
- return false;
- }
-
final private boolean jj_3R_20() {
if (jj_scan_token(42)) return true;
if (jj_3R_36()) return true;
return false;
}
+ final private boolean jj_3R_23() {
+ if (jj_3R_39()) return true;
+ return false;
+ }
+
final private boolean jj_3R_92() {
Token xsp;
xsp = jj_scanpos;
Modified: trunk/src/jason/asSyntax/parser/as2jTokenManager.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2jTokenManager.java 2012-04-02 14:53:14 UTC (rev 1679)
+++ trunk/src/jason/asSyntax/parser/as2jTokenManager.java 2012-04-11 18:30:58 UTC (rev 1680)
@@ -30,10 +30,10 @@
jjmatchedKind = 23;
return 43;
}
+ if ((active0 & 0x800000000000000L) != 0L)
+ return 14;
if ((active0 & 0x200000000L) != 0L)
return 44;
- if ((active0 & 0x800000000000000L) != 0L)
- return 14;
return -1;
case 1:
if ((active0 & 0x20000L) != 0L)
@@ -399,25 +399,19 @@
jjCheckNAddTwoStates(28, 29);
}
break;
- case 14:
- if (curChar == 42)
- jjCheckNAddTwoStates(20, 21);
- else if (curChar == 47)
- jjCheckNAddStates(0, 2);
- break;
case 0:
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 21)
kind = 21;
- jjCheckNAddStates(3, 7);
+ jjCheckNAddStates(0, 4);
}
else if (curChar == 46)
jjCheckNAddTwoStates(28, 32);
else if (curChar == 47)
- jjAddStates(8, 9);
+ jjAddStates(5, 6);
else if (curChar == 34)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(7, 9);
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 25)
@@ -434,13 +428,19 @@
else if (curChar == 46)
jjCheckNAdd(32);
break;
+ case 14:
+ if (curChar == 42)
+ jjCheckNAddTwoStates(20, 21);
+ else if (curChar == 47)
+ jjCheckNAddStates(10, 12);
+ break;
case 1:
if ((0xfffffffbffffdbffL & l) != 0L)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(7, 9);
break;
case 3:
if ((0x8400000000L & l) != 0L)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(7, 9);
break;
case 4:
if (curChar == 34 && kind > 22)
@@ -452,7 +452,7 @@
break;
case 6:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(7, 9);
break;
case 7:
if ((0xf000000000000L & l) != 0L)
@@ -475,11 +475,11 @@
break;
case 13:
if (curChar == 47)
- jjAddStates(8, 9);
+ jjAddStates(5, 6);
break;
case 15:
if ((0xffffffffffffdbffL & l) != 0L)
- jjCheckNAddStates(0, 2);
+ jjCheckNAddStates(10, 12);
break;
case 16:
if ((0x2400L & l) != 0L && kind > 5)
@@ -562,7 +562,7 @@
break;
if (kind > 21)
kind = 21;
- jjCheckNAddStates(3, 7);
+ jjCheckNAddStates(0, 4);
break;
case 36:
if ((0x3ff000000000000L & l) == 0L)
@@ -652,7 +652,7 @@
break;
case 1:
if ((0xffffffffefffffffL & l) != 0L)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(7, 9);
break;
case 2:
if (curChar == 92)
@@ -660,7 +660,7 @@
break;
case 3:
if ((0x14404410000000L & l) != 0L)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(7, 9);
break;
case 9:
if (curChar != 95)
@@ -685,7 +685,7 @@
kind = 26;
break;
case 15:
- jjAddStates(0, 2);
+ jjAddStates(10, 12);
break;
case 20:
jjCheckNAddTwoStates(20, 21);
@@ -737,11 +737,11 @@
{
case 1:
if ((jjbitVec0[i2] & l2) != 0L)
- jjAddStates(10, 12);
+ jjAddStates(7, 9);
break;
case 15:
if ((jjbitVec0[i2] & l2) != 0L)
- jjAddStates(0, 2);
+ jjAddStates(10, 12);
break;
case 20:
if ((jjbitVec0[i2] & l2) != 0L)
@@ -770,7 +770,7 @@
}
}
static final int[] jjnextStates = {
- 15, 16, 18, 36, 37, 38, 39, 40, 14, 19, 1, 2, 4, 1, 2, 6,
+ 36, 37, 38, 39, 40, 14, 19, 1, 2, 4, 15, 16, 18, 1, 2, 6,
4, 21, 22, 24, 3, 5, 7, 30, 31, 41, 42,
};
public static final String[] jjstrLiteralImages = {
Modified: trunk/src/jason/mas2j/parser/mas2jTokenManager.java
===================================================================
--- trunk/src/jason/mas2j/parser/mas2jTokenManager.java 2012-04-02 14:53:14 UTC (rev 1679)
+++ trunk/src/jason/mas2j/parser/mas2jTokenManager.java 2012-04-11 18:30:58 UTC (rev 1680)
@@ -16,11 +16,6 @@
switch (pos)
{
case 0:
- if ((active0 & 0x712ff00L) != 0L)
- {
- jjmatchedKind = 29;
- return 88;
- }
if ((active0 & 0x40000000000L) != 0L)
return 45;
if ((active0 & 0x400000L) != 0L)
@@ -28,10 +23,10 @@
jjmatchedKind = 29;
return 14;
}
- if ((active0 & 0x80000L) != 0L)
+ if ((active0 & 0x712ff00L) != 0L)
{
jjmatchedKind = 29;
- return 21;
+ return 88;
}
if ((active0 & 0x80L) != 0L)
{
@@ -43,19 +38,26 @@
jjmatchedKind = 29;
return 5;
}
+ if ((active0 & 0x80000L) != 0L)
+ {
+ jjmatchedKind = 29;
+ return 21;
+ }
return -1;
case 1:
- if ((active0 & 0x200000L) != 0L)
+ if ((active0 & 0x800L) != 0L)
+ return 90;
+ if ((active0 & 0x75af700L) != 0L)
{
jjmatchedKind = 29;
jjmatchedPos = 1;
- return 4;
+ return 90;
}
- if ((active0 & 0x75af700L) != 0L)
+ if ((active0 & 0x200000L) != 0L)
{
jjmatchedKind = 29;
jjmatchedPos = 1;
- return 90;
+ return 4;
}
if ((active0 & 0x80L) != 0L)
{
@@ -63,8 +65,6 @@
jjmatchedPos = 1;
return 78;
}
- if ((active0 & 0x800L) != 0L)
- return 90;
return -1;
case 2:
if ((active0 & 0x77af700L) != 0L)
@@ -85,24 +85,24 @@
}
return -1;
case 4:
+ if ((active0 & 0x80000L) != 0L)
+ return 90;
if ((active0 & 0x772f700L) != 0L)
{
jjmatchedKind = 29;
jjmatchedPos = 4;
return 90;
}
- if ((active0 & 0x80000L) != 0L)
- return 90;
return -1;
case 5:
+ if ((active0 & 0x8100L) != 0L)
+ return 90;
if ((active0 & 0x7727600L) != 0L)
{
jjmatchedKind = 29;
jjmatchedPos = 5;
return 90;
}
- if ((active0 & 0x8100L) != 0L)
- return 90;
return -1;
case 6:
if ((active0 & 0x120000L) != 0L)
@@ -123,14 +123,14 @@
}
return -1;
case 8:
+ if ((active0 & 0x2000L) != 0L)
+ return 90;
if ((active0 & 0x7605600L) != 0L)
{
jjmatchedKind = 29;
jjmatchedPos = 8;
return 90;
}
- if ((active0 & 0x2000L) != 0L)
- return 90;
return -1;
case 9:
if ((active0 & 0x1200000L) != 0L)
@@ -143,14 +143,14 @@
}
return -1;
case 10:
+ if ((active0 & 0x200L) != 0L)
+ return 90;
if ((active0 & 0x6405400L) != 0L)
{
jjmatchedKind = 29;
jjmatchedPos = 10;
return 90;
}
- if ((active0 & 0x200L) != 0L)
- return 90;
return -1;
case 11:
if ((active0 & 0x400000L) != 0L)
@@ -173,14 +173,14 @@
}
return -1;
case 13:
+ if ((active0 & 0x2001000L) != 0L)
+ return 90;
if ((active0 & 0x4000400L) != 0L)
{
jjmatchedKind = 29;
jjmatchedPos = 13;
return 90;
}
- if ((active0 & 0x2001000L) != 0L)
- return 90;
return -1;
case 14:
if ((active0 & 0x4000000L) != 0L)
@@ -823,7 +823,7 @@
jjCheckNAddTwoStates(46, 47);
}
break;
- case 89:
+ case 21:
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 30)
@@ -835,36 +835,14 @@
if (kind > 32)
kind = 32;
}
- if (curChar == 58)
- {
- if (kind > 31)
- kind = 31;
- jjCheckNAddTwoStates(46, 47);
- }
- break;
- case 90:
if ((0x3ff000000000000L & l) != 0L)
{
- if (kind > 30)
- kind = 30;
- jjCheckNAdd(78);
- }
- if ((0x3ff000000000000L & l) != 0L)
- {
if (kind > 29)
kind = 29;
jjCheckNAdd(76);
}
- break;
- case 45:
- if ((0x3ff000000000000L & l) != 0L)
+ else if (curChar == 58)
{
- if (kind > 27)
- kind = 27;
- jjCheckNAddTwoStates(32, 33);
- }
- else if (curChar == 47)
- {
if (kind > 31)
kind = 31;
jjCheckNAddTwoStates(46, 47);
@@ -884,7 +862,7 @@
jjCheckNAdd(76);
}
break;
- case 14:
+ case 5:
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 30)
@@ -909,7 +887,7 @@
jjCheckNAddTwoStates(46, 47);
}
break;
- case 5:
+ case 14:
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 30)
@@ -956,26 +934,48 @@
else if (curChar == 46)
jjCheckNAdd(32);
break;
- case 21:
+ case 45:
if ((0x3ff000000000000L & l) != 0L)
{
+ if (kind > 27)
+ kind = 27;
+ jjCheckNAddTwoStates(32, 33);
+ }
+ else if (curChar == 47)
+ {
+ if (kind > 31)
+ kind = 31;
+ jjCheckNAddTwoStates(46, 47);
+ }
+ break;
+ case 90:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
if (kind > 30)
kind = 30;
jjCheckNAdd(78);
}
- else if (curChar == 58)
- {
- if (kind > 32)
- kind = 32;
- }
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 29)
kind = 29;
jjCheckNAdd(76);
}
+ break;
+ case 89:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 30)
+ kind = 30;
+ jjCheckNAdd(78);
+ }
else if (curChar == 58)
{
+ if (kind > 32)
+ kind = 32;
+ }
+ if (curChar == 58)
+ {
if (kind > 31)
kind = 31;
jjCheckNAddTwoStates(46, 47);
@@ -1181,15 +1181,7 @@
jjCheckNAdd(76);
}
break;
- case 89:
- case 78:
- if ((0x7fffffe87fffffeL & l) == 0L)
- break;
- if (kind > 30)
- kind = 30;
- jjCheckNAdd(78);
- break;
- case 90:
+ case 21:
if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 30)
@@ -1202,6 +1194,8 @@
kind = 29;
jjCheckNAdd(76);
}
+ if (curChar == 101)
+ jjstateSet[jjnewStateCnt++] = 20;
break;
case 4:
if ((0x7fffffe87fffffeL & l) != 0L)
@@ -1219,7 +1213,7 @@
if (curChar == 115)
jjstateSet[jjnewStateCnt++] = 3;
break;
- case 14:
+ case 5:
if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 30)
@@ -1232,10 +1226,10 @@
kind = 29;
jjCheckNAdd(76);
}
- if (curChar == 97)
- jjstateSet[jjnewStateCnt++] = 13;
+ if (curChar == 105)
+ jjstateSet[jjnewStateCnt++] = 4;
break;
- case 5:
+ case 14:
if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 30)
@@ -1248,8 +1242,8 @@
kind = 29;
jjCheckNAdd(76);
}
- if (curChar == 105)
- jjstateSet[jjnewStateCnt++] = 4;
+ if (curChar == 97)
+ jjstateSet[jjnewStateCnt++] = 13;
break;
case 6:
if ((0x7fffffe07fffffeL & l) != 0L)
@@ -1288,7 +1282,7 @@
else if (curChar == 100)
jjstateSet[jjnewStateCnt++] = 5;
break;
- case 21:
+ case 90:
if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 30)
@@ -1301,9 +1295,15 @@
kind = 29;
jjCheckNAdd(76);
}
- if (curChar == 101)
- jjstateSet[jjnewStateCnt++] = 20;
break;
+ case 89:
+ case 78:
+ if ((0x7fffffe87fffffeL & l) == 0L)
+ break;
+ if (kind > 30)
+ kind = 30;
+ jjCheckNAdd(78);
+ break;
case 0:
if (curChar == 100 && kind > 16)
kind = 16;
Added: trunk/src/templates/CArtAgOartifact
===================================================================
--- trunk/src/templates/CArtAgOartifact (rev 0)
+++ trunk/src/templates/CArtAgOartifact 2012-04-11 18:30:58 UTC (rev 1680)
@@ -0,0 +1,19 @@
+// CArtAgO artifact code for project <PROJECT_NAME>
+
+package <PCK>;
+
+import cartago.*;
+
+public class <ARTIFACT_NAME> extends <SUPER_CLASS> {
+ void init(int initialValue) {
+ defineObsProperty("count", initialValue);
+ }
+
+ @OPERATION
+ void inc() {
+ ObsProperty prop = getObsProperty("count");
+ prop.updateValue(prop.intValue()+1);
+ signal("tick");
+ }
+}
+
Deleted: trunk/src/templates/artifact
===================================================================
--- trunk/src/templates/artifact 2012-04-02 14:53:14 UTC (rev 1679)
+++ trunk/src/templates/artifact 2012-04-11 18:30:58 UTC (rev 1680)
@@ -1,10 +0,0 @@
-// CArtAgO artifact code for project <PROJECT_NAME>
-
-package <PCK>;
-
-import cartago.*;
-
-public class <ARTIFACT_NAME> extends <SUPER_CLASS> {
-
-}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
