Grammar update

Update grammar for new features/syntax

1 files changed, 253 insertions, 261 deletions

diff --git a/data/sample-grammars/names.gram b/data/sample-grammars/names.gram
index 104c136..a0c41c3 100755
--- a/data/sample-grammars/names.gram
+++ b/data/sample-grammars/names.gram
@@ -30,17 +30,11 @@ pragma export-rule [random-name]
 	[female-title] [first-name-female] [middle-initial] . [last-name]
 	[gender-neutral-title] [full-name]
 	[generic-title] [full-name]
-	[full-name]
-	[full-name]
-	[full-name]
-	[full-name]
+	<^4> [full-name]
 
-[generic-title] [male-title]
-	[female-title]
-	[gender-neutral-title]
-	[male-title]
-	[female-title]
-	[gender-neutral-title]
+[generic-title] <^2> [male-title]
+	<^2> [female-title]
+	<^2> [gender-neutral-title]
 	[career-tech]
 
 # @TODO 10/23/17 Ben Culkin :TitleExpansion
@@ -54,52 +48,52 @@ pragma export-rule [random-name]
 	Uncle
 	Lord Mayor
 	Prince
-	archduke
-	grand duke
-	duke
-	marquis
-	marquess
-	count
-	earl
-	jarl
-	viscount
-	baron
-	lord
-	emperor
-	king
-	tsar
-	imperator
-	viceroy
-	pope
-	abbot
-	brother
-	friar
-	bishop
-	archbishob
-	priest
-	high priest
-	father
-	patriarch
-	vicar
-	chaplain
-	pastor
-	cardinal
-	monsieur
-	herr
-	senor
-	signor
-	emir
-	sultan
-	maharajah
-	lord protector
-	king-emperor
-	rex
-	lord of the manor
-	high king
-	crown prince
-	grand prince
-	praetor
-	headmaster
+	Archduke
+	Grand Duke
+	Duke
+	Marquis
+	Marquess
+	Count
+	Earl
+	Jarl
+	Viscount
+	Baron
+	Lord
+	Emperor
+	King
+	Tsar
+	Imperator
+	Viceroy
+	Pope
+	Abbot
+	Brother
+	Friar
+	Bishop
+	Archbishob
+	Priest
+	High Priest
+	Father
+	Patriarch
+	Vicar
+	Chaplain
+	Pastor
+	Cardinal
+	Monsieur
+	Herr
+	Senor
+	Signor
+	Emir
+	Sultan
+	Maharajah
+	Lord Protector
+	King-Emperor
+	Rex
+	Lord Of The Manor
+	High King
+	Crown Prince
+	Grand Prince
+	Praetor
+	Headmaster
 
 [female-title] Ms.
 	Mrs.
@@ -107,51 +101,51 @@ pragma export-rule [random-name]
 	Mistress
 	Aunt
 	Lady Mayoress
-	princess
-	arch duchess
-	grand duchess
-	duchess
-	marquise
-	marchioness
-	countess
-	viscountess
-	baroness
-	lady
-	empress
-	queen
-	tsarina
-	imperatrix
-	rex
-	vicerine
-	popess
-	dame
-	abbess
-	sister
-	mother superior
-	mother
-	reverend mother
-	priestess
-	high priestess
-	matriarch
-	madame
-	mademoiselle
-	frau
-	fraulein
-	senora
-	senorita
-	signora
-	signorina
-	emira
-	sultana
-	maharani
-	lady protectoress
-	queen-empress
-	regina
-	lady of the manor
-	high queen
-	crown princess
-	grand princess
-	headmistress
+	Princess
+	Arch Duchess
+	Grand Duchess
+	Duchess
+	Marquise
+	Marchioness
+	Countess
+	Viscountess
+	Baroness
+	Lady
+	Empress
+	Queen
+	Tsarina
+	Imperatrix
+	Rex
+	Vicerine
+	Popess
+	Dame
+	Abbess
+	Sister
+	Mother Superior
+	Mother
+	Reverend Mother
+	Priestess
+	High Priestess
+	Matriarch
+	Madame
+	Mademoiselle
+	Frau
+	Fraulein
+	Senora
+	Senorita
+	Signora
+	Signorina
+	Emira
+	Sultana
+	Maharani
+	Lady Protectoress
+	Queen-Empress
+	Regina
+	Lady Of The Manor
+	High Queen
+	Crown Princess
+	Grand Princess
+	Headmistress
 
 [gender-neutral-title] Dr.
 	Professor
