Fix NodeType hierarchy.

GayPizzaSpecifications · Sep 4, 2023 · edec706 · edec706
1 parent e49ad7c
commit edec706
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/FunctionDefinition.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/FunctionDefinition.kt
@@ -11,7 +11,7 @@ class FunctionDefinition(
   val arguments: List<Symbol>,
   val block: Block
 ) : Definition() {
-  override val type: NodeType = NodeType.FunctionDeclaration
+  override val type: NodeType = NodeType.FunctionDefinition
 
   override fun <T> visitChildren(visitor: NodeVisitor<T>): List<T> =
     visitor.visitNodes(symbol)

diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeType.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/NodeType.kt
@@ -5,6 +5,7 @@ enum class NodeType(val parent: NodeType? = null) {
   Symbol(Node),
   Expression(Node),
   Declaration(Node),
+  Definition(Node),
   Block(Node),
   CompilationUnit(Node),
   IntLiteral(Expression),
@@ -20,7 +21,7 @@ enum class NodeType(val parent: NodeType? = null) {
   FunctionCall(Expression),
   If(Expression),
   ImportDeclaration(Declaration),
-  FunctionDeclaration(Declaration);
+  FunctionDefinition(Definition);
 
   val parents: Set<NodeType>
 
@@ -37,6 +38,4 @@ enum class NodeType(val parent: NodeType? = null) {
     }
     parents = calculatedParents.toSet()
   }
-
-  fun isa(type: NodeType): Boolean = this == type || parents.contains(type)
 }
diff --git a/frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt b/frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt
@@ -37,6 +37,4 @@ class World(val contentSource: ContentSource) {
     resolveAllImports(unit)
     return unit
   }
-
-  fun units(path: String): Set<CompilationUnit> = resolveAllImports(loadOneUnit(path))
 }