Add a "closure" expression

We had inlineClosureCall, but no specific expression for closures.
Lighter-swift · Oct 26, 2024 · e354ce0 · e354ce0
1 parent f163279
commit e354ce0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Plugins/Libraries/LighterCodeGenAST/Generation/GenExpressions.swift b/Plugins/Libraries/LighterCodeGenAST/Generation/GenExpressions.swift
@@ -15,7 +15,7 @@ public extension CodeGenerator {
 
       case .literal, .variableReference, .variablePath,
            .keyPathLookup, .keyPath, .functionCall, .selfInit, .typeInit,
-           .cast, .inlineClosureCall:
+           .cast, .inlineClosureCall, .closure:
         return string(for: expression)
     }
   }
@@ -103,6 +103,12 @@ public extension CodeGenerator {
       case .forceUnwrap(let expression):
         return "\(string(for: expression, wrapIfComplex: true))!"
 
+      case .closure(let statements):
+        return nestedGeneration {
+          indentedCodeBlock(addSpaceIfMissing: false) {
+            generateStatements(statements)
+          }
+        }
       case .inlineClosureCall(let statements):
         return nestedGeneration {
           indentedCodeBlock(endSuffix: "()", addSpaceIfMissing: false) {
@@ -143,6 +149,8 @@ public extension CodeGenerator {
         append(string(for: expression))
       case .varargs: // indent better
         append(string(for: expression))
+      case .closure: // indent better
+        append(string(for: expression))
       case .inlineClosureCall: // indent better
         append(string(for: expression))
       case .functionCall(let call):

diff --git a/Plugins/Libraries/LighterCodeGenAST/Nodes/Expression.swift b/Plugins/Libraries/LighterCodeGenAST/Nodes/Expression.swift
@@ -73,7 +73,10 @@ public indirect enum Expression: Equatable {
   /// `a!`
   case forceUnwrap(Expression)
 
-  /// `{ return 46 + 2 }`
+  /// `{ return 46 + 2 }` (w/o calling it)
+  case closure([ Statement ])
+
+  /// `{ return 46 + 2 }()` (calling it)
   case inlineClosureCall([ Statement ])
 }