From dfeca1b9d91e0e9fb930fb10d5072d329a05a8c8 Mon Sep 17 00:00:00 2001
From: Terence Parr <parrt@antlr.org>
Date: Fri, 7 Sep 2012 17:01:16 -0700
Subject: [PATCH] rm abstract option

---
 .../antlr/v4/tool/templates/codegen/Java/Java.stg    |  4 ++--
 tool/src/org/antlr/v4/codegen/model/Lexer.java       |  3 ---
 tool/src/org/antlr/v4/codegen/model/Parser.java      |  3 ---
 tool/src/org/antlr/v4/tool/Grammar.java              | 12 ------------
 tool/src/org/antlr/v4/tool/ast/GrammarRootAST.java   |  1 -
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
index 477359cd5..0aee59a37 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
@@ -88,7 +88,7 @@ Parser(parser, funcs, atn, sempredFuncs, superClass) ::= <<
 
 Parser_(parser, funcs, atn, sempredFuncs, ctor, extras, superClass) ::= <<
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
-public <if(parser.abstractRecognizer)>abstract <endif>class <parser.name> extends <superClass> {
+public class <parser.name> extends <superClass> {
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =
 		new PredictionContextCache();
@@ -681,7 +681,7 @@ import org.antlr.v4.runtime.misc.*;
 
 Lexer(lexer, atn, actionFuncs, sempredFuncs, superClass) ::= <<
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
-public <if(lexer.abstractRecognizer)>abstract <endif>class <lexer.name> extends <superClass> {
+public class <lexer.name> extends <superClass> {
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =
 		new PredictionContextCache();
diff --git a/tool/src/org/antlr/v4/codegen/model/Lexer.java b/tool/src/org/antlr/v4/codegen/model/Lexer.java
index fae41a9f4..f04211910 100644
--- a/tool/src/org/antlr/v4/codegen/model/Lexer.java
+++ b/tool/src/org/antlr/v4/codegen/model/Lexer.java
@@ -52,7 +52,6 @@ public class Lexer extends OutputModelObject {
 	public String[] tokenNames;
 	public Set<String> ruleNames;
 	public Collection<String> modes;
-	public boolean abstractRecognizer;
 	@ModelElement public ActionChunk superClass;
 
 	@ModelElement public SerializedATN atn;
@@ -101,8 +100,6 @@ public class Lexer extends OutputModelObject {
 		else {
 			superClass = new DefaultLexerSuperClass();
 		}
-
-		abstractRecognizer = g.isAbstract();
 	}
 
 }
diff --git a/tool/src/org/antlr/v4/codegen/model/Parser.java b/tool/src/org/antlr/v4/codegen/model/Parser.java
index 728563c38..2c2929b5c 100644
--- a/tool/src/org/antlr/v4/codegen/model/Parser.java
+++ b/tool/src/org/antlr/v4/codegen/model/Parser.java
@@ -56,7 +56,6 @@ public class Parser extends OutputModelObject {
 	public Set<String> ruleNames;
 	public Collection<Rule> rules;
 	public ParserFile file;
-	public boolean abstractRecognizer;
 
 	@ModelElement public List<RuleFunction> funcs = new ArrayList<RuleFunction>();
 	@ModelElement public SerializedATN atn;
@@ -100,7 +99,5 @@ public class Parser extends OutputModelObject {
 		else {
 			superClass = new DefaultParserSuperClass();
 		}
-
-		abstractRecognizer = g.isAbstract();
 	}
 }
diff --git a/tool/src/org/antlr/v4/tool/Grammar.java b/tool/src/org/antlr/v4/tool/Grammar.java
index 72051a8ce..dfdc7ff20 100644
--- a/tool/src/org/antlr/v4/tool/Grammar.java
+++ b/tool/src/org/antlr/v4/tool/Grammar.java
@@ -73,7 +73,6 @@ public class Grammar implements AttributeResolver {
 	public static final Set<String> parserOptions = new HashSet<String>() {{
 		add("superClass");
 		add("TokenLabelType");
-		add("abstract");
 		add("tokenVocab");
 		add("language");
 	}};
@@ -103,7 +102,6 @@ public class Grammar implements AttributeResolver {
         new HashSet() {{
 				add("superClass");
                 add("TokenLabelType");
-				add("abstract");
 				add("tokenVocab");
         }};
 
@@ -401,10 +399,6 @@ public class Grammar implements AttributeResolver {
         return parent.getOutermostGrammar();
     }
 
-	public boolean isAbstract() {
-		return Boolean.parseBoolean(getOptionString("abstract"));
-	}
-
     /** Get the name of the generated recognizer; may or may not be same
      *  as grammar name.
      *  Recognizer is TParser and TLexer from T if combined, else
@@ -420,15 +414,9 @@ public class Grammar implements AttributeResolver {
                 buf.append(g.name);
                 buf.append('_');
             }
-			if (isAbstract()) {
-				buf.append("Abstract");
-			}
             buf.append(name);
             qualifiedName = buf.toString();
         }
-		else if (isAbstract()) {
-			qualifiedName = "Abstract" + name;
-		}
 
         if ( isCombined() || (isLexer() && implicitLexer!=null) )
         {
diff --git a/tool/src/org/antlr/v4/tool/ast/GrammarRootAST.java b/tool/src/org/antlr/v4/tool/ast/GrammarRootAST.java
index 75e6d54e7..193188f86 100644
--- a/tool/src/org/antlr/v4/tool/ast/GrammarRootAST.java
+++ b/tool/src/org/antlr/v4/tool/ast/GrammarRootAST.java
@@ -40,7 +40,6 @@ public class GrammarRootAST extends GrammarASTWithOptions {
 	public static final Map<String, String> defaultOptions =
          new HashMap<String, String>() {{
 			 put("language","Java");
-			 put("abstract","false");
 		 }};
     public int grammarType; // LEXER, PARSER, GRAMMAR (combined)
 	public boolean hasErrors;