cleared up the way grammars can be created. Now all we need is for so…

…meone to initialize them in an orderly way.

bench/com/redcareditor/mate/GrammarBenchmark.java

@@ -28,8 +28,7 @@ public void setupForAll() {
 		singlePatterns = new ArrayList<SinglePattern>();
 		readFile();
 
-		Dict d = Dict.parseFile("input/Ruby.plist");
-		grammar = new Grammar(d);
+		grammar = new Grammar("input/Ruby.plist");
 		grammar.initForUse();
 
 		for (Pattern p : grammar.allPatterns) {

src/com/redcareditor/mate/Bundle.java

@@ -75,7 +75,7 @@ private static void loadGrammar(Bundle bundle, File syntaxDir) {
 		for (String grammarFileName : syntaxDir.list()) {
 			if (isTmBundlefile(grammarFileName)) {
 				String grammarFilePath = syntaxDir.getPath() + "/" + grammarFileName;
-				Grammar grammar = new Grammar(grammarFileName, grammarFilePath);
+				Grammar grammar = new Grammar(grammarFilePath);
 				bundle.getGrammars().add(grammar);
 			}
 		}

src/com/redcareditor/mate/Grammar.java

@@ -31,14 +31,10 @@ public class Grammar {
 	/* these are here for lookup speed purposes */
 	private static Map<String, Grammar> grammarsByScopeNames = new HashMap<String, Grammar>();
 
-	public Grammar(String name, String plistFile){
-		this(Dict.parseFile(plistFile));
-		this.name = name;
-	}
-
-	public Grammar(Dict plist) {
+	public Grammar(String plistFile){
+		this.plist = Dict.parseFile(plistFile);
 		propertyLoader = new PlistPropertyLoader(plist, this);
-		this.plist = plist;
+		initForReference();
 	}
 
 	public void initForReference() {

test/com/redcareditor/mate/GrammarTest.java

@@ -15,8 +15,7 @@ public class GrammarTest {
 
 	@Before
 	public void setUp() {
-		ruby = Dict.parseFile("input/Bundles/Apache.tmbundle/Syntaxes/Apache.plist");
-		g = new Grammar(ruby);
+		g = new Grammar("input/Bundles/Apache.tmbundle/Syntaxes/Apache.plist");
 		g.initForUse();
 	}