From 67b2e6d7c1d86507c829813a6aa7486fc0d58f3d Mon Sep 17 00:00:00 2001
From: Terence Parr <parrt@antlr.org>
Date: Sun, 26 Feb 2012 21:55:23 -0800
Subject: [PATCH] forgot to move Pair etc...

---
 .../src/org/antlr/v4/runtime/misc/MultiMap.java   |  2 --
 .../Java/src/org/antlr/v4/runtime}/misc/Pair.java |  2 +-
 .../src/org/antlr/v4/runtime}/misc/Triple.java    |  2 +-
 .../v4/analysis/LeftRecursiveRuleAnalyzer.java    |  2 +-
 .../v4/analysis/LeftRecursiveRuleTransformer.java |  2 +-
 .../codegen/model/LeftRecursiveRuleFunction.java  |  2 +-
 .../org/antlr/v4/codegen/model/ListenerFile.java  | 12 ++++++++----
 .../antlr/v4/codegen/model/ParseListenerFile.java | 13 +++++++++----
 .../org/antlr/v4/codegen/model/RuleFunction.java  |  2 +-
 .../org/antlr/v4/codegen/model/VisitorFile.java   | 12 ++++++++----
 tool/src/org/antlr/v4/tool/LeftRecursiveRule.java |  4 ++--
 tool/src/org/antlr/v4/tool/Rule.java              | 15 ++++++++++++---
 12 files changed, 45 insertions(+), 25 deletions(-)
 rename {tool/src/org/antlr/v4 => runtime/Java/src/org/antlr/v4/runtime}/misc/Pair.java (76%)
 rename {tool/src/org/antlr/v4 => runtime/Java/src/org/antlr/v4/runtime}/misc/Triple.java (78%)

diff --git a/runtime/Java/src/org/antlr/v4/runtime/misc/MultiMap.java b/runtime/Java/src/org/antlr/v4/runtime/misc/MultiMap.java
index cb6d6e8fe..53480b51a 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/misc/MultiMap.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/misc/MultiMap.java
@@ -29,8 +29,6 @@
 
 package org.antlr.v4.runtime.misc;
 
