diff options
| author | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2017-10-24 19:43:50 -0300 |
|---|---|---|
| committer | Benjamin J. Culkin <bjculkin@mix.wvu.edu> | 2017-10-24 19:43:50 -0300 |
| commit | 19585e9338462c527475bfced453bc969a8db04c (patch) | |
| tree | a06ff9ab8b3aa2f691e266c82ac8b98ef0ed0cb6 /RGens | |
| parent | a87caf99615de8005e3ed8dd2e3d9c752cbaefd6 (diff) | |
Update
Diffstat (limited to 'RGens')
| -rwxr-xr-x | RGens/data/sample-grammars/zadrons-pouch.gram | 15 | ||||
| -rw-r--r-- | RGens/src/main/java/bjc/rgens/newparser/RGrammar.java | 2 | ||||
| -rw-r--r-- | RGens/todos.txt | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/RGens/data/sample-grammars/zadrons-pouch.gram b/RGens/data/sample-grammars/zadrons-pouch.gram index cb4a63f..6a968db 100755 --- a/RGens/data/sample-grammars/zadrons-pouch.gram +++ b/RGens/data/sample-grammars/zadrons-pouch.gram @@ -14,7 +14,7 @@ pragma initial-rule [zadrons-pouch] [vial] [mini-weapon] [bag] - [card] + [zadron-card] [rope] [box] [wand] @@ -48,10 +48,10 @@ pragma export-rule [zadrons-item] pandora panicking -[card] → card of [card-type] - [card-type] card +[zadron-card] → card of [zad-card-type] + [zad-card-type] card -[card-type] → fate +[zad-card-type] → fate teleporting elusive treasure spell-storing @@ -59,10 +59,9 @@ pragma export-rule [zadrons-item] imprisoning messaging bounty - minor arcana - major arcana - inverse minor arcana - inverse major arcana + [card] + [card] + [card] [crys-sphere] → [sphere-type] spheres [sphere-type] sphere diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java index 6539d60..17f6d43 100644 --- a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java +++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java @@ -177,7 +177,7 @@ public class RGrammar { generateCase(start, new GenerationState(contents, rnd, vars)); - return contents.toString(); + return contents.toString().replaceAll("\\s+", " "); } /* Generate a rule case. */ diff --git a/RGens/todos.txt b/RGens/todos.txt index 05dd15b..3637fc5 100644 --- a/RGens/todos.txt +++ b/RGens/todos.txt @@ -18,6 +18,10 @@ what is needed is some way to do it only one level deep. Possibly some kind of pragma to convert a rule to a single-level spacer? + ADDENDA: 10/24/17 + We now have a partial solution in 'despace-rule'. Now, grammars need to + be adapted to use it. + @TODO 10/23/17 Ben Culkin :Pluralizing Add some way to say to pluralize the contents of a rule |