svn commit: r1206024 - in /incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse: RuleGrammar.jj RuleParserImpl.java

[anuzzolese]

Author: anuzzolese
Date: Fri Nov 25 00:19:39 2011
New Revision: 1206024

URL: http://svn.apache.org/viewvc?rev=1206024&view=rev
Log:
[STANBOL-388] Modified the Stanbol Rules grammar in order to accept literals 
and variables as parameters of GreaterThan and LessThan atoms.

Modified:
    
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj
    
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java

Modified: 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj?rev=1206024&r1=1206023&r2=1206024&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj
 (original)
+++ 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj
 Fri Nov 25 00:19:39 2011
@@ -23,7 +23,7 @@ options
   static = false;
 }
 
-PARSER_BEGIN(RuleParserImpl)
+PARSER_BEGIN(RuleParser)
 package org.apache.stanbol.rules.manager.parse;
 
 import java.io.Reader;
@@ -82,7 +82,7 @@ import org.apache.stanbol.rules.manager.
 import org.apache.stanbol.rules.manager.atoms.StartsWithAtom;
 import org.apache.stanbol.rules.base.api.RuleExpressiveness;
 
-public class RuleParserImpl
+public class RuleParser
 {
 
   static KB kb;
@@ -91,7 +91,7 @@ public class RuleParserImpl
   {
        kb = new KB();
        Reader reader = new StringReader( inString ) ;
-    RuleParserImpl parser = new RuleParserImpl(reader);
+    RuleParser parser = new RuleParser(reader);
     StringBuffer buffer = new StringBuffer() ;
        try {
                parser.start( ) ; 
@@ -144,7 +144,7 @@ public class RuleParserImpl
         }
 }
 
-PARSER_END(RuleParserImpl)
+PARSER_END(RuleParser)
 
 SKIP : {" "}
 SKIP : {"\r" | "\t" | "\n"}
@@ -590,14 +590,14 @@ SameAtom sameAsAtom() :
 LessThanAtom lessThanAtom() :
 {Object obj1; Object obj2;}
 {
-       < LESSTHAN > < LPAR > obj1=iObject() < COMMA > obj2=dObject() < RPAR >
+       < LESSTHAN > < LPAR > obj1=dObject() < COMMA > obj2=dObject() < RPAR >
        { return new LessThanAtom(obj1, obj2); } 
 }
 
 GreaterThanAtom greaterThanAtom() :
 {Object obj1; Object obj2;}
 {
-       < GREATERTHAN > < LPAR > obj1=iObject() < COMMA > obj2=dObject() < RPAR 
>
+       < GREATERTHAN > < LPAR > obj1=dObject() < COMMA > obj2=dObject() < RPAR 
>
        { return new GreaterThanAtom(obj1, obj2); } 
 }
 

Modified: 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java?rev=1206024&r1=1206023&r2=1206024&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
 (original)
+++ 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
 Fri Nov 25 00:19:39 2011
@@ -59,14 +59,13 @@ import com.hp.hpl.jena.rdf.model.Resourc
 public class RuleParserImpl implements RuleParserConstants {
 
   static KB kb;
-  
-  
+
   public static KB parse( String inString ) {
   {
         kb = new KB();
         Reader reader = new StringReader( inString ) ;
-        RuleParserImpl parser = new RuleParserImpl(reader);
-        StringBuffer buffer = new StringBuffer() ;
+    RuleParserImpl parser = new RuleParserImpl(reader);
+    StringBuffer buffer = new StringBuffer() ;
         try {
                 parser.start( ) ;
         } catch( TokenMgrError e ) {
@@ -731,7 +730,7 @@ public class RuleParserImpl implements R
  Object obj1; Object obj2;
     jj_consume_token(LESSTHAN);
     jj_consume_token(LPAR);
-    obj1 = iObject();
+    obj1 = dObject();
     jj_consume_token(COMMA);
     obj2 = dObject();
     jj_consume_token(RPAR);
@@ -743,7 +742,7 @@ public class RuleParserImpl implements R
  Object obj1; Object obj2;
     jj_consume_token(GREATERTHAN);
     jj_consume_token(LPAR);
-    obj1 = iObject();
+    obj1 = dObject();
     jj_consume_token(COMMA);
     obj2 = dObject();
     jj_consume_token(RPAR);