Merge branch 'working'

1 files changed, 73 insertions, 0 deletions

diff --git a/data/sample-grammars/diablo-ii/diabloii.gram b/data/sample-grammars/diablo-ii/diabloii.gram
new file mode 100755
index 0000000..edfe3b4
--- /dev/null
+++ b/data/sample-grammars/diablo-ii/diabloii.gram
@@ -0,0 +1,73 @@
+[base-treasures] [base-treasure]
+	[quote-treasure] as well as [quote-treasure]
+	[quote-treasure] or [quote-treasure]
+	[quote-treasure] , and [quote-treasure] as well as [quote-treasure]
+	[quote-treasure] , [quote-treasure] or [quote-treasure]
+
+pragma initial-rule [base-treasures]
+
+[quote-treasure] ( [base-treasure] )
+
+pragma despace-rule [quote-treasure]
+
+[base-treasure] a [item]
+	a [item]
+	a [item]
+	[non-item]
+
+[non-item] [money]
+	[money]
+	[money]
+	[money]
+	nothing
+
+[money] [diablo-amount] [money-type]
+
+[diablo-amount] 1
+	5
+	10
+	20
+	50
+	100
+	200
+	500
+	1000
+
+pragma export-rule [diablo-amount]
+
+[money-type] coins
+
+pragma prefix-with [money-type] [metal-type]
+
+[metal-type] copper
+	silver
+	gold
+	platinum
+
+<<<<<<< HEAD
+[item] [item-types]
+	[item-types]
+	[item-types]
+	[item-types]
+	[item-types] [d2-suffix]
+	[item-types] [d2-suffix]
+	[d2-prefix] [item-types]
+	[d2-prefix] [item-types]
+	[d2-prefix] [item-types] [d2-suffix]
+
+[item-types] [d2-item-type]
+	[d2-item-type]
+	[ds-items]
+	[^item]
+
+[ds-items] [ds-gem]
+	[ds-rune]
+	[ds-armor]
+=======
+[item] [d2-item-type]
+	[d2-item-type] of [suffix]
+	[d2-item-type] of [suffix] and [suffix]
+
+pragma prefix-with [item] [prefix]
+pragma prefix-with [item] [prefix]
+>>>>>>> 66f5a43dee94657a56141c093488eccbf64c7ae1