Grammar updates

General pass to update grammars to new syntax/features

5 files changed, 18 insertions, 42 deletions

diff --git a/data/sample-grammars/diablo-ii/diabloii.gram b/data/sample-grammars/diablo-ii/diabloii.gram
index 2c02b6c..2fcdf24 100755
--- a/data/sample-grammars/diablo-ii/diabloii.gram
+++ b/data/sample-grammars/diablo-ii/diabloii.gram
@@ -10,16 +10,13 @@ pragma initial-rule [base-treasures]
 
 pragma despace-rule [quote-treasure]
 
-[base-treasure] a [item]
+[base-treasure] <^3> a [item]
 	[non-item]
 
 [non-item] <^4> [money]
 	nothing
 
-pragma export-rule [non-item]
-
 [money] [diablo-amount] [money-type]
-	[diablo-amount] [metal-type] [money-type]
 
 [diablo-amount] 2
 	5
@@ -39,7 +36,7 @@ pragma export-rule [diablo-amount]
 
 [money-type] coins
 
-#pragma prefix-with [money-type] [metal-type]
+pragma prefix-with [money-type] [metal-type]
 
 [metal-type] copper
 	silver
diff --git a/data/sample-grammars/diablo-ii/diabloiiitems.gram b/data/sample-grammars/diablo-ii/diabloiiitems.gram
index 5fa174b..e638f99 100755
--- a/data/sample-grammars/diablo-ii/diabloiiitems.gram
+++ b/data/sample-grammars/diablo-ii/diabloiiitems.gram
@@ -129,6 +129,7 @@ pragma prefix-with [clubs] [club-prefix]
 
 [club-prefix] spiked
 	war
+	dire
 
 [spears] javelin
 	spear
@@ -160,12 +161,9 @@ pragma prefix-with [axes] [axe-size]
 	hand
 
 [bows]  [act-arrow] [quote-count]
-	[act-bow]
-	[act-bow]
-	[act-bow]
-	[act-bow]
+	<^4> [act-bow]
 
-[act-arrow] arrow
+[act-arrow] <^2> arrow
 	[gem-type] -tipped arrow
 
 [act-bow] bow
@@ -182,12 +180,9 @@ pragma prefix-with [act-bow] [bow-size]
 	war
 
 [crossbows] [act-bolt] [quote-count]
-	[act-crossbow]
-	[act-crossbow]
-	[act-crossbow]
-	[act-crossbow]
+	<^4> [act-crossbow]
 
-[act-bolt] bolt
+[act-bolt] <^2>  bolt
 	[gem-type] -tipped bolt
 
 [act-crossbow] crossbow
@@ -213,8 +208,7 @@ pragma prefix-with [wands] [wand-type]
 
 [staves] staff
 
-pragma prefix-with [staves] [staff-type]
-pragma prefix-with [staves] [tree]
+pragma prefix-with [staves] [staff-type] [tree]
 pragma prefix-with [staves] [staff-length]
 
 [staff-type] gnarled
@@ -223,6 +217,7 @@ pragma prefix-with [staves] [staff-length]
 	war
 
 [staff-length] short
+	full
 	long
 
 [accessories] charm
@@ -233,8 +228,7 @@ pragma prefix-with [staves] [staff-length]
 
 [gems] [gem-type]
 
-pragma prefix-with [gems] [gem-size]
-pragma prefix-with [gems] [gem-quality]
+pragma prefix-with [gems] [gem-size] [gem-quality]
 
 [gem-quality] chipped
 	      flawed
@@ -258,5 +252,3 @@ pragma prefix-with [gems] [gem-quality]
 	       book
 
 [quote-count] ( [diablo-amount] count )
-
-pragma despace-rule [quote-count]
diff --git a/data/sample-grammars/diablo-ii/diabloiiperish.gram b/data/sample-grammars/diablo-ii/diabloiiperish.gram
index af6c9ec..9338b9c 100755
--- a/data/sample-grammars/diablo-ii/diabloiiperish.gram
+++ b/data/sample-grammars/diablo-ii/diabloiiperish.gram
@@ -39,10 +39,7 @@ pragma prefix-with [perishable-type] [bodypart]
 	medium
 	full
 
-[perishable-effect] [perishable-effect-1]
-	[perishable-effect-1]
-	[perishable-effect-1]
-	[perishable-effect-1]
+[perishable-effect] <^4> [perishable-effect-1]
 	[perishable-degree] [perishable-effect-1]
 
 [perishable-effect-1] [restore-effect]
diff --git a/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
index 5157115..1a62829 100755
--- a/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
+++ b/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
@@ -1,15 +1,10 @@
-[d2-prefix] [d2-prefix-part]
-	[d2-prefix-part]
-	[d2-prefix-chain]
+[d2-prefix] <^4> [d2-prefix-part]
+	<^2> [d2-prefix-part] [d2-prefix-part]
+	<^2> [d2-prefix-part] and [d2-prefix-part]
+	[d2-prefix-part] [d2-prefix-part] [d2-prefix-part]
 
 pragma export-rule [d2-prefix]
 
-[d2-prefix-chain] [d2-prefix-part] [d2-prefix-part]
-	[d2-prefix-part] [d2-prefix-part]
-	[d2-prefix-part] and [d2-prefix-part]
-	[d2-prefix-part] and [d2-prefix-part]
-	[d2-prefix-part] [d2-prefix-part] [d2-prefix-part]
-
 [d2-prefix-part] [armor-class]
 	[saving-throw]
 	[foe-reaction]
diff --git a/data/sample-grammars/diablo-ii/diabloiisuffixes.gram b/data/sample-grammars/diablo-ii/diabloiisuffixes.gram
index f6deea0..7915f9d 100755
--- a/data/sample-grammars/diablo-ii/diabloiisuffixes.gram
+++ b/data/sample-grammars/diablo-ii/diabloiisuffixes.gram
@@ -1,11 +1,6 @@
-[d2-suffix] of [suffix-part]
-	of [suffix-part]
-	of [suffix-chain]
-
-[suffix-chain] [suffix-part] and [suffix-part]
-	[suffix-part] and [suffix-part]
-	[suffix-part] and of [suffix-part]
-	[suffix-part] and of [suffix-part]
+[d2-suffix] <^4> of [suffix-part]
+	<^2> [suffix-part] and [suffix-part]
+	<^2> [suffix-part] and of [suffix-part]
 	[suffix-part] , [suffix-part] and [suffix-part]
 
 pragma export-rule [d2-suffix]