diff options
| -rw-r--r-- | RGens/data/sample-grammars/media.gram | 2 | ||||
| -rw-r--r-- | RGens/data/server-config-sample.cfg | 2 | ||||
| -rw-r--r-- | RGens/pom.xml | 9 | ||||
| -rw-r--r-- | RGens/src/main/java/bjc/rgens/newparser/new-syntax.txt | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/RGens/data/sample-grammars/media.gram b/RGens/data/sample-grammars/media.gram index 7a5686a..ddc877d 100644 --- a/RGens/data/sample-grammars/media.gram +++ b/RGens/data/sample-grammars/media.gram @@ -154,4 +154,4 @@ pragma export-rule [cardinal] pragma export-rule [television-station] pragma export-rule [radio-station] -pragma export-rule [newspaper]
\ No newline at end of file +pragma export-rule [newspaper] diff --git a/RGens/data/server-config-sample.cfg b/RGens/data/server-config-sample.cfg index 309cf1c..5039f6e 100644 --- a/RGens/data/server-config-sample.cfg +++ b/RGens/data/server-config-sample.cfg @@ -42,4 +42,4 @@ technobabble.gram theory.gram trademark.gram web.gram -zadrons-pouch.gram
\ No newline at end of file +zadrons-pouch.gram diff --git a/RGens/pom.xml b/RGens/pom.xml index 08d6103..3f1914f 100644 --- a/RGens/pom.xml +++ b/RGens/pom.xml @@ -16,15 +16,8 @@ <artifactId>exec-maven-plugin</artifactId> <version>1.2.1</version> <configuration> - <mainClass>bjc.RGens.server.GrammarServer</mainClass> + <mainClass>bjc.rgens.newparser.RGrammarTest</mainClass> <arguments> - <!-- Uncomment for debug mode --> - <argument>-d</argument> - <argument>-lc</argument> - <argument>data/server-config-sample.cfg</argument> - <argument>-st</argument> - <argument>*</argument> - <!-- <argument>-i</argument> --> </arguments> </configuration> </plugin> diff --git a/RGens/src/main/java/bjc/rgens/newparser/new-syntax.txt b/RGens/src/main/java/bjc/rgens/newparser/new-syntax.txt index 19f2066..3e5738c 100644 --- a/RGens/src/main/java/bjc/rgens/newparser/new-syntax.txt +++ b/RGens/src/main/java/bjc/rgens/newparser/new-syntax.txt @@ -2,9 +2,12 @@ [block] → [pragma-block] → [rule-block] + → [where-block] [pragma-block] → [pragma] (/\n(?!\t)/ [pragma])* [rule-block] → [rule-decl] [rule-case] (/\n\t/ [rule-case])* +[where-block] -> where /\n\t/ ([rule-block] /\n\t/)+ in /\n\t/ [rule-block] + [pragma] → pragma [pragma-name] [pragma-body] |