Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1908] trunk
|
From: <jom...@us...> - 2016-04-26 17:39:08
|
Revision: 1908
http://sourceforge.net/p/jason/svn/1908
Author: jomifred
Date: 2016-04-26 17:39:06 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
fix EOF and // comments issue
Modified Paths:
--------------
trunk/applications/as-unit-test/src/example/BRFTestEnv.java
trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java
trunk/build.xml
trunk/pom.xml
trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
trunk/src/jason/asSyntax/parser/as2jTokenManager.java
Added Paths:
-----------
trunk/bin/publish-maven.sh
Modified: trunk/applications/as-unit-test/src/example/BRFTestEnv.java
===================================================================
--- trunk/applications/as-unit-test/src/example/BRFTestEnv.java 2016-04-19 06:07:27 UTC (rev 1907)
+++ trunk/applications/as-unit-test/src/example/BRFTestEnv.java 2016-04-26 17:39:06 UTC (rev 1908)
@@ -9,7 +9,7 @@
public static final Literal iInfo = Literal.parseLiteral("info");
public boolean executeAction(String agName, Structure pAction) {
- // System.out.println(agName+" executing action "+pAction);
+ //System.out.println(agName+" executing action "+pAction);
if (pAction.getFunctor().equals("get_info_as_percept"))
addPercept( agName, Literal.parseLiteral("info") );
else if (pAction.getFunctor().equals("clear_my_percepts"))
Modified: trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java
===================================================================
--- trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java 2016-04-19 06:07:27 UTC (rev 1907)
+++ trunk/applications/as-unit-test/src/example/TestExampleEnvironment.java 2016-04-26 17:39:06 UTC (rev 1908)
@@ -32,7 +32,9 @@
@Test(timeout=2000)
public void testPerception1() {
ag.addGoal("start"); // add a new goal for the agent
- ag.assertBel("info[source(second_source), source(percept)]",10); // the agent should believe in info with two sources
+ ag.assertBel("info",20);
+ System.out.println(ag.getBB());
+ ag.assertBel("info[source(second_source), source(percept)]",20); // the agent should believe in info with two sources
}
@Test(timeout=2000)
public void testPerception2() {
Added: trunk/bin/publish-maven.sh
===================================================================
--- trunk/bin/publish-maven.sh (rev 0)
+++ trunk/bin/publish-maven.sh 2016-04-26 17:39:06 UTC (rev 1908)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+REL=2.0.beta
+
+ant maven-stage
+
+cd ~/.m2/repository/net/sf/jason/jason
+scp -r $REL jomifred,ja...@we...:/home/project-web/jacamo/htdocs/maven2/net/sf/jason/jason
+cp maven-metadata-local.xml maven-metadata.xml
+scp maven-metadata.x* jomifred,ja...@we...:/home/project-web/jacamo/htdocs/maven2/net/sf/jason/jason
Property changes on: trunk/bin/publish-maven.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2016-04-19 06:07:27 UTC (rev 1907)
+++ trunk/build.xml 2016-04-26 17:39:06 UTC (rev 1908)
@@ -4,17 +4,18 @@
<property environment="env" />
- <property name="jasonJar" value="${basedir}/lib/jason.jar" />
+ <property name="version" value="2" />
+ <property name="release" value="0.beta" />
+
+ <property name="jasonJar" value="${basedir}/lib/jason-${version}.${release}.jar" />
<property name="jadeJar" value="${basedir}/lib/jade.jar" />
<property name="jasonSJar" value="${basedir}/lib/s-jason.jar" />
<property name="replJar" value="${basedir}/lib/jason-repl.jar" />
<property name="coreJar" value="${basedir}/lib/jason-core.jar" />
-
+
<property name="build.dir" value="${basedir}/bin/classes" />
<property name="dist.properties" value="${basedir}/bin/dist.properties" />
- <property name="version" value="2" />
- <property name="release" value="0.beta" />
<property name="distDir" value="${env.HOME}/tmp/x/Jason-${version}.${release}" />
<property name="distFile" value="${env.HOME}/Jason-${version}.${release}" />
@@ -171,7 +172,7 @@
<attribute name="Main-Class" value="jason.util.ConfigGUI"/>
</manifest>
</jar>
- <!-- copy file="${jasonJar}" todir="applications/jason-eclipse-plugin/lib" /-->
+ <!--copy file="${jasonJar}" todir="${jarRepo}" failonerror="false" quiet="true" /-->
</target>
<target name="jar-core" depends="jar">
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2016-04-19 06:07:27 UTC (rev 1907)
+++ trunk/pom.xml 2016-04-26 17:39:06 UTC (rev 1908)
@@ -4,7 +4,7 @@
<artifactId>jason</artifactId>
<packaging>jar</packaging>
<name>Jason</name>
- <version>1.4.2</version>
+ <version>2.0.beta</version>
<description>Jason is a fully-fledged interpreter for an extended version of AgentSpeak, a BDI agent-oriented logic programming language, and is implemented in Java. Using JADE a multi-agent system can be distributed over a network effortlessly.</description>
<url>http://jason.sf.net</url>
<licenses>
Modified: trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
===================================================================
--- trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-04-19 06:07:27 UTC (rev 1907)
+++ trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-04-26 17:39:06 UTC (rev 1908)
@@ -140,7 +140,7 @@
| "\t"
| "\n"
| "\r"
-| <"//" (~["\n","\r"])* ("\n" | "\r" | "\r\n")>
+| <"//" (~["\n","\r"])* ("\n" | "\r" | "\r\n")?>
| <"/*" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/">
}
Modified: trunk/src/jason/asSyntax/parser/as2jTokenManager.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2jTokenManager.java 2016-04-19 06:07:27 UTC (rev 1907)
+++ trunk/src/jason/asSyntax/parser/as2jTokenManager.java 2016-04-26 17:39:06 UTC (rev 1908)
@@ -421,7 +421,11 @@
if (curChar == 42)
jjCheckNAddTwoStates(20, 21);
else if (curChar == 47)
+ {
+ if (kind > 5)
+ kind = 5;
jjCheckNAddStates(0, 2);
+ }
break;
case 0:
if ((0x3ff000000000000L & l) != 0L)
@@ -496,8 +500,11 @@
jjAddStates(8, 9);
break;
case 15:
- if ((0xffffffffffffdbffL & l) != 0L)
- jjCheckNAddStates(0, 2);
+ if ((0xffffffffffffdbffL & l) == 0L)
+ break;
+ if (kind > 5)
+ kind = 5;
+ jjCheckNAddStates(0, 2);
break;
case 16:
if ((0x2400L & l) != 0L && kind > 5)
@@ -703,6 +710,8 @@
kind = 28;
break;
case 15:
+ if (kind > 5)
+ kind = 5;
jjAddStates(0, 2);
break;
case 20:
@@ -761,8 +770,11 @@
jjAddStates(10, 12);
break;
case 15:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(0, 2);
+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
+ break;
+ if (kind > 5)
+ kind = 5;
+ jjAddStates(0, 2);
break;
case 20:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