@@ -172,188 +166,186 @@ pragma export-rule [random-name]
 	[ambassador]
 	[envoy]
 	[secretary]
-	attache
-	attache ( to [full-name-and-title] )
-	provost
-	chevalier
+	Attache
+	Attache ( to [full-name-and-title] )
+	Provost
+	Chevalier
 	[judicial-title]
 	[religious-title]
 	[military-title]
-	coach
-	wizard
-	grand wizard
-	imperial wizard
-	principal
-	comrade
-	docent
-	lama
-	druid
-	archdruid
-	rabbi
-	ayatollah
-	bodhisattva
-	saoshyant
-	sheikh
-	archon
-	legate
-	satrap
-	consul
-	doge
-	pharaoh
-	caliph
-	khagan
-	khan
-	shah
-	shogun
-	despot
-	kaiser
-	don
-	comissioner
-	comptroller
-	courtier
+	Coach
+	Wizard
+	Grand Wizard
+	Imperial Wizard
+	Principal
+	Comrade
+	Docent
+	Lama
+	Druid
+	Archdruid
+	Rabbi
+	Ayatollah
+	Bodhisattva
+	Saoshyant
+	Sheikh
+	Archon
+	Legate
+	Satrap
+	Consul
+	Doge
+	Pharaoh
+	Caliph
+	Khagan
+	Khan
+	Shah
+	Shogun
+	Despot
+	Kaiser
+	Don
+	Comissioner
+	Comptroller
+	Courtier
 	courtier (to [full-name-and-title] )
-	curator
-	intendant
-	superindentent
-	sheriff
-	treasurer
-	warden
-	lord warden
-	apprentice
+	Curator
+	Intendant
+	Superindentent
+	Sheriff
+	Treasurer
+	Warden
+	Lord Warden
+	Apprentice
 	apprentice (to a [generic-title] )
 	apprentice (to [full-name-and-title] )
-	journeyman
-	adept
-	centurion
-	daimyo
-	elector
-	inquisitor
-	grand inquisitor
-	pontiff
-	knight
-	squire
+	Journeyman
+	Adept
+	Centurion
+	Daimyo
+	Elector
+	Inquisitor
+	Grand Inquisitor
+	Pontiff
+	Knight
+	Squire
 	squire (to [full-name-and-title] )
 
-[military-title] admiral
-	grand admiral
-	lord high admiral
-	rear admiral
-	vice admiral
-	brigadier
-	captain
-	group captain
-	colonel
-	lieutenant colonel
-	commander
-	commander-in-chief
-	lieutenant commander
-	wing commander
-	commodore
-	air commodore
-	corporal
-	lance corporal
-	staff corporal
-	general
-	first lieutenant
-	flight lieutenant
-	major
-	marshal
-	air marshal
-	field marshal
-	mate
-	chief mate
-	first mate
+[military-title] mdmiral
+	Grand Admiral
+	Lord High Admiral
+	Rear Admiral
+	Vice Admiral
+	Brigadier
+	Captain
+	Group Captain
+	Colonel
+	Lieutenant Colonel
+	Commander
+	Commander-In-Chief
+	Lieutenant Commander
+	Wing Commander
+	Commodore
+	Air Commodore
+	Corporal
+	Lance Corporal
+	Staff Corporal
+	General
+	First Lieutenant
+	Flight Lieutenant
+	Major
+	Marshal
+	Air Marshal
+	Field Marshal
+	Mate
+	Chief Mate
+	First Mate
 	[officer]
-	private
-	sergeant
-	sergeant at arms
-	brigadier general
-	cadet
-	ensign
+	Private
+	Sergeant
+	Sergeant At Arms
+	Brigadier General
+	Cadet
+	Ensign
 
