Remove Trivia Serialization Codes

Author: CodaFi

CodeGeneration/Sources/SyntaxSupport/Trivia.swift.gyb

@@ -20,7 +20,6 @@
 public class Trivia {
   public let name: String
   public let comment: String
-  public let serializationCode: Int
   public let characters: [Character]
   public let swiftCharacters: [Character]
   public let isNewLine: Bool
@@ -34,13 +33,12 @@ public class Trivia {
 
   init(name: String,
        comment: String,
-       serializationCode: Int, characters: [Character] = [],
+       characters: [Character] = [],
        swiftCharacters: [Character] = [],
        isNewLine: Bool = false,
        isComment: Bool = false){
     self.name = name
     self.comment = comment
-    self.serializationCode = serializationCode
     self.isNewLine = isNewLine
     self.isComment = isComment
     self.characters = characters
@@ -60,7 +58,6 @@ public let TRIVIAS: [Trivia] = [
 %   parameters = [
 %   'name: "%s"' % trivia.name,
 %   'comment: #"%s"#'  % trivia.comment,
-%   'serializationCode: %d' % trivia.serialization_code
 %   ]
 %   if trivia.characters:
 %     spaces = 11

CodeGeneration/Sources/SyntaxSupport/gyb_generated/Trivia.swift

@@ -15,7 +15,6 @@
 public class Trivia {
   public let name: String
   public let comment: String
-  public let serializationCode: Int
   public let characters: [Character]
   public let swiftCharacters: [Character]
   public let isNewLine: Bool
@@ -29,13 +28,12 @@ public class Trivia {
 
   init(name: String,
        comment: String,
-       serializationCode: Int, characters: [Character] = [],
+       characters: [Character] = [],
        swiftCharacters: [Character] = [],
        isNewLine: Bool = false,
        isComment: Bool = false){
     self.name = name
     self.comment = comment
-    self.serializationCode = serializationCode
     self.isNewLine = isNewLine
     self.isComment = isComment
     self.characters = characters
@@ -53,7 +51,6 @@ public class Trivia {
 public let TRIVIAS: [Trivia] = [
   Trivia(name: "Space",
          comment: #"A space ' ' character."#,
-         serializationCode: 0,
          characters: [
            Character(#" "#)
          ],
@@ -62,7 +59,6 @@ public let TRIVIAS: [Trivia] = [
         ]),
   Trivia(name: "Tab",
          comment: #"A tab '\t' character."#,
-         serializationCode: 1,
          characters: [
            Character(#"\t"#)
          ],
@@ -71,7 +67,6 @@ public let TRIVIAS: [Trivia] = [
         ]),
   Trivia(name: "VerticalTab",
          comment: #"A vertical tab '\v' character."#,
-         serializationCode: 2,
          characters: [
            Character(#"\v"#)
          ],
@@ -80,7 +75,6 @@ public let TRIVIAS: [Trivia] = [
         ]),
   Trivia(name: "Formfeed",
          comment: #"A form-feed 'f' character."#,
-         serializationCode: 3,
          characters: [
            Character(#"\f"#)
          ],
@@ -89,7 +83,6 @@ public let TRIVIAS: [Trivia] = [
         ]),
   Trivia(name: "Newline",
          comment: #"A newline '\n' character."#,
-         serializationCode: 4,
          characters: [
            Character(#"\n"#)
          ],
@@ -99,7 +92,6 @@ public let TRIVIAS: [Trivia] = [
          isNewLine: true),
   Trivia(name: "CarriageReturn",
          comment: #"A newline '\r' character."#,
-         serializationCode: 5,
          characters: [
            Character(#"\r"#)
          ],
@@ -109,7 +101,6 @@ public let TRIVIAS: [Trivia] = [
          isNewLine: true),
   Trivia(name: "CarriageReturnLineFeed",
          comment: #"A newline consists of contiguous '\r' and '\n' characters."#,
-         serializationCode: 6,
          characters: [
            Character(#"\r"#),
            Character(#"\n"#)
@@ -121,24 +112,18 @@ public let TRIVIAS: [Trivia] = [
          isNewLine: true),
   Trivia(name: "LineComment",
          comment: #"A developer line comment, starting with '//'"#,
-         serializationCode: 8,
          isComment: true),
   Trivia(name: "BlockComment",
          comment: #"A developer block comment, starting with '/*' and ending with '*/'."#,
-         serializationCode: 9,
          isComment: true),
   Trivia(name: "DocLineComment",
          comment: #"A documentation line comment, starting with '///'."#,
-         serializationCode: 10,
          isComment: true),
   Trivia(name: "DocBlockComment",
          comment: #"A documentation block comment, starting with '/**' and ending with '*/'."#,
-         serializationCode: 11,
          isComment: true),
   Trivia(name: "UnexpectedText",
-         comment: #"Any skipped unexpected text."#,
-         serializationCode: 12),
+         comment: #"Any skipped unexpected text."#),
   Trivia(name: "Shebang",
-         comment: #"A script command, starting with '#!'."#,
-         serializationCode: 13),
+         comment: #"A script command, starting with '#!'."#),
 ]

gyb_syntax_support/Trivia.py

@@ -3,11 +3,10 @@
 
 
 class Trivia(object):
-    def __init__(self, name, comment, serialization_code, characters=[],
+    def __init__(self, name, comment, characters=[],
                  swift_characters=[], is_new_line=False, is_comment=False):
         self.name = name
         self.comment = comment
-        self.serialization_code = serialization_code
         self.characters = tuple(characters)
         self.lower_name = lowercase_first_word(name)
         self.is_new_line = is_new_line
@@ -29,49 +28,32 @@ def is_collection(self):
 
 
 TRIVIAS = [
-    Trivia('Space', 'A space \' \' character.', characters=[' '],
-           serialization_code=0),
-    Trivia('Tab', 'A tab \'\\t\' character.', characters=['\\t'],
-           serialization_code=1),
+    Trivia('Space', 'A space \' \' character.', characters=[' ']),
+    Trivia('Tab', 'A tab \'\\t\' character.', characters=['\\t']),
     Trivia('VerticalTab', 'A vertical tab \'\\v\' character.',
-           characters=['\\v'], swift_characters=['\\u{2B7F}'],
-           serialization_code=2),
+           characters=['\\v'], swift_characters=['\\u{2B7F}']),
     Trivia('Formfeed', 'A form-feed \'f\' character.', characters=['\\f'],
-           swift_characters=['\\u{240C}'], serialization_code=3),
+           swift_characters=['\\u{240C}']),
     Trivia('Newline', 'A newline \'\\n\' character.', characters=['\\n'],
-           is_new_line=True, serialization_code=4),
+           is_new_line=True),
     Trivia('CarriageReturn', 'A newline \'\\r\' character.',
-           characters=['\\r'], is_new_line=True, serialization_code=5),
+           characters=['\\r'], is_new_line=True),
     Trivia('CarriageReturnLineFeed',
            'A newline consists of contiguous \'\\r\' and \'\\n\' characters.',
-           characters=['\\r', '\\n'], is_new_line=True, serialization_code=6),
+           characters=['\\r', '\\n'], is_new_line=True),
     Trivia('LineComment', 'A developer line comment, starting with \'//\'',
-           is_comment=True, serialization_code=8),
+           is_comment=True),
     Trivia('BlockComment',
            'A developer block comment, starting with \'/*\' and ending with'
            ' \'*/\'.',
-           is_comment=True, serialization_code=9),
+           is_comment=True),
     Trivia('DocLineComment',
            'A documentation line comment, starting with \'///\'.',
-           is_comment=True, serialization_code=10),
+           is_comment=True),
     Trivia('DocBlockComment',
            'A documentation block comment, starting with \'/**\' and ending '
            'with \'*/\'.',
-           is_comment=True, serialization_code=11),
-    Trivia('UnexpectedText', 'Any skipped unexpected text.',
-           serialization_code=12),
-    Trivia('Shebang', 'A script command, starting with \'#!\'.',
-           serialization_code=13),
+           is_comment=True),
+    Trivia('UnexpectedText', 'Any skipped unexpected text.'),
+    Trivia('Shebang', 'A script command, starting with \'#!\'.'),
 ]
-
-
-def verify_no_duplicate_serialization_codes(trivias):
-    used_codes = set()
-    for trivia in trivias:
-        if trivia.serialization_code in used_codes:
-            error("Serialization code %d used twice for trivia" %
-                  trivia.serialization_code)
-        used_codes.add(trivia.serialization_code)
-
-
-verify_no_duplicate_serialization_codes(TRIVIAS)

gyb_syntax_support/__init__.py

@@ -171,7 +171,6 @@ def _digest_syntax_token(token):
 
     def _digest_trivia(trivia):
         digest.update(trivia.name.encode("utf-8"))
-        digest.update(str(trivia.serialization_code).encode("utf-8"))
         digest.update(str(trivia.characters).encode("utf-8"))
 
     for node in SYNTAX_NODES: