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

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

Revision: 1560
          http://jason.svn.sourceforge.net/jason/?rev=1560&view=rev
Author:   jomifred
Date:     2009-12-05 19:01:10 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
Lists are not literals

Modified Paths:
--------------
    trunk/src/jason/asSemantics/Unifier.java
    trunk/src/jason/asSyntax/ListTermImpl.java

Modified: trunk/src/jason/asSemantics/Unifier.java
===================================================================
--- trunk/src/jason/asSemantics/Unifier.java	2009-12-04 18:08:36 UTC (rev 1559)
+++ trunk/src/jason/asSemantics/Unifier.java	2009-12-05 19:01:10 UTC (rev 1560)
@@ -210,8 +210,9 @@
         
         // if any of the terms is not a literal (is a number or a
         // string), they must be equal
-        if (!t1g.isLiteral() || !t2g.isLiteral())
-            return t1g.equals(t2g);
+        // (for unification, lists are literals)
+        if (!t1g.isLiteral() && !t1g.isList() || !t2g.isLiteral() && !t2g.isList())
+        	return t1g.equals(t2g);
 
         // both terms are literal
 

Modified: trunk/src/jason/asSyntax/ListTermImpl.java
===================================================================
--- trunk/src/jason/asSyntax/ListTermImpl.java	2009-12-04 18:08:36 UTC (rev 1559)
+++ trunk/src/jason/asSyntax/ListTermImpl.java	2009-12-05 19:01:10 UTC (rev 1560)
@@ -198,6 +198,11 @@
         return true;
     }
 
+    @Override
+    public boolean isLiteral() {
+        return false;
+    }
+
     public boolean isEmpty() {
         return term == null;
     }


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