Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/rxm.git

Made terminator a token.

Author Dave Jarvis <email>
Date 2015-02-09 15:08:43 GMT-0800
Commit 3f5b7768359e08931e6c5b996424b1a3998e2c59
Parent ac2ba39
build.sh
bnfc -m -java -p com.whitemagicsoftware rxm.cf > bnfc.log 2>&1
+echo "Creating a clean build..."
+make clean > /dev/null
+
CLASSPATH="-cp .:lib/*"
-mkdir build
+mkdir -p build
echo "Building files..."
make JAVA_FLAGS="$CLASSPATH" JAVAC_FLAGS="$CLASSPATH -d build" > make.log 2>&1
+
+echo "Removing backup files..."
+find . -type f -name "*.bak" -exec rm {} \;
rxm.cf
token Identifier (letter (letter | digit | '_')*) ;
+token Terminator (',') ;
TTable. Table ::= Identifier ;
TColumn. Column ::= "." Identifier ;
TTableColumn. TableColumn ::= Identifier Column ;
TAttribute. Attribute ::= "@" Identifier ;
TParameter. Parameter ::= "$" Identifier ;
-Program. Query ::= Root "," Map ";" Where ;
-Start. Root ::= "root" ">" Element ;
+Program. Query ::= Root Map ";" Where ;
+Start. Root ::= "root" ">" Element Terminator ;
rules Map ::= ".*" | Line ;
rules Line ::= LineXPath | LineJoin ;
-LXPath. LineXPath ::= Entity ">" XPath "," ;
-LJoin. LineJoin ::= TableColumn ">" TableColumn "," ;
+LXPath. LineXPath ::= Entity ">" XPath Terminator ;
+LJoin. LineJoin ::= TableColumn ">" TableColumn Terminator ;
rules Entity ::= Table | Column | TableColumn ;
Delta 12 lines added, 5 lines removed, 7-line increase