Merge pull request #62969 from ahoppen/ahoppen/merge-keywords

Adjustments for merging of contextual and lexical keywords

Author: ahoppen

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -75,7 +75,7 @@ extension ASTGenVisitor {
 
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
     let isStateic = false  // TODO: compute this
-    let isLet = node.letOrVarKeyword.tokenKind == .letKeyword
+    let isLet = node.letOrVarKeyword.tokenKind == .keyword(.let)
 
     // TODO: don't drop "initializer" on the floor.
     return .decl(

lib/ASTGen/Sources/ASTGen/Literals.swift

@@ -23,7 +23,7 @@ extension ASTGenVisitor {
 
   public func visit(_ node: BooleanLiteralExprSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
-    let value = node.booleanLiteral == .trueKeyword()
+    let value = node.booleanLiteral == .keyword(.true)
     return .expr(SwiftBooleanLiteralExpr_create(ctx, value, loc))
   }