Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r2183 - in trunk/labs/jbossrules/drools-core/src: main/java/org/drools/lang test/java/org/drools/lang
|
From: <jbo...@li...> - 2006-01-24 07:02:50
|
Author: mic...@jb...
Date: 2006-01-24 02:02:40 -0500 (Tue, 24 Jan 2006)
New Revision: 2183
Modified:
trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/ParseException.java
trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java
trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/ParserTest.java
trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl
Log:
line numbers in parse errors, tweaks for expanders
Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/ParseException.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/ParseException.java 2006-01-24 04:36:35 UTC (rev 2182)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/ParseException.java 2006-01-24 07:02:40 UTC (rev 2183)
@@ -4,8 +4,33 @@
public class ParseException extends DroolsRuntimeException {
- public ParseException(String message) {
- super( message );
- }
+ private static final long serialVersionUID = -7500818890340701977L;
+
+ private int lineNumber;
+
+ /**
+ * Thrown if there is an exception related to parsing a line in a drl file.
+ * For more generic exception, a different exception class will be used.
+ */
+ public ParseException(String message, int lineNumber) {
+ super(message);
+ this.lineNumber = lineNumber;
+ }
+
+ /**
+ * The line number on which the error occurred.
+ */
+ public int getLineNumber() {
+ return this.lineNumber;
+ }
+
+ public String getMessage() {
+ return super.getMessage() + " Line number: " + lineNumber;
+ }
+
+ public String toString() {
+ return getMessage();
+ }
+
}
Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java 2006-01-24 04:36:35 UTC (rev 2182)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java 2006-01-24 07:02:40 UTC (rev 2183)
@@ -14,11 +14,19 @@
import org.drools.rule.Rule;
import org.drools.rule.RuleConstructionException;
+/**
+ * The one, the only DRL parser.
+ *
+ * @master Bob McWirther
+ * @apprentice Michael Neale
+ */
public class Parser {
private static Pattern PACKAGE_DECL = Pattern.compile( "\\s*package\\s*([^;]+);?\\s*" );
private static Pattern IMPORT_STATEMENT = Pattern.compile( "\\s*import\\s*([^;]+);?\\s*" );
private static Pattern RULE_DECL = Pattern.compile( "\\s*rule\\s*([^\\s]+)\\s*" );
+
+ private static Pattern EXPANDER_STATEMENT = Pattern.compile("\\s*use\\s*expander\\s([^;]+);?\\s*");
private static Pattern FACT_BINDING = Pattern.compile( "\\s*(\\w+)\\s*=>\\s*(.*)" );
private static Pattern FIELD_BINDING = Pattern.compile( "\\s*(\\w+):(\\w+)\\s*" );
@@ -27,12 +35,19 @@
private String packageDeclaration;
private List imports;
+ private String expanderName;
private List rules;
+
+
+ private int lineNumber;
+
public Parser(Reader reader) {
this.reader = new BufferedReader( reader );
this.imports = new ArrayList();
this.rules = new ArrayList();
+ this.expanderName = null;
+ this.lineNumber = 0;
}
public String getPackageDeclaration() {
@@ -46,6 +61,10 @@
public List getRules() {
return rules;
}
+
+ String getExpanderName() {
+ return expanderName;
+ }
public void parse() throws IOException, RuleConstructionException {
prolog();
@@ -55,6 +74,7 @@
protected void prolog() throws IOException {
packageDeclaration();
importStatements();
+ expanderStatement();
functions();
}
@@ -76,7 +96,7 @@
// just do it again
}
}
-
+
protected boolean importStatement() throws IOException {
String line = laDiscard();
@@ -92,6 +112,22 @@
return false;
}
+
+ protected boolean expanderStatement() throws IOException {
+ String line = laDiscard();
+
+ if ( line == null ) { return false; }
+
+ Matcher matcher = EXPANDER_STATEMENT.matcher( line );
+
+ if ( matcher.matches() ) {
+ consumeDiscard();
+ expanderName = matcher.group( 1 );
+ return true;
+ }
+
+ return false;
+ }
protected void functions() {
@@ -129,7 +165,7 @@
line = laDiscard();
if ( ! line.trim().equals( "end" ) ) {
- throw new ParseException( "end expected" );
+ throw new ParseException( "end expected.", lineNumber);
}
consumeDiscard();
@@ -181,31 +217,48 @@
pattern = line;
}
- if ( pattern.startsWith( ":" ) ) {
- pattern = expand( pattern );
- }
+
+ pattern = maybeExpand( pattern );
pattern( pattern );
return true;
}
+
+ /**
+ * Only want to expand if we are using an expander, and if the pattern isn't escaped.
+ */
+ protected String maybeExpand(final String pattern) {
+ if ( expanding() ) {
+ if (pattern.startsWith( ">" )) {
+ return pattern.substring(1);
+ } else {
+ return expand( pattern );
+ }
+ }
+ return pattern;
+ }
protected String expand(String pattern) {
- // TODO: Michael, here goes the expansion bits
- return pattern;
+ //MN hook in here. Will only be called if it is honest to God expanding.
+ return pattern;
}
+
+ protected boolean expanding() {
+ return this.expanderName != null;
+ }
protected void pattern(String pattern) {
int leftParen = pattern.indexOf( "(" );
if ( leftParen < 0 ) {
- throw new ParseException( "invalid pattern: " + pattern );
+ throw new ParseException( "invalid pattern: " + pattern, lineNumber );
}
int rightParen = pattern.lastIndexOf( ")" );
if ( rightParen < 0 ) {
- throw new ParseException( "invalid pattern: " + pattern );
+ throw new ParseException( "invalid pattern: " + pattern, lineNumber );
}
String guts = pattern.substring( leftParen+1, rightParen ).trim();
@@ -244,12 +297,13 @@
while ( true ) {
line = laDiscard();
if ( line == null ) {
- throw new ParseException( "end expected" );
+ throw new ParseException( "end expected", lineNumber );
}
if ( line.trim().equals( "end" ) ) {
break;
}
consumeDiscard();
+ line = maybeExpand( line );
consequence.append( line + "\n" );
}
System.err.println( "begin consequence");
@@ -289,6 +343,7 @@
}
protected String consume() throws IOException {
+ lineNumber++;
return reader.readLine();
}
@@ -302,7 +357,8 @@
reader.reset();
return null;
}
-
+ lineNumber++;
+
String trimLine = line.trim();
if ( trimLine.length() == 0 || trimLine.startsWith( "#" ) || trimLine.startsWith( "//" ) ) {
Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/ParserTest.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/ParserTest.java 2006-01-24 04:36:35 UTC (rev 2182)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/ParserTest.java 2006-01-24 07:02:40 UTC (rev 2183)
@@ -48,6 +48,8 @@
assertEquals( 1, parser.getRules().size() );
assertEquals( "find_seating", ((Rule)parser.getRules().get(0)).getName() );
+
+ assertEquals(null, parser.getExpanderName());
}
protected Parser parser(String name) {
Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl
===================================================================
--- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl 2006-01-24 04:36:35 UTC (rev 2182)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl 2006-01-24 07:02:40 UTC (rev 2183)
@@ -10,13 +10,15 @@
import java.util.List
import java.util.ArrayList;
+# use expanders for domain specific and pseudo natural language extensions
+# use expander foo;
+
+
rule find_seating
when
- context => Context( state == Context.ASSIGN_SEATS )
+ context => Context( state == Context.ASSIGN_SEATS )
Seating( seatingId:id, seatingPid:pid, pathDone == true, seatingRightSeat:rightSeat, seatingRightGuestName:rightGuestName )
- #:bob is in atlanta
-
Guest( name == seatingRightGuestName, rightGuestSex:sex, rightGuestHobby:hobby )
Guest( leftGuestName:name , sex != rightGuestSex, hobby == rightGuestHobby )
count => Count()
|
