Merge pull request #3438 from parrt/normalize-getSerializedATNSegment…

…Limit

normalize targets to 80 char strings for ATN serialization segments.

tool/src/org/antlr/v4/codegen/Target.java

@@ -457,7 +457,10 @@ public String getBaseVisitorFileName(boolean header) {
 	 * @return the serialized ATN segment limit
 	 */
 	public int getSerializedATNSegmentLimit() {
-		return Integer.MAX_VALUE;
+		// Make strings encoding ATN fit on a single line conveniently so
+		// we can march through generated code more easily.  Only Java has
+		// an actual string len limit (16 bits).
+		return 80;
 	}
 
 	/** How many bits should be used to do inline token type tests? Java assumes

tool/src/org/antlr/v4/codegen/target/CppTarget.java

@@ -87,13 +87,6 @@ public String encodeIntAsCharEscape(int v) {
 		return "0x" + Integer.toHexString(v) + ", ";
 	}
 
-	@Override
-	public int getSerializedATNSegmentLimit() {
-		// 65535 is the class file format byte limit for a UTF-8 encoded string literal
-		// 3 is the maximum number of bytes it takes to encode a value in the range 0-0xFFFF
-		return 65535 / 3;
-	}
-
 	@Override
 	public String getRecognizerFileName(boolean header) {
 		ST extST = getTemplates().getInstanceOf(header ? "headerFileExtension" : "codeFileExtension");

tool/src/org/antlr/v4/codegen/target/DartTarget.java

@@ -76,13 +76,6 @@ protected void addBadWords() {
 		badWords.add("parserRule");
 	}
 
-	@Override
-	public int getSerializedATNSegmentLimit() {
-		// 65535 is the class file format byte limit for a UTF-8 encoded string literal
-		// 3 is the maximum number of bytes it takes to encode a value in the range 0-0xFFFF
-		return 65535 / 3;
-	}
-
 	@Override
 	protected boolean visibleGrammarSymbolCausesIssueInGeneratedCode(GrammarAST idNode) {
 		return getBadWords().contains(idNode.getText());

tool/src/org/antlr/v4/codegen/target/GoTarget.java

@@ -132,14 +132,6 @@ public String encodeIntAsCharEscape(int v) {
 		return Integer.toString(v);
 	}
 
-	@Override
-	public int getSerializedATNSegmentLimit() {
-		// 65535 is the class file format byte limit for a UTF-8 encoded string literal
-		// 3 is the maximum number of bytes it takes to encode a value in the range 0-0xFFFF
-		// (Mimicking Java here; not sure of true limit)
-		return 65535 / 3;
-	}
-
 	@Override
 	public int getInlineTestSetWordSize() {
 		return 32;

tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java

@@ -86,14 +86,6 @@ public String encodeIntAsCharEscape(int v) {
 		return "\\u"+hex;
 	}
 
-	@Override
-	public int getSerializedATNSegmentLimit() {
-		// 65535 is the class file format byte limit for a UTF-8 encoded string literal
-		// 3 is the maximum number of bytes it takes to encode a value in the range 0-0xFFFF
-		// (Mimicking Java here; not sure of true limit)
-		return 65535 / 3;
-	}
-
 	@Override
 	public int getInlineTestSetWordSize() {
 		return 32;

tool/src/org/antlr/v4/codegen/target/Python3Target.java

@@ -54,12 +54,6 @@ public Python3Target(CodeGenerator gen) {
 		super(gen, "Python3");
 	}
 
-	@Override
-	public int getSerializedATNSegmentLimit() {
-		// set to something stupid to avoid segmentation
-		return Integer.MAX_VALUE;
-	}
-
 	@Override
 	protected boolean visibleGrammarSymbolCausesIssueInGeneratedCode(GrammarAST idNode) {
 		return getBadWords().contains(idNode.getText());

tool/src/org/antlr/v4/codegen/target/SwiftTarget.java

@@ -104,13 +104,6 @@ protected void addBadWords() {
         badWords.add("parserRule");
     }
 
-    @Override
-    public int getSerializedATNSegmentLimit() {
-        // 65535 is the class file format byte limit for a UTF-8 encoded string literal
-        // 3 is the maximum number of bytes it takes to encode a value in the range 0-0xFFFF
-        return 65535 / 3;
-    }
-
     @Override
     protected boolean visibleGrammarSymbolCausesIssueInGeneratedCode(GrammarAST idNode) {
         return getBadWords().contains(idNode.getText());