Update sample grammars

5 files changed, 94 insertions, 98 deletions

diff --git a/RGens/data/sample-grammars/fantasy-locations.gram b/RGens/data/sample-grammars/fantasy-locations.gram
index 0dc8aa3..7aea723 100755
--- a/RGens/data/sample-grammars/fantasy-locations.gram
+++ b/RGens/data/sample-grammars/fantasy-locations.gram
@@ -1,9 +1,9 @@
-pragma uniform
-
-[fantasy-location-name] 4 [name1] [name2]
-	2 [name1] [name1] [name2]
-
-pragma uniform
+[fantasy-location-name] [name1] [name2]
+	[name1] [name2]
+	[name1] [name2]
+	[name1] [name2]
+	[name1] [name1] [name2]
+	[name1] [name1] [name2]
 
 pragma initial-rule [fantasy-location-name]
 
diff --git a/RGens/data/sample-grammars/linux.gram b/RGens/data/sample-grammars/linux.gram
index a67f344..0be401c 100644
--- a/RGens/data/sample-grammars/linux.gram
+++ b/RGens/data/sample-grammars/linux.gram
@@ -51,7 +51,6 @@ pragma initial-rule [linux-domain]
 	uber
 	[first-name]
 
-
 [linux-domain1] linux
 	geek
 	nerd
diff --git a/RGens/data/sample-grammars/organization.gram b/RGens/data/sample-grammars/organization.gram
index d185bc5..8bd3cc2 100644
--- a/RGens/data/sample-grammars/organization.gram
+++ b/RGens/data/sample-grammars/organization.gram
@@ -5,12 +5,15 @@ pragma export-rule [org-political]
 
 [org-political] [org-prefix] [org-body] [org-goal]
 
-pragma uniform
-
-[org-body] 7 of [org-members] [org-position]
-	1 for
-
-pragma uniform
+[org-body] of [org-members] [org-position]
+	of [org-members] [org-position]
+	of [org-members] [org-position]
+	of [org-members] [org-position]
+	of [org-members] [org-position]
+	of [org-members] [org-position]
+	of [org-members] [org-position]
+	of [org-members] [org-position]
+	for
 
 [org-position] for
 	for
@@ -53,7 +56,7 @@ pragma uniform
 	raising taxes for [tax-class] 
 	random drug testing for elected officials
 	right on red traffic laws
-	splitting microsoft into [ms-pieces] pieces
+	splitting microsoft into [2..50] pieces
 	subsidized day care for working parents
 	teaching [subject] in the classroom
 	the death penalty
@@ -76,9 +79,7 @@ pragma uniform
 	wealth
 	filthy rich
 
-[min+wage] [min-wage-init] . [digit] [digit]
-
-pragma range-rule [min-wage-init] 6 8
+[min+wage] [6..8] . [digit] [digit]
 
 [protect] bill of rights
 	first amendment
@@ -90,8 +91,6 @@ pragma range-rule [min-wage-init] 6 8
 	billionaire
 	lottery winners
 
-pragma range-rule [ms-pieces] 2 50
-
 [subject] evolution
 	evilution
 	creationism
diff --git a/RGens/data/sample-grammars/web.gram b/RGens/data/sample-grammars/web.gram
index 0c2fbf7..a12d303 100644
--- a/RGens/data/sample-grammars/web.gram
+++ b/RGens/data/sample-grammars/web.gram
@@ -50,9 +50,7 @@ pragma export-rule [big-tld]
 	[middle-initial] [last-name]
 	[first-name] . [last-name]
 	[first-name]
-	[random-name] [num-range]
-
-pragma range-rule [num-range] 1 999
+	[random-name] [1..999]
 
 [actual+url] http://www. [domain] /
 	http://www. [domain] /
diff --git a/RGens/data/server-config-sample.cfg b/RGens/data/server-config-sample.cfg
index 762babe..84e031e 100644
--- a/RGens/data/server-config-sample.cfg
+++ b/RGens/data/server-config-sample.cfg
@@ -1,79 +1,79 @@
 # Load 'long rules' -- Grammars with one rule with a lot of cases
