More compact computed properties

Single-line set/get properties.
Lighter-swift · Nov 10, 2024 · a782b99 · a782b99
1 parent 5c3a333
commit a782b99
Showing 1 changed file with 41 additions and 24 deletions.
diff --git a/Plugins/Libraries/LighterCodeGenAST/Generation/GenFunctions.swift b/Plugins/Libraries/LighterCodeGenAST/Generation/GenFunctions.swift
@@ -272,38 +272,55 @@ public extension CodeGenerator {
     append(string(for: value.type))
 
     let allowSingleReturn = true // make an option?
-    if allowSingleReturn && value.statements.count == 1,
-       value.setStatements.isEmpty,
-       let statement = value.statements.first,
-       case .return(let expression) = statement
-    {
-      append(" { ")
-      appendExpression(expression)
-      append(" }")
-      appendEOL()
-    }
-    else {
-      if value.setStatements.isEmpty {
-        indentedCodeBlock {
-          generateStatements(value.statements, allowSingleReturn: true)
+
+    func genStatements(_ statements: [ Statement ]) {
+      if allowSingleReturn && statements.count == 1,
+         let statement = statements.first,
+         case .return(let expression) = statement
+      {
+        append(" { ")
+        appendExpression(expression)
+        append(" }")
+        appendEOL()
+      }
+      else if statements.count == 1,
+              let statement = statements.first,
+              case .variableAssignment(let instance, let name, let value)
+                = statement
+      {
+        append(" { ")
+        if let instance = instance {
+          append(instance) // "self" can be used here
+          append(".")
         }
+        append(tickedWhenReserved(name))
+        append(configuration.propertyValueSeparator) // " = "
+        appendExpression(value)
+        append(" }")
+        appendEOL()
       }
       else {
         indentedCodeBlock {
-          appendIndent()
-          append("set")
-          indentedCodeBlock {
-            generateStatements(value.setStatements, allowSingleReturn: true)
-          }
-          appendIndent()
-          append("get")
-          indentedCodeBlock {
-            generateStatements(value.statements, allowSingleReturn: true)
-          }
+          generateStatements(statements, allowSingleReturn: allowSingleReturn)
         }
       }
     }
 
+    if value.setStatements.isEmpty {
+      genStatements(value.statements)
+    }
+    else {
+      indentedCodeBlock {
+        appendIndent()
+        append("set")
+        genStatements(value.setStatements)
+
+        appendIndent()
+        append("get")
+        genStatements(value.statements)
+      }
+    }
+
     if let ( major, minor ) = value.minimumSwiftVersion {
       assert(major >= 5)
       writeln("#endif // swift(>=\(major).\(minor))")