Convert Python2/3 to use int arrays not strings for ATN encodings

runtime/Python2/src/antlr4/atn/ATNDeserializer.py

@@ -22,7 +22,7 @@ def __init__(self, options = None):
         self.actionFactories = None
 
     def deserialize(self, data):
-        self.data = [ ord(c) for c in data ]
+        self.data = data
         self.pos = 0
         self.checkVersion()
         atn = self.readATN()

runtime/Python3/src/antlr4/atn/ATNDeserializer.py

@@ -22,8 +22,8 @@ def __init__(self, options : ATNDeserializationOptions = None):
             options = ATNDeserializationOptions.defaultOptions
         self.deserializationOptions = options
 
-    def deserialize(self, data : str):
-        self.data = [ ord(c) for c in data ]
+    def deserialize(self, data : int):
+        self.data = data
         self.pos = 0
         self.checkVersion()
         atn = self.readATN()

tool/resources/org/antlr/v4/tool/templates/codegen/Python2/Python2.stg

@@ -809,13 +809,10 @@ class <lexer.name>(<if(superClass)><superClass><else>Lexer<endif>):
 >>
 
 SerializedATN(model) ::= <<
-<! only one segment, can be inlined !>
-
 def serializedATN():
-    with StringIO() as buf:
-        buf.write(u"<model.serialized; wrap={")<\n>        buf.write(u"}>")
-        return buf.getvalue()
-
+    return [
+        <model.serialized: {s | <s>}; separator=",", wrap>
+    ]
 >>
 
 /** Using a type to init value map, try to init a type; if not in table

tool/resources/org/antlr/v4/tool/templates/codegen/Python3/Python3.stg

@@ -823,13 +823,10 @@ class <lexer.name>(<if(superClass)><superClass><else>Lexer<endif>):
 >>
 
 SerializedATN(model) ::= <<
-<! only one segment, can be inlined !>
-
 def serializedATN():
-    with StringIO() as buf:
-        buf.write("<model.serialized; wrap={")<\n>        buf.write("}>")
-        return buf.getvalue()
-
+    return [
+        <model.serialized: {s | <s>}; separator=",", wrap>
+    ]
 >>
 
 /** Using a type to init value map, try to init a type; if not in table

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

@@ -343,8 +343,7 @@ public String encodeIntAsCharEscape(int v) {
 			throw new IllegalArgumentException(String.format("Cannot encode the specified value: %d", v));
 		}
 
-		String language = getLanguage();
-		if (language.equals("Go") || language.equals("Cpp")) {
+		if ( isATNSerializedAsInts() ) {
 			return Integer.toString(v);
 		}
 
@@ -367,6 +366,7 @@ public String encodeIntAsCharEscape(int v) {
 				}
 
 				if (isPreviousOctal) {
+					String language = getLanguage();
 					char upperBound = language.equals("PHP") ? '9' : '7';
 					if (c >= '0' && c <= upperBound) {
 						return escapeChar(v);
@@ -689,6 +689,10 @@ public boolean supportsOverloadedMethods() {
 		return true;
 	}
 
+	public boolean isATNSerializedAsInts() {
+		return true;
+	}
+
 	/** @since 4.6 */
 	public boolean needsHeader() { return false; } // Override in targets that need header files.
 }

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

@@ -170,4 +170,9 @@ private void reportError(STMessage msg) {
 
 		return result;
 	}
+
+	@Override
+	public boolean isATNSerializedAsInts() {
+		return false;
+	}
 }

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

@@ -70,4 +70,9 @@ protected STGroup loadTemplates() {
 
 		return result;
 	}
+
+	@Override
+	public boolean isATNSerializedAsInts() {
+		return false;
+	}
 }

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

@@ -166,7 +166,6 @@ public String getBaseVisitorFileName(boolean header) {
 	}
 
 	protected static class JavaStringRenderer extends StringRenderer {
-
 		@Override
 		public String toString(Object o, String formatString, Locale locale) {
 
@@ -177,6 +176,5 @@ public String toString(Object o, String formatString, Locale locale) {
 
 			return super.toString(o, formatString, locale);
 		}
-
 	}
 }

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

@@ -91,4 +91,9 @@ public boolean wantsBaseVisitor() {
 	public boolean supportsOverloadedMethods() {
 		return false;
 	}
+
+	@Override
+	public boolean isATNSerializedAsInts() {
+		return false;
+	}
 }

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

@@ -73,4 +73,9 @@ public String toString(Object o, String formatString, Locale locale) {
 			return super.toString(o, formatString, locale);
 		}
 	}
+
+	@Override
+	public boolean isATNSerializedAsInts() {
+		return false;
+	}
 }

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

@@ -106,3 +106,4 @@ public boolean supportsOverloadedMethods() {
 		return false;
 	}
 }
+

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

@@ -101,4 +101,9 @@ public String toString(Object o, String formatString, Locale locale) {
             return super.toString(o, formatString, locale);
         }
     }
+
+	@Override
+	public boolean isATNSerializedAsInts() {
+		return false;
+	}
 }