Merge pull request #241 from franklinsch/visit-literals

Visit literal tokens in AST Passes
flintlang · Jul 6, 2018 · 8b163ba · 8b163ba
2 parents aee50c0 + 3845052
commit 8b163ba
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 2 deletions.
diff --git a/Sources/AST/ASTPass.swift b/Sources/AST/ASTPass.swift
@@ -33,6 +33,7 @@ public protocol ASTPass {
   func process(functionCall: FunctionCall, passContext: ASTPassContext) -> ASTPassResult<FunctionCall>
   func process(arrayLiteral: ArrayLiteral, passContext: ASTPassContext) -> ASTPassResult<ArrayLiteral>
   func process(dictionaryLiteral: DictionaryLiteral, passContext: ASTPassContext) -> ASTPassResult<DictionaryLiteral>
+  func process(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token>
   func process(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression>
   func process(returnStatement: ReturnStatement, passContext: ASTPassContext) -> ASTPassResult<ReturnStatement>
   func process(ifStatement: IfStatement, passContext: ASTPassContext) -> ASTPassResult<IfStatement>
@@ -60,6 +61,7 @@ public protocol ASTPass {
   func postProcess(functionCall: FunctionCall, passContext: ASTPassContext) -> ASTPassResult<FunctionCall>
   func postProcess(arrayLiteral: ArrayLiteral, passContext: ASTPassContext) -> ASTPassResult<ArrayLiteral>
   func postProcess(dictionaryLiteral: DictionaryLiteral, passContext: ASTPassContext) -> ASTPassResult<DictionaryLiteral>
+  func postProcess(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token>
   func postProcess(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression>
   func postProcess(returnStatement: ReturnStatement, passContext: ASTPassContext) -> ASTPassResult<ReturnStatement>
   func postProcess(ifStatement: IfStatement, passContext: ASTPassContext) -> ASTPassResult<IfStatement>
@@ -164,6 +166,10 @@ public struct AnyASTPass: ASTPass {
     return base.process(dictionaryLiteral: dictionaryLiteral, passContext: passContext)
   }
 
+  public func process(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return base.process(literalToken: literalToken, passContext: passContext)
+  }
+
   public func process(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return base.process(subscriptExpression: subscriptExpression, passContext: passContext)
   }
@@ -266,7 +272,11 @@ public struct AnyASTPass: ASTPass {
   }
 
   public func postProcess(dictionaryLiteral: DictionaryLiteral, passContext: ASTPassContext) -> ASTPassResult<DictionaryLiteral> {
-    return base.process(dictionaryLiteral: dictionaryLiteral, passContext: passContext)
+    return base.postProcess(dictionaryLiteral: dictionaryLiteral, passContext: passContext)
+  }
+
+  public func postProcess(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return base.process(literalToken: literalToken, passContext: passContext)
   }
 
   public func postProcess(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {

diff --git a/Sources/AST/ASTVisitor.swift b/Sources/AST/ASTVisitor.swift
@@ -311,7 +311,9 @@ public struct ASTVisitor<Pass: ASTPass> {
       processResult.element = .dictionaryLiteral(processResult.combining(visit(dictionaryLiteral, passContext: processResult.passContext)))
     case .identifier(let identifier):
       processResult.element = .identifier(processResult.combining(visit(identifier, passContext: processResult.passContext)))
-    case .literal(_), .self(_): break
+    case .literal(let literalToken):
+      processResult.element = .literal(processResult.combining(visit(literalToken, passContext: processResult.passContext)))
+    case .self(_): break
     case .variableDeclaration(let variableDeclaration):
       processResult.element = .variableDeclaration(processResult.combining(visit(variableDeclaration, passContext: processResult.passContext)))
     case .subscriptExpression(let subscriptExpression):
@@ -416,6 +418,12 @@ public struct ASTVisitor<Pass: ASTPass> {
     return ASTPassResult(element: postProcessResult.element, diagnostics: processResult.diagnostics + postProcessResult.diagnostics, passContext: postProcessResult.passContext)
   }
 
+  func visit(_ literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    let processResult = pass.process(literalToken: literalToken, passContext: passContext)
+    let postProcessResult = pass.process(literalToken: processResult.element, passContext: processResult.passContext)
+    return ASTPassResult(element: postProcessResult.element, diagnostics: postProcessResult.diagnostics, passContext: passContext)
+  }
+
   func visit(_ subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     var processResult = pass.process(subscriptExpression: subscriptExpression, passContext: passContext)
 

diff --git a/Sources/IRGen/IULIAPreprocessor.swift b/Sources/IRGen/IULIAPreprocessor.swift
@@ -376,6 +376,10 @@ public struct IULIAPreprocessor: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func process(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   public func process(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return ASTPassResult(element: subscriptExpression, diagnostics: [], passContext: passContext)
   }
@@ -481,6 +485,10 @@ public struct IULIAPreprocessor: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func postProcess(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   public func postProcess(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return ASTPassResult(element: subscriptExpression, diagnostics: [], passContext: passContext)
   }

diff --git a/Sources/Optimizer/Optimizer.swift b/Sources/Optimizer/Optimizer.swift
@@ -103,6 +103,10 @@ public struct Optimizer: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func process(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   public func process(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return ASTPassResult(element: subscriptExpression, diagnostics: [], passContext: passContext)
   }
@@ -207,6 +211,10 @@ public struct Optimizer: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func postProcess(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   public func postProcess(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return ASTPassResult(element: subscriptExpression, diagnostics: [], passContext: passContext)
   }

diff --git a/Sources/SemanticAnalyzer/SemanticAnalyzer.swift b/Sources/SemanticAnalyzer/SemanticAnalyzer.swift
@@ -355,6 +355,10 @@ public struct SemanticAnalyzer: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func process(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   /// Whether an expression refers to a state property.
   private func isStorageReference(expression: Expression, scopeContext: ScopeContext) -> Bool {
     switch expression {
@@ -578,6 +582,10 @@ public struct SemanticAnalyzer: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func postProcess(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   public func postProcess(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return ASTPassResult(element: subscriptExpression, diagnostics: [], passContext: passContext)
   }

diff --git a/Sources/SemanticAnalyzer/TypeChecker.swift b/Sources/SemanticAnalyzer/TypeChecker.swift
@@ -176,6 +176,10 @@ public struct TypeChecker: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func process(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   public func process(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return ASTPassResult(element: subscriptExpression, diagnostics: [], passContext: passContext)
   }
@@ -296,6 +300,10 @@ public struct TypeChecker: ASTPass {
     return ASTPassResult(element: dictionaryLiteral, diagnostics: [], passContext: passContext)
   }
 
+  public func postProcess(literalToken: Token, passContext: ASTPassContext) -> ASTPassResult<Token> {
+    return ASTPassResult(element: literalToken, diagnostics: [], passContext: passContext)
+  }
+
   public func postProcess(subscriptExpression: SubscriptExpression, passContext: ASTPassContext) -> ASTPassResult<SubscriptExpression> {
     return ASTPassResult(element: subscriptExpression, diagnostics: [], passContext: passContext)
   }