Change parser token syntax

Parser meta-tokens now use <...> syntax instead of {...} so as not to
get them confused with reference tokens.

6 files changed, 20 insertions, 25 deletions

diff --git a/data/misc/700000items.gram b/data/misc/700000items.gram
index 950bbb2..ae4f2ae 100755
--- a/data/misc/700000items.gram
+++ b/data/misc/700000items.gram
@@ -1,7 +1,7 @@
 [item-name] [noun]
 
 pragma prefix-with [item-name] [post]
-pragma prefix-with [item-name] [adj] [adj]
+pragma prefix-with [item-name] <&1..2> [adj]
 pragma prefix-with [item-name] [pre]
 
 pragma suffix-with [item-name] [end]
diff --git a/data/misc/nimble.gram b/data/misc/nimble.gram
index 52a520a..0408011 100755
--- a/data/misc/nimble.gram
+++ b/data/misc/nimble.gram
@@ -1,5 +1,5 @@
-[bimble] {^4} bimble
-	{^4} nimble
+[bimble] <^4> bimble
+	<^4> nimble
 	dindle
 	symbol
 	frindle
diff --git a/data/new-sample-grammars/cbs.gram b/data/new-sample-grammars/cbs.gram
index fa70a40..dd3e76d 100755
--- a/data/new-sample-grammars/cbs.gram
+++ b/data/new-sample-grammars/cbs.gram
@@ -1375,7 +1375,7 @@ pragma export-rule [proposition]
 	going forward, [proposition]
 	actually, [proposition]
 
-[articulate-proposition] {^8} [proposition]
+[articulate-proposition] <^8> [proposition]
 	[articulate-proposition-1]
 
 pragma export-rule [articulate-proposition]
@@ -1384,9 +1384,9 @@ pragma export-rule [articulate-proposition]
 
 pragma export-rule [sentence]
 
-[sentences] {^2} {&1..4} [sentence]
-	{^4} {&4..8} [sentence]
-	{&8..12} [sentence]
+[sentences] <^2> <&1..4> [sentence]
+	<^4> <&4..8> [sentence]
+	<&8..12> [sentence]
 
 pragma export-rule [sentences]
 pragma initial-rule [sentences]
diff --git a/data/new-sample-grammars/drakensang/armor.gram b/data/new-sample-grammars/drakensang/armor.gram
index d559761..090b69d 100644
--- a/data/new-sample-grammars/drakensang/armor.gram
+++ b/data/new-sample-grammars/drakensang/armor.gram
@@ -5,9 +5,7 @@
 pragma initial-rule [ds-armor]
 
 [dragonknight-armor] [dragonknight-armortype]
-	[dragonknight-armorprefix] [dragonknight-armortype]
-	[dragonknight-armorprefix] [dragonknight-armortype]
-	[dragonknight-armorprefix] [dragonknight-armortype]
+	<^3> [dragonknight-armorprefix] [dragonknight-armortype]
 
 [dragonknight-armortype] jackboots
 	cloak
@@ -41,9 +39,7 @@ pragma initial-rule [ds-armor]
 	obsidian steel
 
 [ranger-armor] [ranger-armortype]
-	[ranger-armorprefix] [ranger-armortype]
-	[ranger-armorprefix] [ranger-armortype]
-	[ranger-armorprefix] [ranger-armortype]
+	<^3> [ranger-armorprefix] [ranger-armortype]
 
 [ranger-armortype] shoes
 	shirt
@@ -76,8 +72,9 @@ pragma initial-rule [ds-armor]
 
 pragma prefix-with [ranger-armorprefix] [ranger-armorprefix-prefix]
 
-[ranger-armorprefix-combo] [ranger-armormaterial] [ranger-armorprefix-1]
-	[ranger-armorprefix-1] [ranger-armormaterial]
+[ranger-armorprefix-combo] {empty} 
+
+pragma prefix-with [ranger-armorprefix-combo] [ranger-armormaterial] [ranger-armorprefix-1]
 
 [ranger-armorprefix-1] stalkers
 	hunters
@@ -102,9 +99,7 @@ pragma prefix-with [ranger-armorprefix] [ranger-armorprefix-prefix]
 	sunleather
 
 [spellweaver-armor] [spellweaver-armortype]
-	[spellweaver-armorprefix] [spellweaver-armortype]
-	[spellweaver-armorprefix] [spellweaver-armortype]
-	[spellweaver-armorprefix] [spellweaver-armortype]
+	<^3> [spellweaver-armorprefix] [spellweaver-armortype]
 
 [spellweaver-armortype] cloak
 	gloves
diff --git a/data/sample-grammars/career.gram b/data/sample-grammars/career.gram
index 556ba6f..92df2bb 100755
--- a/data/sample-grammars/career.gram
+++ b/data/sample-grammars/career.gram
@@ -4,7 +4,7 @@ pragma initial-rule [career-tech-desc]
 
 pragma prefix-with [career-tech-desc] [career-tech-desc-pref]
 
-pragma suffix-with [career-tech-desc] {&1..2} [career-tech-descsuff]
+pragma suffix-with [career-tech-desc] <&1..2> [career-tech-descsuff]
 
 [career-tech-desc-pref] [career-prefsuf] of the
 
@@ -20,7 +20,7 @@ pragma suffix-with [career-tech-desc] {&1..2} [career-tech-descsuff]
 
 pragma export-rule [career-techname]
 
-[career-tech] {^6} [career-tech2]
+[career-tech] <^6> [career-tech2]
 	[quote-career-tech] and [quote-career-tech]
 	[quote-career-tech] , [quote-career-tech] and [quote-career-tech]
 
@@ -32,9 +32,9 @@ pragma export-rule [career-tech]
 
 pragma despace-rule [quote-career-tech]
 
-[career-tech2] {^10} [act-career-tech]
+[career-tech2] <^10> [act-career-tech]
 	[act-career-tech] (reports to the [career-tech] )
-	{^2} [act-career-tech] (reports to [full-name-and-title] )
+	<^2> [act-career-tech] (reports to [full-name-and-title] )
 
 [act-career-tech] paper pusher
 	computer [software-career-type]
diff --git a/src/main/java/bjc/rgens/parser/RGrammarParser.java b/src/main/java/bjc/rgens/parser/RGrammarParser.java
index 463f2ac..7085f06 100755
--- a/src/main/java/bjc/rgens/parser/RGrammarParser.java
+++ b/src/main/java/bjc/rgens/parser/RGrammarParser.java
@@ -435,12 +435,12 @@ public class RGrammarParser {
 			if (partToAdd.equals("")) {
 				/* Ignore empty parts */
 				continue;
-			} else if(partToAdd.matches("\\{\\^\\d+\\}")) {
+			} else if(partToAdd.matches("\\<\\^\\d+\\>")) {
 				/* Set case weights */
 				weight = Integer.parseInt(partToAdd.substring(2, partToAdd.length() - 1));
-			} else if(partToAdd.matches("\\{&\\d+\\}")) {
+			} else if(partToAdd.matches("\\<&\\d+\\>")) {
 				repCount = Integer.parseInt(partToAdd.substring(2, partToAdd.length() - 1));
-			} else if(partToAdd.matches("\\{&\\d+\\.\\.\\d+\\}")) {
+			} else if(partToAdd.matches("\\<&\\d+\\.\\.\\d+\\>")) {
 				serialLower = Integer.parseInt(partToAdd.substring(2, partToAdd.indexOf(".")));
 				serialUpper = Integer.parseInt(partToAdd.substring(partToAdd.lastIndexOf(".") + 1, partToAdd.length() - 1));