Skip to content

Commit

Permalink
Added operator folding
Browse files Browse the repository at this point in the history
  • Loading branch information
@max-leuthaeuser
max-leuthaeuser committed Oct 31, 2023
1 parent 960e64a commit df1c5bc
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 38 deletions.
1 change: 1 addition & 0 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ let package = Package(
dependencies: [
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftParser", package: "swift-syntax"),
.product(name: "SwiftOperators", package: "swift-syntax"),
"CodeGeneration",
]
),
Expand Down
7 changes: 5 additions & 2 deletions Sources/SwiftAstGenLib/SyntaxParser.swift
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Foundation
import SwiftParser
import SwiftOperators
@_spi(RawSyntax) import SwiftSyntax

extension SyntaxProtocol {
Expand Down Expand Up @@ -56,10 +57,12 @@ struct SyntaxParser {
prettyPrint: Bool
) throws -> String {
let code = try String(contentsOf: fileUrl)
let opPrecedence = OperatorTable.standardOperators
let ast = Parser.parse(source: code)
let folded = try opPrecedence.foldAll(ast)

let locationConverter = SourceLocationConverter(fileName: fileUrl.path, tree: ast)
let treeNode = ast.toJson(converter: locationConverter)
let locationConverter = SourceLocationConverter(fileName: fileUrl.path, tree: folded)
let treeNode = folded.toJson(converter: locationConverter)

treeNode.projectFullPath = srcDir.standardized.resolvingSymlinksInPath().path
treeNode.fullFilePath = fileUrl.standardized.resolvingSymlinksInPath().path
Expand Down
121 changes: 85 additions & 36 deletions Tests/ScalaSwiftNodeSyntaxTests/src/test/scala/SwiftNodeSyntaxTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ import better.files.*
import scala.sys.process.*
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import org.scalatest.BeforeAndAfterAll
import SwiftNodeSyntax.SourceFileSyntax
import SwiftNodeSyntax._

import java.util.concurrent.ConcurrentLinkedQueue
import scala.jdk.CollectionConverters._

class SwiftNodeSyntaxTest extends AnyWordSpec with Matchers with BeforeAndAfterAll {
class SwiftNodeSyntaxTest extends AnyWordSpec with Matchers {

private val shellPrefix: Seq[String] =
if (scala.util.Properties.isWin) "cmd" :: "/c" :: Nil else "sh" :: "-c" :: Nil
Expand All @@ -34,49 +33,99 @@ class SwiftNodeSyntaxTest extends AnyWordSpec with Matchers with BeforeAndAfterA
"SwiftAstGen-linux"
}

private val testFiles: Map[String, String] = Map("main.swift" -> "var x = 1")

private val projectUnderTest: File = {
val dir = File.newTemporaryDirectory("swiftastgentests")
testFiles.foreach { case (testFile, content) =>
val file = dir / testFile
file.createIfNotExists(createParents = true)
file.write(content)
}
dir
}

private def runSwiftAstGen(): Unit = {
private def runSwiftAstGen(projectUnderTest: File): Unit = {
val path = (File(".").parent.parent / executableName).toJava.toPath.normalize.toAbsolutePath.toString
println("Running: " + path)
run(path, projectUnderTest.pathAsString)
}

override def beforeAll(): Unit = runSwiftAstGen()

override def afterAll(): Unit = projectUnderTest.delete(swallowIOExceptions = true)

"Using the SwiftNodeSyntax API" should {

"allow to grab a SourceFileSyntax node and its content" in {
testFiles.foreach { case (testFile, _) =>
val lines = (projectUnderTest / "ast_out" / s"$testFile.json").contentAsString
val json = ujson.read(lines)
val sourceFileSyntax = SwiftNodeSyntax.createSwiftNode(json).asInstanceOf[SourceFileSyntax]
val Seq(codeBlock) = sourceFileSyntax.statements.children
codeBlock.item match {
case v: VariableDeclSyntax =>
v.bindings.children.head.pattern match {
case ident: IdentifierPatternSyntax =>
ident.identifier match {
case identifier(json) => json("tokenKind").str shouldBe "identifier(\"x\")"
case other => fail("Should have a token identifier here but got: " + other)
}
case other => fail("Should have a IdentifierPatternSyntax here but got: " + other)
}
case other => fail("Should have a VariableDeclSyntax here but got: " + other)
}
val projectUnderTest: File = File.newTemporaryDirectory("swiftastgentests")
val testFile = projectUnderTest / "main.swift"
val testContent = "var x = 1"
testFile.createIfNotExists(createParents = true)
testFile.write(testContent)
runSwiftAstGen(projectUnderTest)

val lines = (projectUnderTest / "ast_out" / s"${testFile.name}.json").contentAsString
val json = ujson.read(lines)
val sourceFileSyntax = SwiftNodeSyntax.createSwiftNode(json).asInstanceOf[SourceFileSyntax]

val Seq(codeBlock) = sourceFileSyntax.statements.children
codeBlock.item match {
case v: VariableDeclSyntax =>
v.bindings.children.head.pattern match {
case ident: IdentifierPatternSyntax =>
ident.identifier match {
case identifier(json) => json("tokenKind").str shouldBe "identifier(\"x\")"
case other => fail("Should have a token identifier here but got: " + other)
}
case other => fail("Should have a IdentifierPatternSyntax here but got: " + other)
}
case other => fail("Should have a VariableDeclSyntax here but got: " + other)
}

projectUnderTest.delete(swallowIOExceptions = true)
}

"allow to grab a binary expression with operator folding" in {
val projectUnderTest: File = File.newTemporaryDirectory("swiftastgentests")
val testFile = projectUnderTest / "main.swift"
val testContent = "1 + 2 * 3"
testFile.createIfNotExists(createParents = true)
testFile.write(testContent)
runSwiftAstGen(projectUnderTest)

val lines = (projectUnderTest / "ast_out" / s"${testFile.name}.json").contentAsString
val json = ujson.read(lines)
val sourceFileSyntax = SwiftNodeSyntax.createSwiftNode(json).asInstanceOf[SourceFileSyntax]

val Seq(codeBlock) = sourceFileSyntax.statements.children
codeBlock.item match {
case v: InfixOperatorExprSyntax =>
val leftExpr = v.leftOperand
val op = v.operator
val rightExpr = v.rightOperand

leftExpr shouldBe a[IntegerLiteralExprSyntax]
leftExpr.asInstanceOf[IntegerLiteralExprSyntax].literal match {
case integerLiteral(json) => json("tokenKind").str shouldBe """integerLiteral("1")"""
case other => fail("Should have a integerLiteral here but got: " + other)
}
op shouldBe a[BinaryOperatorExprSyntax]
op.asInstanceOf[BinaryOperatorExprSyntax].operator match {
case binaryOperator(json) => json("tokenKind").str shouldBe """binaryOperator("+")"""
case other => fail("Should have a binaryOperator here but got: " + other)
}
rightExpr match {
case v: InfixOperatorExprSyntax =>
val leftExpr = v.leftOperand
val op = v.operator
val rightExpr = v.rightOperand

leftExpr shouldBe a[IntegerLiteralExprSyntax]
leftExpr.asInstanceOf[IntegerLiteralExprSyntax].literal match {
case integerLiteral(json) => json("tokenKind").str shouldBe """integerLiteral("2")"""
case other => fail("Should have a integerLiteral here but got: " + other)
}
op shouldBe a[BinaryOperatorExprSyntax]
op.asInstanceOf[BinaryOperatorExprSyntax].operator match {
case binaryOperator(json) => json("tokenKind").str shouldBe """binaryOperator("*")"""
case other => fail("Should have a binaryOperator here but got: " + other)
}
rightExpr shouldBe a[IntegerLiteralExprSyntax]
rightExpr.asInstanceOf[IntegerLiteralExprSyntax].literal match {
case integerLiteral(json) => json("tokenKind").str shouldBe """integerLiteral("3")"""
case other => fail("Should have a integerLiteral here but got: " + other)
}
case other => fail("Should have a InfixOperatorExprSyntax here but got: " + other)
}
case other => fail("Should have a InfixOperatorExprSyntax here but got: " + other)
}

projectUnderTest.delete(swallowIOExceptions = true)
}

}
Expand Down

0 comments on commit df1c5bc

Please sign in to comment.