-import com.sun.tools.javac.util.Pair;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/tool/src/org/antlr/v4/misc/Pair.java b/runtime/Java/src/org/antlr/v4/runtime/misc/Pair.java
similarity index 76%
rename from tool/src/org/antlr/v4/misc/Pair.java
rename to runtime/Java/src/org/antlr/v4/runtime/misc/Pair.java
index 542c5b40e..cda1c2600 100644
--- a/tool/src/org/antlr/v4/misc/Pair.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/misc/Pair.java
@@ -1,4 +1,4 @@
-package org.antlr.v4.misc;
+package org.antlr.v4.runtime.misc;
 
 public class Pair<A,B> {
 	public A a;
diff --git a/tool/src/org/antlr/v4/misc/Triple.java b/runtime/Java/src/org/antlr/v4/runtime/misc/Triple.java
similarity index 78%
rename from tool/src/org/antlr/v4/misc/Triple.java
rename to runtime/Java/src/org/antlr/v4/runtime/misc/Triple.java
index d4d4b8671..dd3c0cc64 100644
--- a/tool/src/org/antlr/v4/misc/Triple.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/misc/Triple.java
@@ -1,4 +1,4 @@
-package org.antlr.v4.misc;
+package org.antlr.v4.runtime.misc;
 
 public class Triple<A,B,C> extends Pair<A,B> {
 	public C c;
diff --git a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java
index 170d01379..bd1ad31aa 100644
--- a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java
+++ b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java
@@ -35,9 +35,9 @@ import org.antlr.runtime.tree.CommonTreeNodeStream;
 import org.antlr.runtime.tree.Tree;
 import org.antlr.v4.Tool;
 import org.antlr.v4.codegen.CodeGenerator;
-import org.antlr.v4.misc.Pair;
 import org.antlr.v4.parse.GrammarASTAdaptor;
 import org.antlr.v4.parse.LeftRecursiveRuleWalker;
+import org.antlr.v4.runtime.misc.Pair;
 import org.antlr.v4.tool.ErrorType;
 import org.antlr.v4.tool.ast.AltAST;
 import org.antlr.v4.tool.ast.GrammarAST;
diff --git a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java
index bec0d424e..fd70c683e 100644
--- a/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java
+++ b/tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java
@@ -37,12 +37,12 @@ import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.TokenStream;
 import org.antlr.v4.Tool;
 import org.antlr.v4.misc.OrderedHashMap;
-import org.antlr.v4.misc.Pair;
 import org.antlr.v4.parse.ANTLRLexer;
 import org.antlr.v4.parse.ANTLRParser;
 import org.antlr.v4.parse.GrammarASTAdaptor;
 import org.antlr.v4.parse.ScopeParser;
 import org.antlr.v4.parse.ToolANTLRParser;
+import org.antlr.v4.runtime.misc.Pair;
 import org.antlr.v4.tool.AttributeDict;
 import org.antlr.v4.tool.ErrorType;
 import org.antlr.v4.tool.Grammar;
diff --git a/tool/src/org/antlr/v4/codegen/model/LeftRecursiveRuleFunction.java b/tool/src/org/antlr/v4/codegen/model/LeftRecursiveRuleFunction.java
index 318970f17..ea6917171 100644
--- a/tool/src/org/antlr/v4/codegen/model/LeftRecursiveRuleFunction.java
+++ b/tool/src/org/antlr/v4/codegen/model/LeftRecursiveRuleFunction.java
@@ -33,8 +33,8 @@ import org.antlr.v4.codegen.CodeGenerator;
 import org.antlr.v4.codegen.OutputModelFactory;
 import org.antlr.v4.codegen.model.decl.RuleContextDecl;
 import org.antlr.v4.codegen.model.decl.StructDecl;
-import org.antlr.v4.misc.Pair;
 import org.antlr.v4.parse.ANTLRParser;
+import org.antlr.v4.runtime.misc.Pair;
 import org.antlr.v4.tool.LeftRecursiveRule;
 import org.antlr.v4.tool.Rule;
 import org.antlr.v4.tool.ast.GrammarAST;
diff --git a/tool/src/org/antlr/v4/codegen/model/ListenerFile.java b/tool/src/org/antlr/v4/codegen/model/ListenerFile.java
index 3648db3ff..5b2d7af54 100644
--- a/tool/src/org/antlr/v4/codegen/model/ListenerFile.java
+++ b/tool/src/org/antlr/v4/codegen/model/ListenerFile.java
@@ -1,11 +1,15 @@
 package org.antlr.v4.codegen.model;
 
 import org.antlr.v4.codegen.OutputModelFactory;
-import org.antlr.v4.misc.Triple;
-import org.antlr.v4.tool.*;
-import org.antlr.v4.tool.ast.*;
+import org.antlr.v4.runtime.misc.Triple;
+import org.antlr.v4.tool.Grammar;
+import org.antlr.v4.tool.Rule;
+import org.antlr.v4.tool.ast.ActionAST;
+import org.antlr.v4.tool.ast.AltAST;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /** A model object representing a parse tree listener file.
  *  These are the rules specific events triggered by a parse tree visitor.
diff --git a/tool/src/org/antlr/v4/codegen/model/ParseListenerFile.java b/tool/src/org/antlr/v4/codegen/model/ParseListenerFile.java
index 268751f6b..153bf9fb1 100644
--- a/tool/src/org/antlr/v4/codegen/model/ParseListenerFile.java
+++ b/tool/src/org/antlr/v4/codegen/model/ParseListenerFile.java
@@ -1,11 +1,16 @@
 package org.antlr.v4.codegen.model;
 
 import org.antlr.v4.codegen.OutputModelFactory;
-import org.antlr.v4.misc.Triple;
-import org.antlr.v4.tool.*;
-import org.antlr.v4.tool.ast.*;
+import org.antlr.v4.runtime.misc.Triple;
+import org.antlr.v4.tool.Grammar;
+import org.antlr.v4.tool.LeftRecursiveRule;
+import org.antlr.v4.tool.Rule;
+import org.antlr.v4.tool.ast.ActionAST;
+import org.antlr.v4.tool.ast.AltAST;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class ParseListenerFile extends OutputFile {
 	public String grammarName;
diff --git a/tool/src/org/antlr/v4/codegen/model/RuleFunction.java b/tool/src/org/antlr/v4/codegen/model/RuleFunction.java
index a8492280e..fad7479be 100644
--- a/tool/src/org/antlr/v4/codegen/model/RuleFunction.java
+++ b/tool/src/org/antlr/v4/codegen/model/RuleFunction.java
@@ -40,11 +40,11 @@ import org.antlr.v4.codegen.model.decl.ContextTokenListIndexedGetterDecl;
 import org.antlr.v4.codegen.model.decl.Decl;
 import org.antlr.v4.codegen.model.decl.StructDecl;
 import org.antlr.v4.misc.FrequencySet;
-import org.antlr.v4.misc.Triple;
 import org.antlr.v4.misc.Utils;
 import org.antlr.v4.runtime.atn.ATNState;
 import org.antlr.v4.runtime.misc.IntervalSet;
 import org.antlr.v4.runtime.misc.OrderedHashSet;
+import org.antlr.v4.runtime.misc.Triple;
 import org.antlr.v4.tool.Attribute;
 import org.antlr.v4.tool.Rule;
 import org.antlr.v4.tool.ast.AltAST;
diff --git a/tool/src/org/antlr/v4/codegen/model/VisitorFile.java b/tool/src/org/antlr/v4/codegen/model/VisitorFile.java
index ee571c0ae..603289b4c 100644
--- a/tool/src/org/antlr/v4/codegen/model/VisitorFile.java
+++ b/tool/src/org/antlr/v4/codegen/model/VisitorFile.java
@@ -1,11 +1,15 @@
 package org.antlr.v4.codegen.model;
 
 import org.antlr.v4.codegen.OutputModelFactory;
-import org.antlr.v4.misc.Triple;
-import org.antlr.v4.tool.*;
-import org.antlr.v4.tool.ast.*;
+import org.antlr.v4.runtime.misc.Triple;
+import org.antlr.v4.tool.Grammar;
+import org.antlr.v4.tool.Rule;
+import org.antlr.v4.tool.ast.ActionAST;
+import org.antlr.v4.tool.ast.AltAST;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class VisitorFile extends OutputFile {
 	public String grammarName;
diff --git a/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java b/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
index 855eaa41b..81c0fa44f 100644
--- a/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
+++ b/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
@@ -31,8 +31,8 @@ package org.antlr.v4.tool;
 
 import org.antlr.v4.analysis.LeftRecursiveRuleAltInfo;
 import org.antlr.v4.misc.OrderedHashMap;
-import org.antlr.v4.misc.Pair;
-import org.antlr.v4.misc.Triple;
+import org.antlr.v4.runtime.misc.Pair;
+import org.antlr.v4.runtime.misc.Triple;
 import org.antlr.v4.tool.ast.AltAST;
 import org.antlr.v4.tool.ast.GrammarAST;
 import org.antlr.v4.tool.ast.RuleAST;
diff --git a/tool/src/org/antlr/v4/tool/Rule.java b/tool/src/org/antlr/v4/tool/Rule.java
index ed053c49c..5a094ee70 100644
--- a/tool/src/org/antlr/v4/tool/Rule.java
+++ b/tool/src/org/antlr/v4/tool/Rule.java
@@ -29,11 +29,20 @@
 
 package org.antlr.v4.tool;
 
-import org.antlr.v4.misc.Triple;
-import org.antlr.v4.tool.ast.*;
+import org.antlr.v4.runtime.misc.Triple;
+import org.antlr.v4.tool.ast.ActionAST;
+import org.antlr.v4.tool.ast.AltAST;
+import org.antlr.v4.tool.ast.GrammarAST;
+import org.antlr.v4.tool.ast.PredAST;
+import org.antlr.v4.tool.ast.RuleAST;
 import org.stringtemplate.v4.misc.MultiMap;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class Rule implements AttributeResolver {
 	/** Rule refs have a predefined set of attributes as well as