From 7422af49fa5c4da57323abe676a99468d401c44b Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Thu, 7 Jun 2018 20:37:39 -0300 Subject: Update grammars --- data/misc/700000items.gram | 10 ++++++---- data/new-sample-grammars/perchance/meal.gram | 4 +--- data/sample-grammars/address.gram | 12 ++++++------ data/sample-grammars/art-objects.gram | 4 ++-- data/sample-grammars/awe-names.gram | 10 +++++----- data/sample-grammars/elementals.gram | 2 +- data/sample-grammars/fantasy-locations.gram | 7 ++++--- data/sample-grammars/horror.gram | 2 +- data/sample-grammars/long-data/cards.gram | 1 + data/sample-grammars/long-data/numbers.gram | 2 +- data/sample-grammars/pokeattacks.gram | 10 ++++++---- data/sample-grammars/rune.gram | 4 ++-- data/seniordesign/dbdata.gram | 26 +++++++------------------- 13 files changed, 43 insertions(+), 51 deletions(-) diff --git a/data/misc/700000items.gram b/data/misc/700000items.gram index b3a8855..77bb6e7 100755 --- a/data/misc/700000items.gram +++ b/data/misc/700000items.gram @@ -1,8 +1,10 @@ -[isaac-item-name] {@adjs:=[adj]} [noun] +[isaac-item-name] {@adjs:=[adj]} [act-isaac-item-name] -pragma prefix-with [isaac-item-name] [post] -pragma prefix-with [isaac-item-name] <&1..2> [@adjs] -pragma prefix-with [isaac-item-name] [pre] +[act-isaac-item-name] [noun] + +pragma prefix-with [act-isaac-item-name] [post] +pragma prefix-with [act-isaac-item-name] <&1..2> [@adjs] +pragma prefix-with [act-isaac-item-name] [pre] pragma suffix-with [isaac-item-name] [end] diff --git a/data/new-sample-grammars/perchance/meal.gram b/data/new-sample-grammars/perchance/meal.gram index 252c207..372a1b7 100644 --- a/data/new-sample-grammars/perchance/meal.gram +++ b/data/new-sample-grammars/perchance/meal.gram @@ -25,9 +25,7 @@ pragma export-rule [meal] unusually fresh roasted -[size] small - large - tiny +[size] [small|smol||large|hueg||tiny|teeny] [condiment] <^2> pepper salt diff --git a/data/sample-grammars/address.gram b/data/sample-grammars/address.gram index 3e432d5..c269816 100755 --- a/data/sample-grammars/address.gram +++ b/data/sample-grammars/address.gram @@ -75,17 +75,17 @@ pragma suffix-with [street] [street-suffix] w. <^2> [cardinal] -[street-suffix] [%street|%st.] - [%road|%rd.] +[street-suffix] [street|st.] + [road|rd.] way - [%boulevard|%blvd.] - [%avenue|%ave.] + [boulevard|blvd.] + [avenue|ave.] place plaza court drive - [%highway|%hwy.] - [%parkway|%pkwy.] + [highway|hwy.] + [parkway|pkwy.] pike bypass diff --git a/data/sample-grammars/art-objects.gram b/data/sample-grammars/art-objects.gram index 6720bbc..7f5aac2 100755 --- a/data/sample-grammars/art-objects.gram +++ b/data/sample-grammars/art-objects.gram @@ -1,6 +1,6 @@ -[act-art-treasure-group] {@atreasure:=[art-treasure]} [art-treasure-group] +[art-treasure-group] {@atreasure:=[art-treasure]} [act-art-treasure-group] -[art-treasure-group] <^4> [@atreasure] +[act-art-treasure-group] <^4> [@atreasure] <^2> a choice between [@atreasure] and [@atreasure] <^2> [@atreasure] as well as [@atreasure] <^2> [@atreasure] atop [@atreasure] diff --git a/data/sample-grammars/awe-names.gram b/data/sample-grammars/awe-names.gram index 26d9e3e..d15e6b8 100755 --- a/data/sample-grammars/awe-names.gram +++ b/data/sample-grammars/awe-names.gram @@ -1,9 +1,9 @@ -[awesome-name] {@parts:=[part]} [@parts] +[awesome-name] {@parts:=[part]} [act-awesome-name] -pragma prefix-with [awesome-name] [@parts] -pragma prefix-with [awesome-name] [@parts] -pragma suffix-with [awesome-name] [@parts] -pragma suffix-with [awesome-name] [@parts] +[act-awesome-name] [@parts] + +pragma prefix-with [act-awesome-name] <&1..2> [@parts] +pragma suffix-with [act-awesome-name] <&1..2> [@parts] pragma initial-rule [awesome-name] diff --git a/data/sample-grammars/elementals.gram b/data/sample-grammars/elementals.gram index 946d49c..511f0ec 100755 --- a/data/sample-grammars/elementals.gram +++ b/data/sample-grammars/elementals.gram @@ -33,7 +33,7 @@ pragma initial-rule [elemental] elemental dragon elemental knight -[act-great-less] lesser +[great-less] lesser greater advanced diff --git a/data/sample-grammars/fantasy-locations.gram b/data/sample-grammars/fantasy-locations.gram index 7d06791..32ab26f 100755 --- a/data/sample-grammars/fantasy-locations.gram +++ b/data/sample-grammars/fantasy-locations.gram @@ -1,7 +1,8 @@ -[fantasy-location-name] {@oname=[name1]} [name2] +[fantasy-location-name] {@oname=[name1]} [act-fantasy-location-name] -pragma prefix-with [fantasy-location-name] [@oname] -pragma prefix-with [fantasy-location-name] [@oname] +[act-fantasy-location-name] [name2] + +pragma prefix-with [act-fantasy-location-name] <&1..2> [@oname] pragma initial-rule [fantasy-location-name] diff --git a/data/sample-grammars/horror.gram b/data/sample-grammars/horror.gram index 8740a95..d95b468 100755 --- a/data/sample-grammars/horror.gram +++ b/data/sample-grammars/horror.gram @@ -22,7 +22,7 @@ pragma initial-rule [horror-movie] Hairy Overly keen -[Third] Vampires +[third] Vampires Swamp Beasts Boy Bands Muffins diff --git a/data/sample-grammars/long-data/cards.gram b/data/sample-grammars/long-data/cards.gram index 2ed1e2b..c82efbc 100755 --- a/data/sample-grammars/long-data/cards.gram +++ b/data/sample-grammars/long-data/cards.gram @@ -48,6 +48,7 @@ pragma export-rule [tarot-card] [major-arcana2] pragma export-rule [major-arcana] +pragma export-rule [minor-arcana] [minor-rank] ace <^8> [playing-rank-num] diff --git a/data/sample-grammars/long-data/numbers.gram b/data/sample-grammars/long-data/numbers.gram index 31bfc3c..f2aa0d4 100755 --- a/data/sample-grammars/long-data/numbers.gram +++ b/data/sample-grammars/long-data/numbers.gram @@ -1,4 +1,4 @@ -[binary-digit] [0-1] +[binary-digit] 0 1 pragma export-rule [binary-digit] diff --git a/data/sample-grammars/pokeattacks.gram b/data/sample-grammars/pokeattacks.gram index 7d0ec00..dcbd770 100755 --- a/data/sample-grammars/pokeattacks.gram +++ b/data/sample-grammars/pokeattacks.gram @@ -1,13 +1,15 @@ -[pokeattack] {@oword:=[word-1]} {@tword:=[word-2]} {@ptype:=[poke-type]} [pokeattack-name] +[pokeattack] {@oword:=[word-1]} {@tword:=[word-2]} {@ptype:=[poke-type]} [act-pokeattack] + +[act-pokeattack] [pokeattack-name] [attack-type] ( [@ptype] type) ( [@ptype] / [@ptype] type) [attack-pp] ( [5..40] pp ) -pragma suffix-with [pokeattack] [move-kind] -pragma suffix-with [pokeattack] [attack-type] -pragma suffix-with [pokeattack] [attack-pp] +pragma suffix-with [act-pokeattack] [move-kind] +pragma suffix-with [act-pokeattack] [attack-type] +pragma suffix-with [act-pokeattack] [attack-pp] [pokeattack-name] <^2> <&1..2> [@oword] [@oword] <^2> <&1..2> [@tword] [@tword] diff --git a/data/sample-grammars/rune.gram b/data/sample-grammars/rune.gram index f4bfa44..79499f3 100755 --- a/data/sample-grammars/rune.gram +++ b/data/sample-grammars/rune.gram @@ -7,8 +7,8 @@ pragma initial-rule [rune-string] -pragma prefix-with [rune-string] [@1rune] -pragma suffix-with [rune-string] [@3rune] +pragma prefix-with [act-rune-string] [@1rune] +pragma suffix-with [act-rune-string] [@3rune] [rune-1] a dagger plunged into vines growing out of diff --git a/data/seniordesign/dbdata.gram b/data/seniordesign/dbdata.gram index 04938ad..de0879c 100755 --- a/data/seniordesign/dbdata.gram +++ b/data/seniordesign/dbdata.gram @@ -1,17 +1,7 @@ -[user-role] student - student - student - student - student - tutor - tutor - tutor - tutor - staff - staff - staff - admin - admin +[user-role] <^5> student + <^4> tutor + <^3> staff + <^2> admin sysadmin pragma export-rule [user-role] @@ -29,9 +19,7 @@ pragma export-rule [dept-id] [synth+deptid] [letter] -pragma suffix-with [synth+deptid] [letter] -pragma suffix-with [synth+deptid] [letter] -pragma suffix-with [synth+deptid] [letter] +pragma suffix-with [synth+deptid] <&1..3> [letter] [user-idno] [act-user+idno] @@ -40,7 +28,7 @@ pragma export-rule [user-idno] [act-user+idno] 800 [idno-chain] 700 [idno-chain] -[idno-chain] [digit] [digit] [digit] [digit] [digit] [digit] +[idno-chain] <&5> [digit] [term-code] [2000..2040] 0 [1..9] [2000..2040] [10..12] @@ -48,7 +36,7 @@ pragma export-rule [user-idno] pragma despace-rule [term-code] pragma export-rule [term-code] -[section-code] [letter] [0..9] [0..9] +[section-code] [letter] <&2> [0..9] pragma despace-rule [section-code] pragma export-rule [section-code] -- cgit v1.2.3