renaming + fix type checker

kleis-technology · Jan 27, 2024 · 3f88a14 · 3f88a14
1 parent bdd84ed
commit 3f88a14
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/...nsight/LcaTechnoInputExchangeAnnotator.kt → ...caTerminalTechnoInputExchangeAnnotator.kt b/...nsight/LcaTechnoInputExchangeAnnotator.kt → ...caTerminalTechnoInputExchangeAnnotator.kt
@@ -13,7 +13,7 @@ import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.psi.PsiElement
 
-class LcaTechnoInputExchangeAnnotator : Annotator {
+class LcaTerminalTechnoInputExchangeAnnotator : Annotator {
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
         if (element !is LcaTerminalTechnoInputExchange) {
             return

diff --git a/plugin/src/main/kotlin/ch/kleis/lcaac/plugin/language/type_checker/PsiLcaTypeChecker.kt b/plugin/src/main/kotlin/ch/kleis/lcaac/plugin/language/type_checker/PsiLcaTypeChecker.kt
@@ -2,6 +2,7 @@ package ch.kleis.lcaac.plugin.language.type_checker
 
 import ch.kleis.lcaac.core.lang.dimension.Dimension
 import ch.kleis.lcaac.core.lang.type.*
+import ch.kleis.lcaac.plugin.language.psi.type.PsiBlockForEach
 import ch.kleis.lcaac.plugin.language.psi.type.PsiProcess
 import ch.kleis.lcaac.plugin.language.psi.type.ref.PsiDataRef
 import ch.kleis.lcaac.plugin.language.psi.type.unit.UnitDefinitionType
@@ -21,6 +22,13 @@ class PsiLcaTypeChecker {
             is LcaTerminalTechnoInputExchange -> checkTerminalTechnoInputExchange(element)
             is LcaTechnoProductExchange -> checkTechnoProductExchange(element)
             is LcaTerminalBioExchange -> checkTerminalBioExchange(element)
+
+            // the following checks the type of the data source expression in the block for each
+            is PsiBlockForEach -> {
+                val columns = columnsOf(element.getValue().dataSourceRef)
+                return TRecord(columns.mapValues { checkDataExpression(it.value) })
+            }
+
             else -> throw PsiTypeCheckException("Uncheckable type: $element")
         }
     }
@@ -210,7 +218,8 @@ class PsiLcaTypeChecker {
                         is TQuantity -> ty
                         is TUnit -> TQuantity(ty.dimension)
                         is TString -> ty
-                        else -> throw PsiTypeCheckException("expected TQuantity, TUnit or TString, found $ty")
+                        is TRecord -> ty
+                        else -> throw PsiTypeCheckException("expected TQuantity, TUnit, TString or TRecord, found $ty")
                     }
                 }
                 ?: throw PsiTypeCheckException("unbound reference ${el.name}")

diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
@@ -44,7 +44,7 @@
 
         <annotator
                 language="LCA"
-                implementationClass="ch.kleis.lcaac.plugin.language.ide.insight.LcaTechnoInputExchangeAnnotator"/>
+                implementationClass="ch.kleis.lcaac.plugin.language.ide.insight.LcaTerminalTechnoInputExchangeAnnotator"/>
         <annotator
                 language="LCA"
                 implementationClass="ch.kleis.lcaac.plugin.language.ide.insight.LcaProcessAnnotator"/>

diff --git a/...ht/LcaTechnoInputExchangeAnnotatorTest.kt → ...rminalTechnoInputExchangeAnnotatorTest.kt b/...ht/LcaTechnoInputExchangeAnnotatorTest.kt → ...rminalTechnoInputExchangeAnnotatorTest.kt
@@ -1,7 +1,6 @@
 package ch.kleis.lcaac.plugin.language.ide.insight
 
 import ch.kleis.lcaac.plugin.language.psi.stub.process.ProcessStubKeyIndex
-import ch.kleis.lcaac.plugin.psi.LcaTerminalTechnoInputExchange
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
@@ -12,7 +11,7 @@ import org.junit.runners.JUnit4
 
 @Suppress("DialogTitleCapitalization")
 @RunWith(JUnit4::class)
-class LcaTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
+class LcaTerminalTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
 
     override fun getTestDataPath(): String {
         return "testdata"
@@ -36,7 +35,7 @@ class LcaTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val mock = AnnotationHolderMock()
-        val annotator = LcaTechnoInputExchangeAnnotator()
+        val annotator = LcaTerminalTechnoInputExchangeAnnotator()
 
 
         // when
@@ -79,7 +78,7 @@ class LcaTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val mock = AnnotationHolderMock()
-        val annotator = LcaTechnoInputExchangeAnnotator()
+        val annotator = LcaTerminalTechnoInputExchangeAnnotator()
 
 
         // when
@@ -116,7 +115,7 @@ class LcaTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val mock = AnnotationHolderMock()
-        val annotator = LcaTechnoInputExchangeAnnotator()
+        val annotator = LcaTerminalTechnoInputExchangeAnnotator()
 
 
         // when
@@ -156,7 +155,7 @@ class LcaTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val mock = AnnotationHolderMock()
-        val annotator = LcaTechnoInputExchangeAnnotator()
+        val annotator = LcaTerminalTechnoInputExchangeAnnotator()
 
 
         // when
@@ -201,7 +200,7 @@ class LcaTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first().terminalTechnoInputExchange!!
         val mock = AnnotationHolderMock()
-        val annotator = LcaTechnoInputExchangeAnnotator()
+        val annotator = LcaTerminalTechnoInputExchangeAnnotator()
 
 
         // when
@@ -237,7 +236,7 @@ class LcaTechnoInputExchangeAnnotatorTest : BasePlatformTestCase() {
         val element = ProcessStubKeyIndex.findProcesses(project, "$pkgName.p").first()
             .getInputs().first()
         val mock = AnnotationHolderMock()
-        val annotator = LcaTechnoInputExchangeAnnotator()
+        val annotator = LcaTerminalTechnoInputExchangeAnnotator()
 
         // when
         annotator.annotate(element, mock.holder)