Cleanups

joernio · Oct 25, 2023 · 584e960 · 584e960
1 parent 61e33bf
commit 584e960
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/Package.swift b/Package.swift
@@ -19,9 +19,7 @@ let package = Package(
       name: "SwiftAstGenLib",
       dependencies: [
         .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftOperators", package: "swift-syntax"),
         .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
         "CodeGeneration",
       ]
     ),
@@ -30,13 +28,14 @@ let package = Package(
       dependencies: [
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "SwiftOperators", package: "swift-syntax"),
-        .product(name: "SwiftParser", package: "swift-syntax"),
       ]
     ),
     .executableTarget(
       name: "SwiftAstGen",
-      dependencies: ["SwiftAstGenLib"],
+      dependencies: [
+        .product(name: "ArgumentParser", package: "swift-argument-parser"),
+        "SwiftAstGenLib",
+      ],
       swiftSettings: [
         .unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))
       ]

diff --git a/README.md b/README.md
@@ -25,12 +25,13 @@ The AST is created by using SwiftSyntax.
 
 ```bash
 > SwiftAstGen -h
-USAGE: swift-ast-gen [--src <src>] [--output <output>] [--prettyPrint]
+USAGE: swift-ast-gen [--src <src>] [--output <output>] [--prettyPrint] [--scalaAstOnly]
 
 OPTIONS:
   -i, --src <src>         Source directory (default: `.`).
   -o, --output <output>   Output directory for generated AST json files (default: `./ast_out`).
-  -p, --prettyPrint       Pretty print the generated AST json files (default: `false`).
+  -p, --prettyPrint       Pretty print the generated AST json files.
+  -s, --scalaAstOnly      Only print the generated Scala SwiftSyntax AST nodes.
   -h, --help              Show help information.
 ```
 

diff --git a/Sources/SwiftAstGen/SwiftAstGen.swift b/Sources/SwiftAstGen/SwiftAstGen.swift
@@ -20,12 +20,12 @@ struct SwiftAstGen: ParsableCommand {
 
   @Flag(
     name: [.customLong("prettyPrint"), .customShort("p")],
-    help: "Pretty print the generated AST json files (default: `false`).")
+    help: "Pretty print the generated AST json files.")
   var prettyPrint: Bool = false
 
   @Flag(
     name: [.customLong("scalaAstOnly"), .customShort("s")],
-    help: "Only print the generated Scala SwiftSyntax AST nodes (default: `false`).")
+    help: "Only print the generated Scala SwiftSyntax AST nodes.")
   var scalaAstOnly: Bool = false
 
   func validate() throws {

diff --git a/Sources/SwiftAstGenLib/ScalaAstGenerator.swift b/Sources/SwiftAstGenLib/ScalaAstGenerator.swift
@@ -80,7 +80,7 @@ public class ScalaAstGenerator {
             let returnType = isOptional ? "Option[Value]" : "Value"
             let returnAccess = isOptional ? "" : ".head"
             return
-              "\tdef \(name): \(returnType) = json(\"children\").arr.toList.find(_(\"name\").str == \"\(name)\")\(returnAccess)"
+              "\tdef \(name): \(returnType) = json(\"children\").arr.toList.find(_(\"name\").str == \"\(child.varOrCaseName)\")\(returnAccess)"
           }.joined(separator: "\n\t")
       } else {
         childrenString = "\tdef children: Seq[Value] = json(\"children\").arr.toList"
@@ -101,9 +101,6 @@ public class ScalaAstGenerator {
       var containedInDocString = String(describing: node.containedIn)
       containedInDocString = containedInDocString.replacingOccurrences(of: "\n", with: "\n\t")
 
-      var subTypesDocString = String(describing: node.subtypes)
-      subTypesDocString = subTypesDocString.replacingOccurrences(of: "\n", with: "\n\t")
-
       return """
         \n\t/// ### Documentation
         \t///
@@ -112,8 +109,6 @@ public class ScalaAstGenerator {
         \t\(childrenDocString)
         \t///
         \t\(containedInDocString.isEmpty ? "/// ### Nowhere contained in" : containedInDocString)
-        \t///
-        \t\(subTypesDocString.isEmpty ? "/// ### No Subtypes" : subTypesDocString)
         \tcase class \(syntaxType)(json: Value) \(inheritsString) {
           \(childrenString)
         \t}