Author: anuzzolese
Date: Fri Nov 25 00:10:34 2011
New Revision: 1206021
URL: http://svn.apache.org/viewvc?rev=1206021&view=rev
Log:
[STANBOL-388] Fixed the bug related to the rule parser. LessThen and
GreaterThen atoms now accept as second parameter literals and variables instead
of URIs and variables.
Modified:
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
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/RuleParserConstants.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserTokenManager.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/SimpleCharStream.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/Token.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/TokenMgrError.java
Modified:
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java?rev=1206021&r1=1206020&r2=1206021&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
(original)
+++
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
Fri Nov 25 00:10:34 2011
@@ -1,19 +1,3 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0
*/
/* JavaCCOptions:KEEP_LINE_COL=null */
package org.apache.stanbol.rules.manager.parse;
@@ -200,4 +184,4 @@ public class ParseException extends Exce
}
}
-/* JavaCC - OriginalChecksum=5173d6c2eb5a673d2f43da12ccc95ccb (do not edit
this line) */
+/* JavaCC - OriginalChecksum=6917a930637533b189885678ddc74852 (do not edit
this line) */
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=1206021&r1=1206020&r2=1206021&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:10:34 2011
@@ -23,8 +23,8 @@ options
static = false;
}
-PARSER_BEGIN(KReSRuleParser)
-package it.cnr.istc.semion.refactorer.rules.parser;
+PARSER_BEGIN(RuleParserImpl)
+package org.apache.stanbol.rules.manager.parse;
import java.io.Reader;
import java.io.StringReader;
@@ -36,62 +36,62 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.rdf.model.Resource;
-import it.cnr.istc.semion.refactorer.rules.KReSRule;
-import it.cnr.istc.semion.refactorer.rules.KReSRuleAtom;
-import it.cnr.istc.semion.refactorer.rules.URIResource;
-import it.cnr.istc.semion.refactorer.rules.AtomList;
-import it.cnr.istc.semion.refactorer.rules.KReSKB;
-import it.cnr.istc.semion.refactorer.rules.KReSRuleImpl;
-import it.cnr.istc.semion.refactorer.rules.atoms.ClassAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.ComparisonAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.DatavaluedPropertyAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.EndsWithAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.IndividualPropertyAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.DifferentAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.KReSTypedLiteral;
-import it.cnr.istc.semion.refactorer.rules.atoms.LengthAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.NotAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.NumberAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.NumericFunctionAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.SPARQLddAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.SameAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.LessThanAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.GreaterThanAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.KReSResource;
-import it.cnr.istc.semion.refactorer.rules.atoms.KReSVariable;
-import it.cnr.istc.semion.refactorer.rules.atoms.LetAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.ConcatAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.StringAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.StringFunctionAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.SubstringAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.SubtractionAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.SumAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.NewNodeAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.KReSBlankNode;
-import it.cnr.istc.semion.refactorer.rules.atoms.UpperCaseAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.LowerCaseAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.NamespaceAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.LocalNameAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.StrAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.UnionAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.CreateLabelAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.PropStringAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.IsBlankAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.SPARQLcAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.SPARQLdAtom;
-import it.cnr.istc.semion.refactorer.rules.atoms.StartsWithAtom;
-import it.cnr.istc.semion.refactorer.rules.KReSRuleExpressiveness;
+import org.apache.stanbol.rules.base.api.Rule;
+import org.apache.stanbol.rules.base.api.RuleAtom;
+import org.apache.stanbol.rules.base.api.URIResource;
+import org.apache.stanbol.rules.base.api.util.AtomList;
+import org.apache.stanbol.rules.manager.KB;
+import org.apache.stanbol.rules.manager.RuleImpl;
+import org.apache.stanbol.rules.manager.atoms.ClassAtom;
+import org.apache.stanbol.rules.manager.atoms.ComparisonAtom;
+import org.apache.stanbol.rules.manager.atoms.DatavaluedPropertyAtom;
+import org.apache.stanbol.rules.manager.atoms.EndsWithAtom;
+import org.apache.stanbol.rules.manager.atoms.IndividualPropertyAtom;
+import org.apache.stanbol.rules.manager.atoms.DifferentAtom;
+import org.apache.stanbol.rules.manager.atoms.TypedLiteralAtom;
+import org.apache.stanbol.rules.manager.atoms.LengthAtom;
+import org.apache.stanbol.rules.manager.atoms.NotAtom;
+import org.apache.stanbol.rules.manager.atoms.NumberAtom;
+import org.apache.stanbol.rules.manager.atoms.NumericFunctionAtom;
+import org.apache.stanbol.rules.manager.atoms.SPARQLddAtom;
+import org.apache.stanbol.rules.manager.atoms.SameAtom;
+import org.apache.stanbol.rules.manager.atoms.LessThanAtom;
+import org.apache.stanbol.rules.manager.atoms.GreaterThanAtom;
+import org.apache.stanbol.rules.manager.atoms.ResourceAtom;
+import org.apache.stanbol.rules.manager.atoms.VariableAtom;
+import org.apache.stanbol.rules.manager.atoms.LetAtom;
+import org.apache.stanbol.rules.manager.atoms.ConcatAtom;
+import org.apache.stanbol.rules.manager.atoms.StringAtom;
+import org.apache.stanbol.rules.manager.atoms.StringFunctionAtom;
+import org.apache.stanbol.rules.manager.atoms.SubstringAtom;
+import org.apache.stanbol.rules.manager.atoms.SubtractionAtom;
+import org.apache.stanbol.rules.manager.atoms.SumAtom;
+import org.apache.stanbol.rules.manager.atoms.NewNodeAtom;
+import org.apache.stanbol.rules.manager.atoms.BlankNodeAtom;
+import org.apache.stanbol.rules.manager.atoms.UpperCaseAtom;
+import org.apache.stanbol.rules.manager.atoms.LowerCaseAtom;
+import org.apache.stanbol.rules.manager.atoms.NamespaceAtom;
+import org.apache.stanbol.rules.manager.atoms.LocalNameAtom;
+import org.apache.stanbol.rules.manager.atoms.StrAtom;
+import org.apache.stanbol.rules.manager.atoms.UnionAtom;
+import org.apache.stanbol.rules.manager.atoms.CreateLabelAtom;
+import org.apache.stanbol.rules.manager.atoms.PropStringAtom;
+import org.apache.stanbol.rules.manager.atoms.IsBlankAtom;
+import org.apache.stanbol.rules.manager.atoms.SPARQLcAtom;
+import org.apache.stanbol.rules.manager.atoms.SPARQLdAtom;
+import org.apache.stanbol.rules.manager.atoms.StartsWithAtom;
+import org.apache.stanbol.rules.base.api.RuleExpressiveness;
-public class KReSRuleParser
+public class RuleParserImpl
{
- static KReSKB kReSKB;
+ static KB kb;
- public static KReSKB parse( String inString ) {
+ public static KB parse( String inString ) {
{
- kReSKB = new KReSKB();
+ kb = new KB();
Reader reader = new StringReader( inString ) ;
- KReSRuleParser parser = new KReSRuleParser(reader);
+ RuleParserImpl parser = new RuleParserImpl(reader);
StringBuffer buffer = new StringBuffer() ;
try {
parser.start( ) ;
@@ -100,7 +100,7 @@ public class KReSRuleParser
} catch( ParseException e ) {
throw new IllegalStateException(e) ;
}
- return kReSKB ; }
+ return kb ; }
}
@@ -111,7 +111,7 @@ public class KReSRuleParser
String prefix = argumentComposition[0];
String resourceName = argumentComposition[1];
- String namespaceURI = kReSKB.getPrefixURI(prefix);
+ String namespaceURI = kb.getPrefixURI(prefix);
rdfNode =
ModelFactory.createDefaultModel().createResource(namespaceURI+resourceName);
try {
return new
URI(rdfNode.getURI());
@@ -130,7 +130,7 @@ public class KReSRuleParser
String variableString = argument.substring(1);
- variableResource =
ModelFactory.createDefaultModel().createResource(kReSKB.getPrefixURI("var")+variableString);
+ variableResource =
ModelFactory.createDefaultModel().createResource(kb.getPrefixURI("var")+variableString);
@@ -144,7 +144,7 @@ public class KReSRuleParser
}
}
-PARSER_END(KReSRuleParser)
+PARSER_END(RuleParserImpl)
SKIP : {" "}
SKIP : {"\r" | "\t" | "\n"}
@@ -225,45 +225,45 @@ void expressionCont() :
}
void expression() :
-{KReSRule kReSRule;}
+{Rule rule;}
{
prefix() expressionCont()
}
void prefix() :
-{String nsPrefix; Object obj;}
+{String nsPrefix; Object obj; Rule rule;}
{
nsPrefix=getVariable() (obj=equality() { String prefixURI = (String)obj;
prefixURI = prefixURI.substring(1, prefixURI.length()-1);
-
kReSKB.addPrefix(nsPrefix, prefixURI);
+
kb.addPrefix(nsPrefix, prefixURI);
}
| obj=rule() {
AtomList[] atoms = (AtomList[]) obj;
-
String varPrefix = kReSKB.getPrefixURI("var");
+
String varPrefix = kb.getPrefixURI("var");
varPrefix = varPrefix.substring(0, varPrefix.length());
if(atoms.length == 1){
AtomList body =
atoms[0];
if(body.size() ==
1){
-
Iterator<KReSRuleAtom> it = body.iterator();
-
KReSRuleAtom atom = it.next();
+
Iterator<RuleAtom> it = body.iterator();
+ RuleAtom
atom = it.next();
if(atom.isSPARQLConstruct()){
-
KReSRule kReSRule = new KReSRuleImpl(varPrefix+nsPrefix, atoms[0], null,
KReSRuleExpressiveness.SPARQLConstruct);
-
kReSKB.addRule(kReSRule);
+
rule = new RuleImpl(varPrefix+nsPrefix, atoms[0], null,
RuleExpressiveness.SPARQLConstruct);
+
kb.addRule(rule);
}
else
if(atom.isSPARQLDelete()){
-
KReSRule kReSRule = new KReSRuleImpl(varPrefix+nsPrefix, atoms[0], null,
KReSRuleExpressiveness.SPARQLDelete);
-
kReSKB.addRule(kReSRule);
+
rule = new RuleImpl(varPrefix+nsPrefix, atoms[0], null,
RuleExpressiveness.SPARQLDelete);
+
kb.addRule(rule);
}
else
if(atom.isSPARQLDeleteData()){
-
KReSRule kReSRule = new KReSRuleImpl(varPrefix+nsPrefix, atoms[0], null,
KReSRuleExpressiveness.SPARQLDeleteData);
-
kReSKB.addRule(kReSRule);
+
rule = new RuleImpl(varPrefix+nsPrefix, atoms[0], null,
RuleExpressiveness.SPARQLDeleteData);
+
kb.addRule(rule);
}
}
}
else{
- KReSRule kReSRule =
new KReSRuleImpl(varPrefix+nsPrefix, atoms[0], atoms[1],
KReSRuleExpressiveness.KReSCore);
-
kReSKB.addRule(kReSRule);
+ rule = new
RuleImpl(varPrefix+nsPrefix, atoms[0], atoms[1], RuleExpressiveness.KReSCore);
+ kb.addRule(rule);
}
}
)
@@ -271,16 +271,16 @@ void prefix() :
|
< FORWARD_CHAIN > nsPrefix=getVariable() obj=rule() { AtomList[] atoms
= (AtomList[]) obj;
-
String varPrefix = kReSKB.getPrefixURI("var");
+
String varPrefix = kb.getPrefixURI("var");
varPrefix = varPrefix.substring(0, varPrefix.length());
-
KReSRule kReSRule = new KReSRuleImpl(varPrefix+nsPrefix, atoms[0],
atoms[1], KReSRuleExpressiveness.ForwardChaining);
-
kReSKB.addRule(kReSRule); }
+
rule = new RuleImpl(varPrefix+nsPrefix, atoms[0], atoms[1],
RuleExpressiveness.ForwardChaining);
+
kb.addRule(rule); }
| < REFLEXIVE > nsPrefix=getVariable() obj=rule() { AtomList[]
kReSAtoms = (AtomList[]) obj;
-
String pref = kReSKB.getPrefixURI("var");
+
String pref = kb.getPrefixURI("var");
pref =
pref.substring(0, pref.length());
- KReSRule rule = new
KReSRuleImpl(pref+nsPrefix, kReSAtoms[0], kReSAtoms[1],
KReSRuleExpressiveness.Reflexive);
- kReSKB.addRule(rule);
}
+ rule = new
RuleImpl(pref+nsPrefix, kReSAtoms[0], kReSAtoms[1],
RuleExpressiveness.Reflexive);
+ kb.addRule(rule); }
}
@@ -310,7 +310,7 @@ AtomList[] ruleDefinition():
|
< SPARQL_C > < LPAR > t = < SPARQL_STRING > < RPAR >
{
- KReSRuleAtom sparqlAtom = new SPARQLcAtom(t.image);
+ RuleAtom sparqlAtom = new SPARQLcAtom(t.image);
AtomList atomList = new AtomList();
atomList.addToHead(sparqlAtom);
return new AtomList[]{atomList};
@@ -319,7 +319,7 @@ AtomList[] ruleDefinition():
|
< SPARQL_D > < LPAR > t = < SPARQL_STRING > < RPAR >
{
- KReSRuleAtom sparqlDAtom = new SPARQLdAtom(t.image);
+ RuleAtom sparqlDAtom = new SPARQLdAtom(t.image);
AtomList atomDList = new AtomList();
atomDList.addToHead(sparqlDAtom);
return new AtomList[]{atomDList};
@@ -328,7 +328,7 @@ AtomList[] ruleDefinition():
|
< SPARQL_DD > < LPAR > t = < SPARQL_STRING > < RPAR >
{
- KReSRuleAtom sparqlDDAtom = new SPARQLddAtom(t.image);
+ RuleAtom sparqlDDAtom = new SPARQLddAtom(t.image);
AtomList atomDDList = new AtomList();
atomDDList.addToHead(sparqlDDAtom);
return new AtomList[]{atomDDList};
@@ -336,7 +336,7 @@ AtomList[] ruleDefinition():
}
AtomList atomList() :
-{AtomList atomList = new AtomList(); KReSRuleAtom kReSAtom;}
+{AtomList atomList = new AtomList(); RuleAtom kReSAtom;}
{
kReSAtom=atom() atomList=atomListRest()
{ atomList.addToHead(kReSAtom); return atomList;}
@@ -348,7 +348,7 @@ AtomList atomList() :
AtomList atomListRest() :
-{AtomList atomList = new AtomList(); KReSRuleAtom kReSAtom;}
+{AtomList atomList = new AtomList(); RuleAtom kReSAtom;}
{
< AND > atomList=atomList()
{ return atomList;}
@@ -358,20 +358,20 @@ AtomList atomListRest() :
}
-KReSRuleAtom atom() :
-{KReSRuleAtom kReSRuleAtom;}
+RuleAtom atom() :
+{RuleAtom ruleAtom;}
{
- kReSRuleAtom=classAtom() {return kReSRuleAtom;}
-| kReSRuleAtom=individualPropertyAtom() {return kReSRuleAtom;}
-| kReSRuleAtom=datavaluedPropertyAtom() {return kReSRuleAtom;}
-| kReSRuleAtom=letAtom() {return kReSRuleAtom;}
-| kReSRuleAtom=newNodeAtom() {return kReSRuleAtom;}
-| kReSRuleAtom=comparisonAtom() {return kReSRuleAtom;}
-| kReSRuleAtom=unionAtom() {return kReSRuleAtom;}
+ ruleAtom=classAtom() {return ruleAtom;}
+| ruleAtom=individualPropertyAtom() {return ruleAtom;}
+| ruleAtom=datavaluedPropertyAtom() {return ruleAtom;}
+| ruleAtom=letAtom() {return ruleAtom;}
+| ruleAtom=newNodeAtom() {return ruleAtom;}
+| ruleAtom=comparisonAtom() {return ruleAtom;}
+| ruleAtom=unionAtom() {return ruleAtom;}
}
-KReSRuleAtom unionAtom() :
+RuleAtom unionAtom() :
{AtomList atomList1; AtomList atomList2;}
{
< UNION > < LPAR > atomList1 = atomList() < COMMA > atomList2 =
atomList() < RPAR >
@@ -397,7 +397,7 @@ StringFunctionAtom propStringAtom() :
ComparisonAtom endsWithAtom() :
-{KReSRuleAtom kReSRuleAtom; StringFunctionAtom arg; StringFunctionAtom
stringFunctionAtom;}
+{RuleAtom ruleAtom; StringFunctionAtom arg; StringFunctionAtom
stringFunctionAtom;}
{
< ENDS_WITH > < LPAR > arg=stringFunctionAtom() < COMMA >
stringFunctionAtom = stringFunctionAtom()< RPAR >
@@ -406,7 +406,7 @@ ComparisonAtom endsWithAtom() :
ComparisonAtom startsWithAtom() :
-{KReSRuleAtom kReSRuleAtom; StringFunctionAtom arg; StringFunctionAtom
stringFunctionAtom;}
+{RuleAtom ruleAtom; StringFunctionAtom arg; StringFunctionAtom
stringFunctionAtom;}
{
< STARTS_WITH > < LPAR > arg=stringFunctionAtom() < COMMA >
stringFunctionAtom = stringFunctionAtom()< RPAR >
@@ -590,14 +590,14 @@ SameAtom sameAsAtom() :
LessThanAtom lessThanAtom() :
{Object obj1; Object obj2;}
{
- < LESSTHAN > < LPAR > obj1=iObject() < COMMA > obj2=iObject() < RPAR >
+ < LESSTHAN > < LPAR > obj1=iObject() < COMMA > obj2=dObject() < RPAR >
{ return new LessThanAtom(obj1, obj2); }
}
GreaterThanAtom greaterThanAtom() :
{Object obj1; Object obj2;}
{
- < GREATERTHAN > < LPAR > obj1=iObject() < COMMA > obj2=iObject() < RPAR
>
+ < GREATERTHAN > < LPAR > obj1=iObject() < COMMA > obj2=dObject() < RPAR
>
{ return new GreaterThanAtom(obj1, obj2); }
}
@@ -615,11 +615,11 @@ URIResource reference() :
{
uri1=getURI() { uri1 = uri1.substring(1, uri1.length()-1);
try {
- return new KReSResource(new
URI(uri1));
+ return new ResourceAtom(new
URI(uri1));
} catch
(URISyntaxException e) {
e.printStackTrace();
} } |
- uri1= getVariable() colon=< COLON > uri3=getVariable() { return new
KReSResource(getSWRLArgument(uri1+colon.image+uri3)); }
+ uri1= getVariable() colon=< COLON > uri3=getVariable() { return new
ResourceAtom(getSWRLArgument(uri1+colon.image+uri3)); }
}
@@ -630,11 +630,11 @@ URIResource varReference() :
String uri3; }
{
uri1=getURI() { try {
-
return new KReSResource(new URI(uri1));
+
return new ResourceAtom(new URI(uri1));
} catch (URISyntaxException e) {
e.printStackTrace();
} } |
- uri1= getVariable() colon=< COLON > uri3=getVariable() { return new
KReSResource(getSWRLArgument(uri1+colon.image+uri3)); }
+ uri1= getVariable() colon=< COLON > uri3=getVariable() { return new
ResourceAtom(getSWRLArgument(uri1+colon.image+uri3)); }
}
@@ -713,7 +713,7 @@ Object literal() :
{
if(typedLiteral != null){
- return new KReSTypedLiteral(literal, typedLiteral);
+ return new TypedLiteralAtom(literal, typedLiteral);
}
else{
return literal;
@@ -735,23 +735,23 @@ URIResource typedLiteral() :
URIResource variable() :
{ Token t; String var;}
{
- < NOTEX > < LPAR > t = < VARIABLE > < RPAR > {var=t.image;
var=kReSKB.getPrefixURI("var") + var.substring(1);
+ < NOTEX > < LPAR > t = < VARIABLE > < RPAR > {var=t.image;
var=kb.getPrefixURI("var") + var.substring(1);
try{
-
return new KReSVariable(new URI(var),
true);
+
return new VariableAtom(new URI(var),
true);
} catch (URISyntaxException e) {
e.printStackTrace();
return null;
}}
| t = < VARIABLE >
- { var=t.image; var=kReSKB.getPrefixURI("var") + var.substring(1);
+ { var=t.image; var=kb.getPrefixURI("var") + var.substring(1);
try{
-
return new KReSVariable(new URI(var),
false);
+
return new VariableAtom(new URI(var),
false);
} catch (URISyntaxException e) {
e.printStackTrace();
return null;
} }
| t = < BNODE >
- { var=t.image; return new KReSBlankNode(var); }
+ { var=t.image; return new RuleBlankNode(var); }
}
ComparisonAtom notAtom() :
Modified:
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserConstants.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserConstants.java?rev=1206021&r1=1206020&r2=1206021&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserConstants.java
(original)
+++
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserConstants.java
Fri Nov 25 00:10:34 2011
@@ -1,19 +1,3 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
/* Generated By:JavaCC: Do not edit this line. RuleParserConstants.java */
package org.apache.stanbol.rules.manager.parse;
