Merge pull request #10 from samtkit/semantic-validation

Semantic validation

Author: PascalHonegger

.github/workflows/build-and-test.yml

@@ -17,11 +17,8 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       - name: Verify
-        run: ./gradlew --no-daemon check koverMergedHtmlReport koverMergedVerify
-      - name: Archive code coverage results
-        uses: actions/upload-artifact@v3
-        with:
-          name: code-coverage-report
-          path: build/reports/kover/merged/html/
+        run: ./gradlew --no-daemon koverMergedVerify

.github/workflows/gradle-dependency-submission.yml

@@ -15,7 +15,8 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - name: Run snapshot action
         uses: mikepenz/gradle-dependency-submission@main

.github/workflows/qodana-scan.yml

@@ -19,12 +19,13 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - name: Build
         run: ./gradlew --no-daemon build -x test
 
-      - uses: JetBrains/qodana-action@v2022.3.4
+      - uses: JetBrains/qodana-action@v2023.1.0
         with:
           pr-mode: false
           cache-default-branch-only: true

.github/workflows/security-scanning.yml

@@ -39,7 +39,8 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - name: Build
         run: ./gradlew --no-daemon build -x test

.idea/kotlinc.xml

@@ -1,5 +1,4 @@
 plugins {
-    @Suppress("DSL_SCOPE_VIOLATION") // Fixed in Gradle 8.1, see https://github.com/gradle/gradle/issues/22797
     alias(libs.plugins.kover)
 }
 

build.gradle.kts

@@ -2,8 +2,12 @@ plugins {
     `kotlin-dsl`
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
-    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.10")
+    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.21")
 }
 
 repositories {

buildSrc/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     application
     id("samt-core.kotlin-conventions")
-    @Suppress("DSL_SCOPE_VIOLATION") // Fixed in Gradle 8.1, see https://github.com/gradle/gradle/issues/22797
     alias(libs.plugins.shadow)
 }
 
@@ -11,6 +10,7 @@ dependencies {
     implementation(project(":common"))
     implementation(project(":lexer"))
     implementation(project(":parser"))
+    implementation(project(":semantic"))
 }
 
 application {

cli/build.gradle.kts

@@ -1,9 +1,9 @@
 package tools.samt.cli
 
-import tools.samt.parser.*
-
 import com.github.ajalt.mordant.rendering.TextColors.*
-import com.github.ajalt.mordant.rendering.TextStyles.*
+import com.github.ajalt.mordant.rendering.TextStyles.bold
+import com.github.ajalt.mordant.rendering.TextStyles.underline
+import tools.samt.parser.*
 
 object ASTPrinter {
     fun dump(node: Node): String = buildString {
@@ -58,7 +58,7 @@ object ASTPrinter {
     }
 
     private fun dumpInfo(node: Node): String? = when (node) {
-        is FileNode -> gray(node.filePath)
+        is FileNode -> gray(node.sourceFile.absolutePath)
         is RequestResponseOperationNode -> if (node.isAsync) red("async") else null
         is IdentifierNode -> yellow(node.name)
         is ImportBundleIdentifierNode -> yellow(node.name) + if (node.isWildcard) yellow(".*") else ""

cli/src/main/kotlin/tools/samt/cli/ASTPrinter.kt

@@ -5,6 +5,7 @@ import com.beust.jcommander.JCommander
 import com.github.ajalt.mordant.terminal.Terminal
 import tools.samt.common.DiagnosticController
 import tools.samt.common.SourceFile
+import tools.samt.semantic.SemanticModelBuilder
 import java.io.File
 
 fun main(args: Array<String>) {
@@ -85,8 +86,11 @@ fun main(args: Array<String>) {
                 t.print(ASTPrinter.dump(it))
             }
         }
+
+        // build up the semantic model from the AST
+        SemanticModelBuilder.build(fileNodes, controller)
     }
 
     val currentTimestamp = System.currentTimeMillis()
     t.println(DiagnosticFormatter.format(diagnosticController, startTimestamp, currentTimestamp, terminalWidth = t.info.width))
-}
+}