From 63c7fff30d41ab691d6f49d8d7b69e60f9a9e80f Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Mon, 4 Jun 2018 21:14:41 -0300 Subject: Grammar updates General pass to update grammars to new syntax/features --- data/sample-grammars/rtwiki/adjective.gram | 4 +++ data/sample-grammars/rtwiki/color.gram | 46 ++++++++++----------------- data/sample-grammars/rtwiki/death-cause.gram | 6 ++-- data/sample-grammars/rtwiki/fantasy-name.gram | 17 +++++++--- data/sample-grammars/rtwiki/favorite.gram | 8 ++--- data/sample-grammars/rtwiki/guns.gram | 26 ++++++--------- data/sample-grammars/rtwiki/item.gram | 7 ++-- 7 files changed, 51 insertions(+), 63 deletions(-) (limited to 'data/sample-grammars/rtwiki') diff --git a/data/sample-grammars/rtwiki/adjective.gram b/data/sample-grammars/rtwiki/adjective.gram index 09168aa..487b0bf 100755 --- a/data/sample-grammars/rtwiki/adjective.gram +++ b/data/sample-grammars/rtwiki/adjective.gram @@ -22,6 +22,8 @@ leaping prancing +pragma export-rule [adjective1] + [adjective2] curious happy lusty @@ -32,3 +34,5 @@ zealous angry vulgar + +pragma export-rule [adjective2] diff --git a/data/sample-grammars/rtwiki/color.gram b/data/sample-grammars/rtwiki/color.gram index 346f73b..b991452 100755 --- a/data/sample-grammars/rtwiki/color.gram +++ b/data/sample-grammars/rtwiki/color.gram @@ -1,15 +1,13 @@ -[color-phrases] [color-phrase] - [multi-color-phrases] - -[multi-color-phrases] [color-phrase] blended with [color-phrase] +[color-phrases] <^8> [color-phrase] + <^2> [color-phrase] blended with [color-phrase] a blend between [color-phrase] , [color-phrase] and [color-phrase] - something between [color-phrase] and [color-phrase] + <^2> something between [color-phrase] and [color-phrase] something between [color-phrase] , [color-phrase] and [color-phrase] pragma initial-rule [color-phrases] -[color-phrase] [complete-color] - [sw-complete-color] +[color-phrase] <^2> [complete-color] + <^2> [sw-complete-color] [sw-complete-color] [complete-color] [sw-complete-color] - [complete-color] [sw-complete-color] [sw-complete-color] @@ -17,15 +15,14 @@ pragma initial-rule [color-phrases] pragma export-rule [color-phrase] -[sw-color-phrase] [sw-complete-color] +[sw-color-phrase] <^2> [sw-complete-color] [sw-complete-color] [sw-complete-color] [sw-complete-color] - [sw-complete-color] pragma export-rule [sw-color-phrase] -[complete-color] {wtype=mw} [act-complete-color] +[complete-color] {$wtype=mw} [act-complete-color] -pragma despace-rule [complete-color] pragma export-rule [complete-color] [sw-complete-color] [act-sw-complete-color] @@ -34,9 +31,7 @@ pragma export-rule [complete-color] pragma despace-rule [sw-complete-color] pragma export-rule [sw-complete-color] -[act-sw-complete-color] {wtype=sw} [act-complete-color] - -pragma despace-rule [act-sw-complete-color] +[act-sw-complete-color] {$wtype=sw} [act-complete-color] [act-complete-color] [standard] [red-purple] @@ -46,6 +41,7 @@ pragma despace-rule [act-sw-complete-color] [jewel] [metallic] [heraldic] + [other-color] [other-color] [archaic-purple] [archaic-green] @@ -71,7 +67,7 @@ pragma despace-rule [act-sw-complete-color] ivory white blue-gray - [gray] + [gray|grey] black ebony copper @@ -83,35 +79,26 @@ pragma despace-rule [act-sw-complete-color] [$wtype-standard] transparent -[gray] gray - grey - [sw-standard] iridescent opalescent rainbow -[mw-standard] [iridescent] - [opalescent] - [ombre] - [rainbow] +[mw-standard] [%iridescent|%opalescent|%ombre|%rainbow] -[iridescent] iridescent [color] +[iridescent] <^2> iridescent [color] iridescent between [color] and [color] [opalescent] opalescent [color] [ombre] [color] (tinted [color] ) -[rainbow] rainbow of red, orange, yellow, green, blue, indigo and violet - [custom-rainbow] +[rainbow] <^2> rainbow of red, orange, yellow, green, blue, indigo and violet [custom-rainbow] rainbow of [color] pragma suffix-with [custom-rainbow] [com-color] pragma suffix-with [custom-rainbow] [com-color] -pragma suffix-with [custom-rainbow] [com-color] -pragma suffix-with [custom-rainbow] [com-color] -pragma suffix-with [custom-rainbow] [com-color] +pragma suffix-with [custom-rainbow] <&1..3> [com-color] pragma suffix-with [custom-rainbow] [and-color] [com-color] , [color] @@ -373,10 +360,9 @@ pragma suffix-with [custom-rainbow] [and-color] sulphureous (bright yellow) urobilin (urine-colored) -[arcipluvian] (varies between [color] and [color] ) - (varies between [color] , [color] and [color] ) +[arcipluvian] <^4> (varies between [color] and [color] ) + <^2> (varies between [color] , [color] and [color] ) (varies between [color] , [color] , [color] and [color] ) - (varies between [color] , [color] and [color] ) [archaic-green] [$wtype-archaic-green] diff --git a/data/sample-grammars/rtwiki/death-cause.gram b/data/sample-grammars/rtwiki/death-cause.gram index 74e58e8..3ad27ea 100755 --- a/data/sample-grammars/rtwiki/death-cause.gram +++ b/data/sample-grammars/rtwiki/death-cause.gram @@ -99,10 +99,10 @@ by crucifixion by act of god -[Monster/Animals] {{empty}} +[Monster/Animals] {empty} -[Character/Torture] {{empty}} +[Character/Torture] {empty} -[Character/Deaths] {{empty}} +[Character/Deaths] {empty} pragma export-rule [death-cause] diff --git a/data/sample-grammars/rtwiki/fantasy-name.gram b/data/sample-grammars/rtwiki/fantasy-name.gram index c4ce02e..ca3203f 100755 --- a/data/sample-grammars/rtwiki/fantasy-name.gram +++ b/data/sample-grammars/rtwiki/fantasy-name.gram @@ -1,10 +1,19 @@ -[fantasy-name] [fantasy+name] +[fantasy-name] <^6> [fantasy+name] + <^2> <&2> [fantasy+name] + <&3> [fantasy+name] pragma initial-rule [fantasy-name] -[fantasy+name] [name-root1] [name-root2] - [name-root1] [name-root3] - [name-root1] [name-root2] [name-root3] +[fantasy+name] [name-root1] + +pragma suffix-with [fantasy+name] <&1..2> [name-root2] [name-root3] +pragma prefix-with [fantasy+name] [hname-root1] + +[hname-root1] <^3> {empty} + [name-root1] - + +[hname-root3] <^3> {empty} + - [name-root3] [name-root1] ag al diff --git a/data/sample-grammars/rtwiki/favorite.gram b/data/sample-grammars/rtwiki/favorite.gram index ba1468a..aa16f98 100755 --- a/data/sample-grammars/rtwiki/favorite.gram +++ b/data/sample-grammars/rtwiki/favorite.gram @@ -1,11 +1,7 @@ -[favorite-food] My favorite foods are [fruit] , [vegetable] and [meat] +[favorite-food] My favorite foods are [apple|banana|cherry] , [vegetable] and [meat] pragma initial-rule [favorite-food] -[fruit] apple - banana - cherry - [vegetable] potato okra brussel sprouts @@ -16,7 +12,7 @@ pragma initial-rule [favorite-food] green beans [meat] hamburgers - hot dogs + hot dog salmon beef chicken diff --git a/data/sample-grammars/rtwiki/guns.gram b/data/sample-grammars/rtwiki/guns.gram index aafab8c..ec370a2 100755 --- a/data/sample-grammars/rtwiki/guns.gram +++ b/data/sample-grammars/rtwiki/guns.gram @@ -5,21 +5,17 @@ [quote-guncorp] was bought by [quote-guncorp] [quote-guncorp] 's [quote-gunname] vs. [quote-guncorp] 's [quote-gunname] : cost vs. quality -[quote-gunname] [gun-name] +[quote-gunname] ( [gun-name] ) -[quote-guncorp] [guncorp] +[quote-guncorp] ( [guncorp] ) pragma initial-rule [gun-phrase] -[gun-name] [1gun-name] - [2gun-name2] - [1gun-name] - [2gun-name2] - [1gun-name] - [2gun-name2] - [2gun-name1] [2gun-name2] - [2gun-name1] [1gun-name] - [1gun-name] [2gun-name2] +[gun-name] <^4> [1gun-name] + <^4> [2gun-name2] + <^2> [2gun-name1] [2gun-name2] + <^2> [2gun-name1] [1gun-name] + <^2> [1gun-name] [2gun-name2] [2gun-name1] [1gun-name] [2gun-name2] pragma prefix-with [gun-name] [2gun-name1] @@ -149,11 +145,9 @@ pragma export-rule [gun-name] Poisoner Remedy -[guncorp] [guncorp-1] - [guncorp-1] [guncorp-2] - [guncorp-1] [guncorp-2] - [guncorp-1] [guncorp-2] - [guncorp-1] [guncorp-1] [guncorp-2] +[guncorp] <^2> [guncorp-1] + <^3> [guncorp-1] [guncorp-2] + <&1..2> [guncorp-1] [guncorp-2] [guncorp-1] - [guncorp-1] [guncorp-2] [guncorp-1] and [guncorp-1] [guncorp-2] [guncorp-1] / [guncorp-1] [guncorp-2] diff --git a/data/sample-grammars/rtwiki/item.gram b/data/sample-grammars/rtwiki/item.gram index fdee69c..47c5621 100755 --- a/data/sample-grammars/rtwiki/item.gram +++ b/data/sample-grammars/rtwiki/item.gram @@ -1,15 +1,14 @@ -[item] [act-item] - [act-item] +[item] <^2> [act-item] [act-item] of the [act-item] +pragma initial-rule [item] + [act-item] [body] [music] [symbol] [thing] [weapon] -pragma initial-rule [item] - [body] arm open eye closed eye -- cgit v1.2.3