-animal            animal.gram
-binary-digit      binary-digit.gram
-canada-province   canada-province.gram
-character         character.gram
-color             color.gram
-consonant-group   consonant-group.gram
-consonant         consonant.gram
-digit-noone       digit-noone.gram
-digit-nozero      digit-nozero.gram
-digit             digit.gram
-first-name-female first-name-female.gram
-first-name-male   first-name-male.gram
-hex-digit         hex-digit.gram
-last-name         last-name.gram
-last-syllable     last-syllable.gram
-letter            letter.gram
-middle-initial    middle-initial.gram
-nation            nation.gram
-natural-color     natural-color.gram
-number-word       number-word.gram
-ordinal           ordinal.gram
-planet            planet.gram
-real-city         real-city.gram
-real-company      real-company.gram
-relative          relative.gram
-roman-numeral     roman-numeral.gram
-syllable          syllable.gram
-town-name         town-name.gram
-tree              tree.gram
-vowel-group       vowel-group.gram
-vowel             vowel.gram
+animal            sample-grammars/long-data/animal.gram
+binary-digit      sample-grammars/long-data/binary-digit.gram
+canada-province   sample-grammars/long-data/canada-province.gram
+character         sample-grammars/long-data/character.gram
+color             sample-grammars/long-data/color.gram
+consonant-group   sample-grammars/long-data/consonant-group.gram
+consonant         sample-grammars/long-data/consonant.gram
+digit-noone       sample-grammars/long-data/digit-noone.gram
+digit-nozero      sample-grammars/long-data/digit-nozero.gram
+digit             sample-grammars/long-data/digit.gram
+first-name-female sample-grammars/long-data/first-name-female.gram
+first-name-male   sample-grammars/long-data/first-name-male.gram
+hex-digit         sample-grammars/long-data/hex-digit.gram
+last-name         sample-grammars/long-data/last-name.gram
+last-syllable     sample-grammars/long-data/last-syllable.gram
+letter            sample-grammars/long-data/letter.gram
+middle-initial    sample-grammars/long-data/middle-initial.gram
+nation            sample-grammars/long-data/nation.gram
+natural-color     sample-grammars/long-data/natural-color.gram
+number-word       sample-grammars/long-data/number-word.gram
+ordinal           sample-grammars/long-data/ordinal.gram
+planet            sample-grammars/long-data/planet.gram
+real-city         sample-grammars/long-data/real-city.gram
+real-company      sample-grammars/long-data/real-company.gram
+relative          sample-grammars/long-data/relative.gram
+roman-numeral     sample-grammars/long-data/roman-numeral.gram
+syllable          sample-grammars/long-data/syllable.gram
+town-name         sample-grammars/long-data/town-name.gram
+tree              sample-grammars/long-data/tree.gram
+vowel-group       sample-grammars/long-data/vowel-group.gram
+vowel             sample-grammars/long-data/vowel.gram
 
 # Load grammars
-24hr-rpg           24hr-rpg.gram
-acronym            acronym.gram
-address            address.gram
-anime              anime.gram
-art-objects        art-objects.gram
-awesome-names      awe-names.gram
-buzzword           buzzword.gram
-career             career.gram
-city               city.gram
-college            college.gram
-company            company.gram
-computer           computer.gram
-congress           congress.gram
-dates              dates.gram
-dungeon-enviroment dungeon-enviroment.gram
-fantasy-locations  fantasy-locations.gram
-fortune            fortune.gram
-genre-fiction      genre-fiction.gram
-horror             horror.gram
-insults            insults.gram
-linux              linux.gram
-martial-arts       martial-arts.gram
-mary-sue           mary-sue.gram
-media              media.gram
-mission            mission.gram
-names              names.gram
-newspaper          newspaper.gram
-numbers            numbers.gram
-ordinal            ordinal.gram
-organization       organization.gram
-part-creature      part-creature.gram
-phone-number       phone-number.gram
-pokeattacks        pokeattacks.gram
-president          president.gram
-rune               rune.gram
-school             school.gram
-slashdot           slashdot.gram
-states             states.gram
-superhero          superhero.gram
-tarotcard          tarotcard.gram
-technobabble       technobabble.gram
-theory             theory.gram
-trademark          trademark.gram
-web                web.gram
-zadrons-pouch      zadrons-pouch.gram
+24hr-rpg           sample-grammars/24hr-rpg.gram
+acronym            sample-grammars/acronym.gram
+address            sample-grammars/address.gram
+anime              sample-grammars/anime.gram
+art-objects        sample-grammars/art-objects.gram
+awesome-names      sample-grammars/awe-names.gram
+buzzword           sample-grammars/buzzword.gram
+career             sample-grammars/career.gram
+city               sample-grammars/city.gram
+college            sample-grammars/college.gram
+company            sample-grammars/company.gram
+computer           sample-grammars/computer.gram
+congress           sample-grammars/congress.gram
+dates              sample-grammars/dates.gram
+dungeon-enviroment sample-grammars/dungeon-enviroment.gram
+fantasy-locations  sample-grammars/fantasy-locations.gram
+fortune            sample-grammars/fortune.gram
+genre-fiction      sample-grammars/genre-fiction.gram
+horror             sample-grammars/horror.gram
+insults            sample-grammars/insults.gram
+linux              sample-grammars/linux.gram
+martial-arts       sample-grammars/martial-arts.gram
+mary-sue           sample-grammars/mary-sue.gram
+media              sample-grammars/media.gram
+mission            sample-grammars/mission.gram
+names              sample-grammars/names.gram
+newspaper          sample-grammars/newspaper.gram
+numbers            sample-grammars/numbers.gram
+ordinal            sample-grammars/ordinal.gram
+organization       sample-grammars/organization.gram
+part-creature      sample-grammars/part-creature.gram
+phone-number       sample-grammars/phone-number.gram
+pokeattacks        sample-grammars/pokeattacks.gram
+president          sample-grammars/president.gram
+rune               sample-grammars/rune.gram
+school             sample-grammars/school.gram
+slashdot           sample-grammars/slashdot.gram
+states             sample-grammars/states.gram
+superhero          sample-grammars/superhero.gram
+tarotcard          sample-grammars/tarotcard.gram
+technobabble       sample-grammars/technobabble.gram
+theory             sample-grammars/theory.gram
+trademark          sample-grammars/trademark.gram
+web                sample-grammars/web.gram
+zadrons-pouch      sample-grammars/zadrons-pouch.gram