[Jason-developers] SF.net SVN: jason: [1167] trunk/src/jason/asSyntax

[<jom...@us...>]

Revision: 1167
          http://jason.svn.sourceforge.net/jason/?rev=1167&view=rev
Author:   jomifred
Date:     2008-03-20 01:56:41 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
fix bug related to plan's TE being an Atom

Modified Paths:
--------------
    trunk/src/jason/asSyntax/Atom.java
    trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
    trunk/src/jason/asSyntax/parser/as2j.java

Modified: trunk/src/jason/asSyntax/Atom.java
===================================================================
--- trunk/src/jason/asSyntax/Atom.java	2008-03-19 17:50:11 UTC (rev 1166)
+++ trunk/src/jason/asSyntax/Atom.java	2008-03-20 08:56:41 UTC (rev 1167)
@@ -142,6 +142,12 @@
     	return super.addAnnot(t);
     }
     
+    @Override
+    public void addAnnots(List<Term> l) {
+        logger.log(Level.SEVERE, "You should not add annots '"+l+"' in atom "+this+"\n",new Exception());
+        super.addAnnots(l);
+    }
+    
     @Override public void makeTermsAnnon() { }
     @Override public void makeVarsAnnon() { }
 

Modified: trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
===================================================================
--- trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc	2008-03-19 17:50:11 UTC (rev 1166)
+++ trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc	2008-03-20 08:56:41 UTC (rev 1167)
@@ -310,7 +310,10 @@
   
   ( F=literal()
   | F=var()
-  )            { return new Trigger(teOp,teType,F); }
+  )            { if (F instanceof Atom) 
+                    F = new Literal(F.getFunctor()); // trigger literal must be a literal and not an atom
+                 return new Trigger(teOp,teType,F); 
+               }
 }
 
 /* Literal */

Modified: trunk/src/jason/asSyntax/parser/as2j.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2j.java	2008-03-19 17:50:11 UTC (rev 1166)
+++ trunk/src/jason/asSyntax/parser/as2j.java	2008-03-20 08:56:41 UTC (rev 1167)
@@ -406,6 +406,8 @@
       jj_consume_token(-1);
       throw new ParseException();
     }
+                 if (F instanceof Atom)
+                    F = new Literal(F.getFunctor()); // trigger literal must be a literal and not an atom
                  {if (true) return new Trigger(teOp,teType,F);}
     throw new Error("Missing return statement in function");
   }
@@ -1166,28 +1168,6 @@
     finally { jj_save(1, xla); }
   }
 
-  final private boolean jj_3R_19() {
-    if (jj_scan_token(39)) return true;
-    if (jj_3R_25()) return true;
-    if (jj_scan_token(40)) return true;
-    return false;
-  }
-
-  final private boolean jj_3R_18() {
-    if (jj_3R_24()) return true;
-    return false;
-  }
-
-  final private boolean jj_3R_17() {
-    if (jj_3R_23()) return true;
-    return false;
-  }
-
-  final private boolean jj_3R_22() {
-    if (jj_scan_token(34)) return true;
-    return false;
-  }
-
   final private boolean jj_3R_71() {
     if (jj_scan_token(TK_INTMOD)) return true;
     return false;
@@ -1667,6 +1647,28 @@
     return false;
   }
 
+  final private boolean jj_3R_19() {
+    if (jj_scan_token(39)) return true;
+    if (jj_3R_25()) return true;
+    if (jj_scan_token(40)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_18() {
+    if (jj_3R_24()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_17() {
+    if (jj_3R_23()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_22() {
+    if (jj_scan_token(34)) return true;
+    return false;
+  }
+
   public as2jTokenManager token_source;
   SimpleCharStream jj_input_stream;
   public Token token, jj_nt;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.