forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

forgot to move Pair etc...

This commit is contained in:
Terence Parr 2012-02-26 21:55:23 -08:00
parent e9a3de645a
commit 67b2e6d7c1
12 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/Java/src/org/antlr/v4/runtime/misc/MultiMap.java
View File

@ -29,8 +29,6 @@
package org.antlr.v4.runtime.misc; package org.antlr.v4.runtime.misc;
import com.sun.tools.javac.util.Pair;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;

2
tool/src/org/antlr/v4/misc/Pair.java → runtime/Java/src/org/antlr/v4/runtime/misc/Pair.java
View File

@ -1,4 +1,4 @@
package org.antlr.v4.misc; package org.antlr.v4.runtime.misc;
public class Pair<A,B> { public class Pair<A,B> {
public A a; public A a;

2
tool/src/org/antlr/v4/misc/Triple.java → runtime/Java/src/org/antlr/v4/runtime/misc/Triple.java
View File

@ -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 class Triple<A,B,C> extends Pair<A,B> {
public C c; public C c;

2
tool/src/org/antlr/v4/analysis/LeftRecursiveRuleAnalyzer.java
View File

@ -35,9 +35,9 @@ import org.antlr.runtime.tree.CommonTreeNodeStream;
import org.antlr.runtime.tree.Tree; import org.antlr.runtime.tree.Tree;
import org.antlr.v4.Tool; import org.antlr.v4.Tool;
import org.antlr.v4.codegen.CodeGenerator; import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.misc.Pair;
import org.antlr.v4.parse.GrammarASTAdaptor; import org.antlr.v4.parse.GrammarASTAdaptor;
import org.antlr.v4.parse.LeftRecursiveRuleWalker; import org.antlr.v4.parse.LeftRecursiveRuleWalker;
import org.antlr.v4.runtime.misc.Pair;
import org.antlr.v4.tool.ErrorType; import org.antlr.v4.tool.ErrorType;
import org.antlr.v4.tool.ast.AltAST; import org.antlr.v4.tool.ast.AltAST;
import org.antlr.v4.tool.ast.GrammarAST; import org.antlr.v4.tool.ast.GrammarAST;

2
tool/src/org/antlr/v4/analysis/LeftRecursiveRuleTransformer.java
View File

@ -37,12 +37,12 @@ import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.TokenStream; import org.antlr.runtime.TokenStream;
import org.antlr.v4.Tool; import org.antlr.v4.Tool;
import org.antlr.v4.misc.OrderedHashMap; import org.antlr.v4.misc.OrderedHashMap;
import org.antlr.v4.misc.Pair;
import org.antlr.v4.parse.ANTLRLexer; import org.antlr.v4.parse.ANTLRLexer;
import org.antlr.v4.parse.ANTLRParser; import org.antlr.v4.parse.ANTLRParser;
import org.antlr.v4.parse.GrammarASTAdaptor; import org.antlr.v4.parse.GrammarASTAdaptor;
import org.antlr.v4.parse.ScopeParser; import org.antlr.v4.parse.ScopeParser;
import org.antlr.v4.parse.ToolANTLRParser; import org.antlr.v4.parse.ToolANTLRParser;
import org.antlr.v4.runtime.misc.Pair;
import org.antlr.v4.tool.AttributeDict; import org.antlr.v4.tool.AttributeDict;
import org.antlr.v4.tool.ErrorType; import org.antlr.v4.tool.ErrorType;
import org.antlr.v4.tool.Grammar; import org.antlr.v4.tool.Grammar;

2
tool/src/org/antlr/v4/codegen/model/LeftRecursiveRuleFunction.java
View File

@ -33,8 +33,8 @@ import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.OutputModelFactory; import org.antlr.v4.codegen.OutputModelFactory;
import org.antlr.v4.codegen.model.decl.RuleContextDecl; import org.antlr.v4.codegen.model.decl.RuleContextDecl;
import org.antlr.v4.codegen.model.decl.StructDecl; import org.antlr.v4.codegen.model.decl.StructDecl;
import org.antlr.v4.misc.Pair;
import org.antlr.v4.parse.ANTLRParser; import org.antlr.v4.parse.ANTLRParser;
import org.antlr.v4.runtime.misc.Pair;
import org.antlr.v4.tool.LeftRecursiveRule; import org.antlr.v4.tool.LeftRecursiveRule;
import org.antlr.v4.tool.Rule; import org.antlr.v4.tool.Rule;
import org.antlr.v4.tool.ast.GrammarAST; import org.antlr.v4.tool.ast.GrammarAST;

12
tool/src/org/antlr/v4/codegen/model/ListenerFile.java
View File

@ -1,11 +1,15 @@
package org.antlr.v4.codegen.model; package org.antlr.v4.codegen.model;
import org.antlr.v4.codegen.OutputModelFactory; import org.antlr.v4.codegen.OutputModelFactory;
import org.antlr.v4.misc.Triple; import org.antlr.v4.runtime.misc.Triple;
import org.antlr.v4.tool.*; import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.ast.*; 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. /** A model object representing a parse tree listener file.
* These are the rules specific events triggered by a parse tree visitor. * These are the rules specific events triggered by a parse tree visitor.

13
tool/src/org/antlr/v4/codegen/model/ParseListenerFile.java
View File

@ -1,11 +1,16 @@
package org.antlr.v4.codegen.model; package org.antlr.v4.codegen.model;
import org.antlr.v4.codegen.OutputModelFactory; import org.antlr.v4.codegen.OutputModelFactory;
import org.antlr.v4.misc.Triple; import org.antlr.v4.runtime.misc.Triple;
import org.antlr.v4.tool.*; import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.ast.*; 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 class ParseListenerFile extends OutputFile {
public String grammarName; public String grammarName;

2
tool/src/org/antlr/v4/codegen/model/RuleFunction.java
View File

@ -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.Decl;
import org.antlr.v4.codegen.model.decl.StructDecl; import org.antlr.v4.codegen.model.decl.StructDecl;
import org.antlr.v4.misc.FrequencySet; import org.antlr.v4.misc.FrequencySet;
import org.antlr.v4.misc.Triple;
import org.antlr.v4.misc.Utils; import org.antlr.v4.misc.Utils;
import org.antlr.v4.runtime.atn.ATNState; import org.antlr.v4.runtime.atn.ATNState;
import org.antlr.v4.runtime.misc.IntervalSet; import org.antlr.v4.runtime.misc.IntervalSet;
import org.antlr.v4.runtime.misc.OrderedHashSet; 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.Attribute;
import org.antlr.v4.tool.Rule; import org.antlr.v4.tool.Rule;
import org.antlr.v4.tool.ast.AltAST; import org.antlr.v4.tool.ast.AltAST;

12
tool/src/org/antlr/v4/codegen/model/VisitorFile.java
View File

@ -1,11 +1,15 @@
package org.antlr.v4.codegen.model; package org.antlr.v4.codegen.model;
import org.antlr.v4.codegen.OutputModelFactory; import org.antlr.v4.codegen.OutputModelFactory;
import org.antlr.v4.misc.Triple; import org.antlr.v4.runtime.misc.Triple;
import org.antlr.v4.tool.*; import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.ast.*; 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 class VisitorFile extends OutputFile {
public String grammarName; public String grammarName;

4
tool/src/org/antlr/v4/tool/LeftRecursiveRule.java
View File

@ -31,8 +31,8 @@ package org.antlr.v4.tool;
import org.antlr.v4.analysis.LeftRecursiveRuleAltInfo; import org.antlr.v4.analysis.LeftRecursiveRuleAltInfo;
import org.antlr.v4.misc.OrderedHashMap; import org.antlr.v4.misc.OrderedHashMap;
import org.antlr.v4.misc.Pair; import org.antlr.v4.runtime.misc.Pair;
import org.antlr.v4.misc.Triple; import org.antlr.v4.runtime.misc.Triple;
import org.antlr.v4.tool.ast.AltAST; import org.antlr.v4.tool.ast.AltAST;
import org.antlr.v4.tool.ast.GrammarAST; import org.antlr.v4.tool.ast.GrammarAST;
import org.antlr.v4.tool.ast.RuleAST; import org.antlr.v4.tool.ast.RuleAST;

15
tool/src/org/antlr/v4/tool/Rule.java
View File

@ -29,11 +29,20 @@
package org.antlr.v4.tool; package org.antlr.v4.tool;
import org.antlr.v4.misc.Triple; import org.antlr.v4.runtime.misc.Triple;
import org.antlr.v4.tool.ast.*; 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 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 { public class Rule implements AttributeResolver {
/** Rule refs have a predefined set of attributes as well as /** Rule refs have a predefined set of attributes as well as