Merge pull request #1089 from CodaFi/a-serial-liar

Author: CodaFi

CodeGeneration/Package.swift

@@ -48,7 +48,6 @@ let package = Package(
         "DeclNodes.swift.gyb",
         "ExprNodes.swift.gyb",
         "GenericNodes.swift.gyb",
-        "NodeSerializationCodes.swift.gyb",
         "PatternNodes.swift.gyb",
         "StmtNodes.swift.gyb",
         "SyntaxBaseKinds.swift.gyb",

CodeGeneration/Sources/SyntaxSupport/NodeSerializationCodes.swift.gyb

@@ -22,7 +22,6 @@
 public class TokenSpec {
   public let name: String
   public let kind: String
-  public let serializationCode: Int
   public let nameForDiagnostics: String
   public let unprefixedKind: String
   public let text: String?
@@ -44,7 +43,6 @@ public class TokenSpec {
   init(
     name: String,
     kind: String,
-    serializationCode: Int,
     nameForDiagnostics: String,
     unprefixedKind: String? = nil,
     text: String? = nil,
@@ -55,7 +53,6 @@ public class TokenSpec {
   ) {
     self.name = name
     self.kind = kind
-    self.serializationCode = serializationCode
     self.nameForDiagnostics = nameForDiagnostics
     if let unprefixedKind = unprefixedKind {
       self.unprefixedKind = unprefixedKind
@@ -74,7 +71,6 @@ public class TokenSpec {
 public class KeywordSpec: TokenSpec {
   init(
     name: String,
-    serializationCode: Int,
     text: String,
     classification: String = "Keyword",
     requiresLeadingSpace: Bool = false,
@@ -83,7 +79,6 @@ public class KeywordSpec: TokenSpec {
     super.init(
       name: name,
       kind: "kw_\(text)",
-      serializationCode: serializationCode,
       nameForDiagnostics: text,
       unprefixedKind: text,
       text: text,
@@ -111,15 +106,13 @@ public class PoundKeywordSpec: TokenSpec {
   init(
     name: String,
     kind: String,
-    serializationCode: Int,
     nameForDiagnostics: String? = nil,
     text: String,
     classification: String = "Keyword"
   ) {
     super.init(
       name: name,
       kind: "pound_\(kind)",
-      serializationCode: serializationCode,
       nameForDiagnostics: nameForDiagnostics ?? text,
       unprefixedKind: kind,
       text: text,
@@ -136,7 +129,6 @@ public class PoundObjectLiteralSpec: PoundKeywordSpec {
   init(
     name: String,
     kind: String,
-    serializationCode: Int,
     text: String,
     classification: String = "ObjectLiteral",
     nameForDiagnostics: String,
@@ -146,7 +138,6 @@ public class PoundObjectLiteralSpec: PoundKeywordSpec {
     super.init(
       name: name,
       kind: kind,
-      serializationCode: serializationCode,
       nameForDiagnostics: nameForDiagnostics,
       text: text,
       classification: classification
@@ -160,14 +151,12 @@ public class PoundDirectiveKeywordSpec: PoundKeywordSpec {
   init(
     name: String,
     kind: String,
-    serializationCode: Int,
     text: String,
     classification: String = "PoundDirectiveKeyword"
   ) {
     super.init(
       name: name,
       kind: kind,
-      serializationCode: serializationCode,
       text: text,
       classification: classification
     )
@@ -178,14 +167,12 @@ public class PoundConditionalDirectiveKeywordSpec: PoundDirectiveKeywordSpec {
   override init(
     name: String,
     kind: String,
-    serializationCode: Int,
     text: String,
     classification: String = "PoundDirectiveKeyword"
   ) {
     super.init(
       name: name,
       kind: kind,
-      serializationCode: serializationCode,
       text: text,
       classification: classification
     )
@@ -196,7 +183,6 @@ public class PunctuatorSpec: TokenSpec {
   init(
     name: String,
     kind: String,
-    serializationCode: Int,
     text: String,
     classification: String = "None",
     requiresLeadingSpace: Bool = false,
@@ -205,7 +191,6 @@ public class PunctuatorSpec: TokenSpec {
     super.init(
       name: name,
       kind: kind,
-      serializationCode: serializationCode,
       nameForDiagnostics: text,
       unprefixedKind: nil,
       text: text,
@@ -226,19 +211,19 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
 %   class_name = type(token).__name__
 %   parameters = ["name: \"%s\"" % token.name]
 %   if class_name in ['Keyword', 'SwiftKeyword', 'DeclKeyword', 'StmtKeyword', 'ExprKeyword', 'PatternKeyword', 'SilKeyword']:
-%     parameters += ["serializationCode: %s" % token.serialization_code, "text: \"%s\"" % token.text]
+%     parameters += ["text: \"%s\"" % token.text]
 %   elif class_name in ['PoundKeyword', 'PoundConfig', 'PoundDirectiveKeyword', 'PoundConditionalDirectiveKeyword']:
-%     parameters += ["kind: \"%s\"" % token.kind, "serializationCode: %s" % token.serialization_code, "text: \"%s\"" % token.text]
+%     parameters += ["kind: \"%s\"" % token.kind, "text: \"%s\"" % token.text]
 %   elif class_name in ['Punctuator', 'Misc', 'Literal']:
-%     parameters += ["kind: \"%s\"" % token.kind, "serializationCode: %s" % token.serialization_code]
+%     parameters += ["kind: \"%s\"" % token.kind]
 %     if class_name != 'Punctuator':
 %       parameters += ["nameForDiagnostics: \"%s\"" % token.name_for_diagnostics]
 %     end
 %     if token.text:
 %       parameters += ["text: \"%s\"" % token.text]
 %     end
 %   elif class_name == 'PoundObjectLiteral':
-%     parameters += ["kind: \"%s\"" % token.kind, "serializationCode: %s" % token.serialization_code, "text: \"%s\"" % token.text, "nameForDiagnostics: \"%s\"" % token.name_for_diagnostics, "protocol: \"%s\"" % token.protocol]
+%     parameters += ["kind: \"%s\"" % token.kind, "text: \"%s\"" % token.text, "nameForDiagnostics: \"%s\"" % token.name_for_diagnostics, "protocol: \"%s\"" % token.protocol]
 %   else:
 %     print("Unknown token `%s`", (token.name), file=sys.stderr)
 %     sys.exit(1)

CodeGeneration/Sources/SyntaxSupport/TokenSpec.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