[jboss-svn-commits] JBL Code SVN: r11664 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse: dsl and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu May 3 21:28:42 EDT 2007


Author: KrisVerlaenen
Date: 2007-05-03 21:28:42 -0400 (Thu, 03 May 2007)
New Revision: 11664

Added:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/DSLAdapterTest.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/test.dsl
Removed:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/DSLAdapterTest.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/test.dsl
Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java
Log:
 - Fixed issues with DSL in IDE
 - removed redundant parsing in IDE

Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/DSLAdapterTest.java (from rev 10914, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/DSLAdapterTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/DSLAdapterTest.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/DSLAdapterTest.java	2007-05-04 01:28:42 UTC (rev 11664)
@@ -0,0 +1,54 @@
+package org.drools.eclipse.dsl.editor;
+
+import junit.framework.TestCase;
+
+import org.drools.eclipse.dsl.editor.DSLAdapter;
+
+/**
+ * 
+ * @author Michael Neale
+ */
+public class DSLAdapterTest extends TestCase {
+    
+    public void testFindExpander() {
+        
+        StringBuffer buf = largeString();
+        
+        String pat = "\nexpander  \t abc.dsl ";
+        
+        DSLAdapter ad = new DSLAdapter();
+        assertEquals("abc.dsl", DSLAdapter.findDSLConfigName( pat ));
+        
+        
+        assertEquals("abc.dsl", DSLAdapter.findDSLConfigName( buf.toString() ));
+        
+        assertEquals(null, DSLAdapter.findDSLConfigName( "abc /n/n" ));
+        
+        ad = new DSLAdapter("fdfds", null);
+        assertEquals(null, ad.getDSLConfigName());
+        
+    }
+    
+    public void testLoadGrammar() throws Exception {
+        DSLAdapter ad = new DSLAdapter();
+        
+        ad.readConfig( this.getClass().getResourceAsStream( "test.dsl" ) );
+        assertNotNull(ad.listConditionItems());
+        assertNotNull(ad.listConsequenceItems());
+    }
+
+    private StringBuffer largeString() {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < 1000; i++) {
+            if (i == 42) {
+                buf.append( "\nuse expander abc.dsl  \n" );
+            }
+            
+            buf.append( "\n" );
+            buf.append( " fdsfdsfds && " + i);
+            
+        }
+        return buf;
+    }
+    
+}

Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/test.dsl (from rev 10914, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/test.dsl)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/test.dsl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/dsl/editors/test.dsl	2007-05-04 01:28:42 UTC (rev 11664)
@@ -0,0 +1,3 @@
+#this is a DSL
+[condition][]Left hand side=Right hand side
+[condition][]Something else=boo
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/DSLAdapterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/DSLAdapterTest.java	2007-05-04 01:27:23 UTC (rev 11663)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/DSLAdapterTest.java	2007-05-04 01:28:42 UTC (rev 11664)
@@ -1,51 +0,0 @@
-package org.drools.eclipse.editors;
-
-import junit.framework.TestCase;
-
-/**
- * 
- * @author Michael Neale
- */
-public class DSLAdapterTest extends TestCase {
-    
-    public void testFindExpander() {
-        StringBuffer buf = largeString();
-        
-        String pat = "\nexpander  \t abc.dsl";
-        
-        DSLAdapter ad = new DSLAdapter();
-        assertEquals("abc.dsl", DSLAdapter.findDSLConfigName( pat ));
-        
-        
-        assertEquals("abc.dsl", DSLAdapter.findDSLConfigName( buf.toString() ));
-        
-        assertEquals(null, DSLAdapter.findDSLConfigName( "abc /n/n" ));
-        
-        ad = new DSLAdapter("fdfds", null);
-        assertEquals(null, ad.getDSLConfigName());
-        
-    }
-    
-    public void testLoadGrammar() throws Exception {
-        DSLAdapter ad = new DSLAdapter();
-        
-        ad.readConfig( this.getClass().getResourceAsStream( "test.dsl" ) );
-        assertNotNull(ad.listConditionItems());
-        assertNotNull(ad.listConsequenceItems());
-    }
-
-    private StringBuffer largeString() {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < 1000; i++) {
-            if (i == 42) {
-                buf.append( "\nuse expander abc.dsl  \n" );
-            }
-            
-            buf.append( "\n" );
-            buf.append( " fdsfdsfds && " + i);
-            
-        }
-        return buf;
-    }
-    
-}

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java	2007-05-04 01:27:23 UTC (rev 11663)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java	2007-05-04 01:28:42 UTC (rev 11664)
@@ -55,90 +55,90 @@
     	assertTrue(LocationDeterminator.PATTERN_PATTERN_EXCLUDES_ARGUMENT.matcher("(   property   excludes   ").matches());
     }
     
-    public void testCheckLocationDetermination() {
+    public void testCheckLHSLocationDetermination() {
         String input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		";
-        LocationDeterminator.Location location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        LocationDeterminator.Location location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
         
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class( condition == true ) \n" +
         	"		";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
         
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		class: Class( condition == true, condition2 == null ) \n" +
         	"		";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
         
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class( condition == true ) \n" +
         	"		Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		class: Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		class:Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         /** Inside of condition: start */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class (";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( na";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( condition == true, ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( condition == true, na";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
@@ -146,8 +146,8 @@
         	"	when \n" +
         	"		Class ( \n" +
         	"			";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
@@ -155,32 +155,32 @@
         	"	when \n" +
         	"		Class ( condition == true, \n" +
         	"			";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name : ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name: ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name:";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
     
         /** Inside of condition: Operator */
@@ -188,8 +188,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         
@@ -197,8 +197,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class(property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         
@@ -206,8 +206,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name : property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -215,8 +215,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class (name:property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -224,8 +224,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class (name:property   ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -233,8 +233,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name1 : property1, name : property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -242,8 +242,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name1 : property1 == \"value\", name : property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -251,8 +251,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name1 : property1 == \"value\",property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -261,8 +261,8 @@
         	"	when \n" +
         	"		Class ( name1 : property1, \n" + 
         	"			name : property ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -271,8 +271,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property == ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("==", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -281,8 +281,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property== ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("==", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -291,8 +291,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name : property <= ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("<=", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -301,8 +301,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name:property != ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("!=", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -311,8 +311,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name1 : property1, property2 == ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property2", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("==", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -321,8 +321,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class (name:property== ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("==", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -331,8 +331,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property == otherPropertyN";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("==", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -341,8 +341,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property == \"someth";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("==", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -351,8 +351,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property contains ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("contains", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -361,8 +361,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property excludes ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("excludes", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -371,8 +371,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property matches \"prop";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("matches", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -382,50 +382,50 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists ( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists(";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists ( Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists ( name : Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists Class (";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
 
         input = 
@@ -433,44 +433,44 @@
         	"	when \n" +
         	"		exists Class ( ) \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         /** NOT */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		not ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_NOT, location.getType());
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		not Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_NOT, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		not exists ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		not exists Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		not Class (";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
 
         // TODO        
@@ -495,353 +495,353 @@
         	"	when \n" +
         	"		not Class () \n" +
         	"		";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
     
         /** AND */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) &&  ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class () and   ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		name : Class ( name: property ) and ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name: property ) \n" + 
         	"       and ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and name : Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) && name : Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and Class ( ) \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and not Class ( ) \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and exists Class ( ) \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and Class ( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and Class ( name ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("name", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and Class ( name == ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists Class ( ) and not ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_NOT, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists Class ( ) and exists ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) and not Class ( ) \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         /** OR */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) or ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) || ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class () or   ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
     
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		name : Class ( name: property ) or ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name: property ) \n" + 
         	"       or ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) or Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) or name : Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) || name : Cl";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) or Class ( ) \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) or Class ( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) or Class ( name ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("name", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( ) or Class ( name == ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists Class ( ) or not ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_NOT, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		exists Class ( ) or exists ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS, location.getType());
 
         /** EVAL */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval ( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval(";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( myCla";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("myCla", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getMetho";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("param.getMetho", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getMethod(";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("param.getMethod(", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getMethod().get";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("param.getMethod().get", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getMethod(\"someStringWith)))\").get";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("param.getMethod(\"someStringWith)))\").get", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getMethod(\"someStringWith(((\").get";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("param.getMethod(\"someStringWith(((\").get", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( true )";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getProperty(name).isTrue() )";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getProperty(\"someStringWith(((\").isTrue() )";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getProperty((((String) s) )";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_EVAL, location.getType());
         assertEquals("param.getProperty((((String) s) )", location.getProperty(LocationDeterminator.LOCATION_EVAL_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( param.getProperty((((String) s))))";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		eval( true ) \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         /** MULTIPLE RESTRICTIONS */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 & ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -850,8 +850,8 @@
         	"	when \n" +
         	"		Class ( property > 0 & " +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -859,8 +859,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name : property1, property2 > 0 & ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property2", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -868,8 +868,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property1 < 20, property2 > 0 & ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property2", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -877,8 +877,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 & < ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
         assertEquals("<", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_OPERATOR));
@@ -887,8 +887,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 | ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -897,8 +897,8 @@
         	"	when \n" +
         	"		Class ( property > 0 | \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -906,8 +906,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( name : property1, property2 > 0 | ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property2", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -915,8 +915,8 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property1 < 20, property2 > 0 | ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("property2", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -924,75 +924,75 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_END, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_END, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_END, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_END, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 & < 10 ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_END, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_END, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 | < 10 ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_END, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_END, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property == \"test\" | == \"test2\" ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_END, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_END, location.getType());
 
         /** FROM */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) fr";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM, location.getType());
         assertEquals("", location.getProperty(LocationDeterminator.LOCATION_FROM_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from myGlob";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM, location.getType());
         assertEquals("myGlob", location.getProperty(LocationDeterminator.LOCATION_FROM_CONTENT));
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from myGlobal.get";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM, location.getType());
         assertEquals("myGlobal.get", location.getProperty(LocationDeterminator.LOCATION_FROM_CONTENT));
 
         input = 
@@ -1000,31 +1000,31 @@
         	"	when \n" +
         	"		Class ( property > 0 ) from myGlobal.getList() \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from getDroolsFunction() \n" +
         	"       ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         /** FROM ACCUMULATE */
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from accumulate ( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from accumulate(";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE, location.getType());
 
         input = 
         	"rule MyRule \n" +
@@ -1036,8 +1036,8 @@
         	"           result( new Integer( total ) ) \n" +
         	"		) \n" +
         	"		";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
@@ -1045,8 +1045,8 @@
         	"		Class ( property > 0 ) from accumulate( \n" +
         	"			$cheese : Cheese( type == $likes ), \n" +
         	"			init( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE_INIT_INSIDE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE, location.getType());
         assertEquals("", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT));
 
         input = 
@@ -1056,8 +1056,8 @@
         	"			$cheese : Cheese( type == $likes ), \n" +
         	"			init( int total = 0; ), \n" +
         	"			action( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE_ACTION_INSIDE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE, location.getType());
         assertEquals("int total = 0; ", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT));
         assertEquals("", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT));
 
@@ -1069,8 +1069,8 @@
         	"			init( int total = 0; ), \n" +
         	"			action( total += $cheese.getPrice(); ), \n" +
         	"           result( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE_RESULT_INSIDE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE, location.getType());
         assertEquals("int total = 0; ", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT));
         assertEquals("total += $cheese.getPrice(); ", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT));
         assertEquals("", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_RESULT_CONTENT));
@@ -1081,8 +1081,8 @@
         	"		Class ( property > 0 ) from accumulate( \n" +
         	"			$cheese : Cheese( type == $likes ), \n" +
         	"			init( int total =";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE_INIT_INSIDE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE, location.getType());
         assertEquals("int total =", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT));
 
         input = 
@@ -1092,8 +1092,8 @@
         	"			$cheese : Cheese( type == $likes ), \n" +
         	"			init( int total = 0; ), \n" +
         	"			action( total += $ch";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE_ACTION_INSIDE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE, location.getType());
         assertEquals("int total = 0; ", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT));
         assertEquals("total += $ch", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT));
 
@@ -1105,8 +1105,8 @@
         	"			init( int total = 0; ), \n" +
         	"			action( total += $cheese.getPrice(); ), \n" +
         	"           result( new Integer( tot";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_ACCUMULATE_RESULT_INSIDE, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE, location.getType());
         assertEquals("int total = 0; ", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT));
         assertEquals("total += $cheese.getPrice(); ", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT));
         assertEquals("new Integer( tot", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_FROM_ACCUMULATE_RESULT_CONTENT));
@@ -1116,8 +1116,8 @@
         	"	when \n" +
         	"		Class ( property > 0 ) from accumulate( \n" +
         	"			$cheese : Cheese( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Cheese", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
 
         input = 
@@ -1125,8 +1125,8 @@
         	"	when \n" +
         	"		Class ( property > 0 ) from accumulate( \n" +
         	"			$cheese : Cheese( type ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Cheese", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("type", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -1135,8 +1135,8 @@
         	"	when \n" +
         	"		Class ( property > 0 ) from accumulate( \n" +
         	"			$cheese : Cheese( type == ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Cheese", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("type", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -1145,15 +1145,15 @@
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from collect ( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_COLLECT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_COLLECT, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from collect(";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_FROM_COLLECT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_FROM_COLLECT, location.getType());
 
         input = 
         	"rule MyRule \n" +
@@ -1162,16 +1162,16 @@
         	"			Cheese( type == $likes )" +
         	"		) \n" +
         	"		";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_BEGIN_OF_CONDITION, location.getType());
 
         input = 
         	"rule MyRule \n" +
         	"	when \n" +
         	"		Class ( property > 0 ) from collect ( \n" +
         	"			Cheese( ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_START, location.getType());
         assertEquals("Cheese", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
 
         input = 
@@ -1179,8 +1179,8 @@
         	"	when \n" +
         	"		Class ( property > 0 ) from collect ( \n" +
         	"			Cheese( type ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_OPERATOR, location.getType());
         assertEquals("Cheese", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("type", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
 
@@ -1189,10 +1189,55 @@
         	"	when \n" +
         	"		Class ( property > 0 ) from collect ( \n" +
         	"			Cheese( type == ";
-        location = LocationDeterminator.getLocationInCondition(input);
-        assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT, location.getType());
         assertEquals("Cheese", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
         assertEquals("type", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_PROPERTY_NAME));
     }
     
+    public void testCheckRHSLocationDetermination() {
+        String input = 
+        	"rule MyRule \n" +
+        	"	when\n" +
+        	"		Class ( )\n" +
+        	"   then\n" +
+        	"       ";
+        LocationDeterminator.Location location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_RHS, location.getType());
+        assertEquals("", location.getProperty(LocationDeterminator.LOCATION_RHS_CONTENT));
+        
+        input = 
+        	"rule MyRule \n" +
+        	"	when\n" +
+        	"		Class ( )\n" +
+        	"   then\n" +
+        	"       assert(null);\n" +
+        	"       ";
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_RHS, location.getType());
+        assertEquals("assert(null);\n       ", location.getProperty(LocationDeterminator.LOCATION_RHS_CONTENT));
+
+        input = 
+        	"rule MyRule \n" +
+        	"	when\n" +
+        	"		Class ( )\n" +
+        	"   then\n" +
+        	"       meth";
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_RHS, location.getType());
+        assertEquals("meth", location.getProperty(LocationDeterminator.LOCATION_RHS_CONTENT));
+    }
+        
+    public void testCheckRuleHeaderLocationDetermination() {
+        String input = 
+        	"rule MyRule ";
+        LocationDeterminator.Location location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_RULE_HEADER, location.getType());
+        
+        input = 
+        	"rule MyRule \n" +
+        	"	salience 12 activation-group \"my";
+        location = LocationDeterminator.getLocation(input);
+        assertEquals(LocationDeterminator.LOCATION_RULE_HEADER, location.getType());
+    }
 }

Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/test.dsl
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/test.dsl	2007-05-04 01:27:23 UTC (rev 11663)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/test.dsl	2007-05-04 01:28:42 UTC (rev 11664)
@@ -1,3 +0,0 @@
-#this is a DSL
-Left hand side=Right hand side
-Something else=boo
\ No newline at end of file




More information about the jboss-svn-commits mailing list