correcting EMF generation to consider INode and Node

Strumenta · Dec 17, 2023 · e9649e0 · e9649e0
1 parent 44cd316
commit e9649e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/emf/src/main/kotlin/com/strumenta/kolasu/emf/Metamodel.kt b/emf/src/main/kotlin/com/strumenta/kolasu/emf/Metamodel.kt
@@ -6,6 +6,7 @@ import com.strumenta.kolasu.model.Expression
 import com.strumenta.kolasu.model.GenericErrorNode
 import com.strumenta.kolasu.model.INode
 import com.strumenta.kolasu.model.Named
+import com.strumenta.kolasu.model.Node
 import com.strumenta.kolasu.model.PlaceholderElement
 import com.strumenta.kolasu.model.PossiblyNamed
 import com.strumenta.kolasu.model.Range
@@ -87,7 +88,7 @@ val LocalDateHandler = KolasuClassHandler(LocalDate::class, STARLASU_METAMODEL.g
 val LocalTimeHandler = KolasuClassHandler(LocalTime::class, STARLASU_METAMODEL.getEClass("LocalTime"))
 val LocalDateTimeHandler = KolasuClassHandler(LocalDateTime::class, STARLASU_METAMODEL.getEClass("LocalDateTime"))
 
-val NodeHandler = KolasuClassHandler(INode::class, STARLASU_METAMODEL.getEClass("ASTNode"))
+val NodeHandler = KolasuClassHandler(Node::class, STARLASU_METAMODEL.getEClass("ASTNode"))
 val NamedHandler = KolasuClassHandler(Named::class, STARLASU_METAMODEL.getEClass("Named"))
 val RangeHandler = KolasuClassHandler(Range::class, STARLASU_METAMODEL.getEClass("Position"))
 val PossiblyNamedHandler = KolasuClassHandler(PossiblyNamed::class, STARLASU_METAMODEL.getEClass("PossiblyNamed"))

diff --git a/emf/src/main/kotlin/com/strumenta/kolasu/emf/MetamodelBuilder.kt b/emf/src/main/kotlin/com/strumenta/kolasu/emf/MetamodelBuilder.kt
@@ -1,5 +1,6 @@
 package com.strumenta.kolasu.emf
 
+import com.strumenta.kolasu.model.Node
 import com.strumenta.kolasu.model.PropertyTypeDescription
 import com.strumenta.kolasu.model.isANode
 import com.strumenta.kolasu.model.processProperties