-[officer] officer
-	chief academic officer
-	chief executive officer
-	chief information officer
-	chief operating officer
-	field officer
-	first officer
-	flag officer
-	warrant officer
-	petty officer
-	police officer
-	political officer
-	senior officer
-	staff officer
-	police officer
-	constable
-	agent
+[officer] Officer
+	Chief Academic Officer
+	Chief Executive Officer
+	Chief Information Officer
+	Chief Operating Officer
+	Field Officer
+	First Officer
+	Flag Officer
+	Warrant Officer
+	Petty Officer
+	Police Officer
+	Political Officer
+	Senior Officer
+	Staff Officer
+	Police Officer
+	Constable
+	Agent
 
-[religious-title] venerable
-	blessed
+[religious-title] Venerable
+	Blessed
 	Saint
 	St.
-	decon
-	archdeacon
-	acolyte
-	dean
-	elder
-	minister
-	monsignor
-	reader
-	almoner
+	Decon
+	Archdeacon
+	Acolyte
+	Dean
+	Elder
+	Minister
+	Monsignor
+	Reader
+	Almoner
 
-[judicial-title] advocate
-	attorney
-	attorney general
-	bailiff
-	chancellor
-	judge
-	justice
-	lord chief justice
-	justice of the peace
-	magistrate
-	solicitor
+[judicial-title] Advocate
+	Attorney
+	Attorney General
+	Bailiff
+	Chancellor
+	Judge
+	Justice
+	Lord Chief Justice
+	Justice Of The Peace
+	Magistrate
+	Solicitor
 
-[president] president
-	deputy president
-	vice president
-	executive vice president
-	lord president of the council
+[president] President
+	Deputy President
+	Vice President
+	Executive Vice President
+	Lord President Of The Council
 
-[ambassador] ambassador
-	ambassador (to [nation] )
+[ambassador] Ambassador
+	Ambassador (to [nation] )
 
-[envoy] envoy
-	envoy (to [nation] )
-	envoy (to the [generic-title] )
+[envoy] Envoy
+	Envoy (to [nation] )
+	Envoy (to the [generic-title] )
 	envoy (to [full-name-and-title] )
-	special envoy
-	special envoy (to [nation] )
-	special envoy (to the [generic-title] )
-	special envoy (to [full-name-and-title] )
+	Special Envoy
+	Special Envoy (to [nation] )
+	Special Envoy (to the [generic-title] )
+	Special Envoy (to [full-name-and-title] )
 
-[secretary] secretary
-	secretary (to [full-name-and-title] )
-	secretary (to the [generic-title] )
-	under-secretary
-	under-secretary (to [full-name-and-title] )
-	under-secretary (to the [generic-title] )
-	foreign secretary
-	general secretary
-	secretary of state
+[secretary] Secretary
+	Secretary (to [full-name-and-title] )
+	Secretary (to the [generic-title] )
+	Under-Secretary
+	Under-Secretary (to [full-name-and-title] )
+	Under-Secretary (to the [generic-title] )
+	Foreign Secretary
+	General Secretary
+	Secretary Of State
 
 pragma suffix-with [full-name-and-title] [title-generation]
-pragma suffix-with [full-name-and-title] [title-suffix]
-pragma suffix-with [full-name-and-title] [title-suffix]
-pragma suffix-with [full-name-and-title] [title-suffix]
+pragma suffix-with [full-name-and-title] <&1..3> [title-suffix]
 
 [title-generation] Sr.
 	Jr.
 	[roman-numeral]
-	the [roman-numeral]
-	the [ordinal]
-	the [ordinal-number]
+	The [roman-numeral]
+	The [ordinal]
+	The [ordinal-number]
 
 [title-trailer] CPA
 	Ph.D
@@ -423,9 +415,9 @@ pragma suffix-with [full-name-and-title] [title-suffix]
 
 [random-name] [actual+random-name]
 
-[actual+random-name] [syllable] [syllable]
-	[syllable] [syllable] [last-syllable]
+[actual+random-name] <&1..3> [syllable]
+	<&1..3> [syllable] [last-syllable]
 	[syllable] [vowel] [consonant-group] [vowel]
 	[consonant-group] [vowel] [syllable]
-	[vowel] [syllable] [syllable]
+	[vowel] <&1..3> [syllable]
 	[syllable] [vowel-group] [consonant]