From c21aff4efeba0cae9b27c7d8a282e3873996d4bc Mon Sep 17 00:00:00 2001
From: Niklas Fors <niklas.fors@cs.lth.se>
Date: Thu, 5 Jul 2018 13:46:38 +0200
Subject: [PATCH] Add README.md and minor changes
---
.gitignore | 2 +-
README.md | 17 +++++++++++++++++
build.xml | 2 +-
examples/{Rail.relast => TrainBenchmark.relast} | 0
spec/scanner/RelAst.flex | 3 ---
test/Test.java | 2 ++
6 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 README.md
rename examples/{Rail.relast => TrainBenchmark.relast} (100%)
diff --git a/.gitignore b/.gitignore
index c52fdba..12a5107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,6 @@
/.settings
/bin/
/ant-bin/
-/compiler.jar
+/relast-compiler.jar
/src/generated/
/.gradle
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..dd28cff
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+# RelAST Preprocessor
+
+Run preprocessor on train benchmark (output written to standard output)
+
+ $ ant jar
+ $ java -jar relast-compiler.jar examples/TrainBenchmark.relast
+
+Run preprocessor and write to files
+
+ $ java -jar relast-compiler.jar examples/TrainBenchmark.relast --file
+ $ cat examples/TrainBenchmarkGen.ast
+ $ cat examples/TrainBenchmarkGen.jadd
+
+Run test cases
+
+ $ cd test
+ $ make
\ No newline at end of file
diff --git a/build.xml b/build.xml
index a35cb94..50520f7 100755
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
<property name="tools" value="${basedir}/tools"/>
<property name="test-reports.dir" location="report-tests"/>
- <property name="jarfile" value="compiler.jar" />
+ <property name="jarfile" value="relast-compiler.jar" />
<property name="junitjar" value="${tools}/junit-4.11-SNAPSHOT.jar" />
<!-- "package" is the directory where generated files will be stored -->
diff --git a/examples/Rail.relast b/examples/TrainBenchmark.relast
similarity index 100%
rename from examples/Rail.relast
rename to examples/TrainBenchmark.relast
diff --git a/spec/scanner/RelAst.flex b/spec/scanner/RelAst.flex
index 2039600..1e40019 100644
--- a/spec/scanner/RelAst.flex
+++ b/spec/scanner/RelAst.flex
@@ -41,9 +41,6 @@ EndOfLineComment = "//" [^\n|\r|\r\n]*
Comment = {TraditionalComment} | {EndOfLineComment}
ID = [a-zA-Z$][a-zA-Z0-9$_]*
-FLOAT = -?[0-9]+ \. [0-9]+ {Exponent}?
-Exponent = [eE] [+-]? [0-9]+
-NUM = -?[0-9]+
%state STRING
diff --git a/test/Test.java b/test/Test.java
index fe6be78..1d1a1d7 100644
--- a/test/Test.java
+++ b/test/Test.java
@@ -28,6 +28,8 @@ public class Test {
testBi7();
testBi8();
testBi9();
+
+ System.out.println("TESTS OK");
}
/**
--
GitLab