Grammar update

Update grammar for new features/syntax

1 files changed, 27 insertions, 35 deletions

diff --git a/data/sample-grammars/superhero.gram b/data/sample-grammars/superhero.gram
index cdb609f..c463821 100755
--- a/data/sample-grammars/superhero.gram
+++ b/data/sample-grammars/superhero.gram
@@ -5,14 +5,9 @@ pragma initial-rule [superhero-desc]
 [superhero-postfix] [superhero-ally]
 	[superhero-enemy]
 
-pragma suffix-with [superhero-desc] [superhero-postfix]
-pragma suffix-with [superhero-desc] [superhero-postfix]
-pragma suffix-with [superhero-desc] [superhero-postfix]
-
+pragma suffix-with [superhero-desc] <&1..3> [superhero-postfix]
 pragma suffix-with [superhero-desc] [superhero-secret]
-
-pragma suffix-with [superhero-desc] [superhero-org]
-pragma suffix-with [superhero-desc] [superhero-org]
+pragma suffix-with [superhero-desc] <&1..2> [superhero-org]
 
 [superhero-ally] (ally of [superhero-name] )
 	(secret ally of [superhero-name] )
@@ -37,15 +32,15 @@ pragma suffix-with [superhero-desc] [superhero-org]
 	(second in command of the [organization] )
 	( [generic-title] of the [organization] )
 
-[superhero-name] [first-part] [second-part]
-	[second-part] [first-part]
-
-pragma export-rule [superhero-name]
+[superhero-name] {empty}
 
+pragma prefix-with [superhero-name] [first-part] [second-part]
 pragma suffix-with [superhero-name] [third-part]
+pragma prefix-with [superhero-name] [third-part2]
 pragma suffix-with [superhero-name] [fourth-part]
 pragma suffix-with [superhero-name] [fifth-part]
-pragma prefix-with [superhero-name] [third-part2]
+
+pragma export-rule [superhero-name]
 
 [fifth-part] and the [third-part2]
 	and [third-part2]
@@ -123,8 +118,7 @@ pragma suffix-with [fifth-part] [fourth-part]
 	Torch
 	Magus
 	Wizard
-	[second-class]
-	[second-class]
+	<^2> [second-class]
 
 [second-class] Rider
 	Caster
@@ -137,6 +131,11 @@ pragma suffix-with [fifth-part] [fourth-part]
 	Ruler
 	Shielder
 	Avenger
+	Foreigner
+	Alter Ego
+	Moon Cancer
+
+pragma prefix-with [second-class] Grand
 
 [third-part] ,The [third-part2]
 
@@ -219,8 +218,7 @@ pragma suffix-with [third-part] [fifth-part]
 	Deadly
 	Flaming
 	Thunderer
-	[major-arcana]
-	[major-arcana]
+	<^2> [major-arcana]
 	Cardinal
 	Bishop
 	Archbishop
@@ -231,14 +229,12 @@ pragma suffix-with [third-part] [fifth-part]
 	Motherly
 	Sinister
 	Embodiment
-	[generic-title]
-	[generic-title]
+	<^2> [generic-title]
 
 [fourth-part] of [fourth-part-act]
 
 [fourth-part-act] the [fourth-part-the]
-	[harrowed-many-things]
-	[harrowed-many-things]
+	<^2> [harrowed-many-things]
 	Hope
 	Destiny
 	Justice
@@ -249,10 +245,8 @@ pragma suffix-with [third-part] [fifth-part]
 	Knowledge
 	Earth
 	Eternal Fire
-	[planet]
-	[planet]
-	[second-part]
-	[second-part]
+	<^2> [planet]
+	<^2> [second-part]
 
 [planet] Earth
 	Mars
@@ -282,12 +276,9 @@ pragma suffix-with [third-part] [fifth-part]
 	Ancients
 	Archive
 	Moon
-	[generic-title]
-	[generic-title]
-	[exalt-type]
-	[exalt-type]
-	[arcana]
-	[arcana]
+	<^2> [generic-title]
+	<^2> [exalt-type]
+	<^2> [arcana]
 
 [exalt-type] Dawn
 	Zenith
@@ -295,10 +286,11 @@ pragma suffix-with [third-part] [fifth-part]
 	Night
 	Eclipse
 
-[arcana] [tarot-card]
-	Arcana
+[arcana] [%tarot-card|%alt-tarot-card]
 	Minor Arcana
 	Major Arcana
-	[ordinal-roman] Arcana
-	[ordinal-number] Arcana
-	[ordinal] Arcana
+	<^3> [ordinal-arcana]
+
+[ordinal-arcana] {empty}
+
+pragma prefix-with [ordinal-arcana] Arcana [%ordinal|%ordinal-roman|%ordinal-number]