From 42706485e97d5b7b320c8532ef09890302366fc0 Mon Sep 17 00:00:00 2001
From: Terence Parr <parrt@antlr.org>
Date: Thu, 29 Mar 2012 14:59:43 -0700
Subject: [PATCH] was looking for imports with .g not .g4

---
 tool/src/org/antlr/v4/tool/Grammar.java | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tool/src/org/antlr/v4/tool/Grammar.java b/tool/src/org/antlr/v4/tool/Grammar.java
index bf30b8a9d..76f0f7496 100644
--- a/tool/src/org/antlr/v4/tool/Grammar.java
+++ b/tool/src/org/antlr/v4/tool/Grammar.java
@@ -49,11 +49,24 @@ import org.antlr.v4.runtime.misc.IntSet;
 import org.antlr.v4.runtime.misc.IntervalSet;
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.misc.Nullable;
-import org.antlr.v4.tool.ast.*;
+import org.antlr.v4.tool.ast.ActionAST;
+import org.antlr.v4.tool.ast.GrammarAST;
+import org.antlr.v4.tool.ast.GrammarASTErrorNode;
+import org.antlr.v4.tool.ast.GrammarASTWithOptions;
+import org.antlr.v4.tool.ast.GrammarRootAST;
+import org.antlr.v4.tool.ast.PredAST;
+import org.antlr.v4.tool.ast.TerminalAST;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class Grammar implements AttributeResolver {
 	public static final String GRAMMAR_FROM_STRING_NAME = "<string>";
@@ -234,17 +247,18 @@ public class Grammar implements AttributeResolver {
 			}
 			GrammarAST grammarAST = null;
 			try {
-				grammarAST = tool.loadImportedGrammar(this, importedGrammarName + ".g");
+				grammarAST = tool.loadImportedGrammar(this, importedGrammarName + ".g4");
 			}
 			catch (IOException ioe) {
-				tool.errMgr.toolError(ErrorType.CANNOT_FIND_IMPORTED_FILE, ioe, importedGrammarName+".g");
+				tool.errMgr.toolError(ErrorType.CANNOT_FIND_IMPORTED_FILE, ioe,
+									  importedGrammarName+".g");
 				continue;
 			}
 			// did it come back as error node or missing?
 			if ( grammarAST==null || grammarAST instanceof GrammarASTErrorNode) return;
 			GrammarRootAST ast = (GrammarRootAST)grammarAST;
 			Grammar g = tool.createGrammar(ast);
-			File f = tool.getImportedGrammarFile(this, importedGrammarName+".g");
+			File f = tool.getImportedGrammarFile(this, importedGrammarName+".g4");
 			g.fileName = f.getAbsolutePath();
 			g.parent = this;
 			importedGrammars.add(g);