Add support for providing modules written in SMNP language (LanguageModuleProvider extension class)

app/src/main/kotlin/io/smnp/environment/DefaultEnvironment.kt

@@ -4,13 +4,13 @@ import io.smnp.callable.function.Function
 import io.smnp.callable.method.Method
 import io.smnp.callable.signature.ActualSignatureFormatter.format
 import io.smnp.ext.DefaultModuleRegistry.requestModulesForPath
-import io.smnp.ext.ModuleDefinition
+import io.smnp.ext.ModuleProvider
+import io.smnp.interpreter.LanguageModuleInterpreter
 import io.smnp.runtime.model.CallStack
 import io.smnp.type.model.Value
 import io.smnp.type.module.Module
 
-class DefaultEnvironment : Environment {
-   private val rootModule = Module("<root>")
+class DefaultEnvironment(private val rootModule: Module = Module.create("<root>")) : Environment {
    private val loadedModules = mutableListOf<String>()
    private val callStack = CallStack()
 
@@ -25,13 +25,13 @@ class DefaultEnvironment : Environment {
       }
    }
 
-   private fun loadModule(moduleDefinition: ModuleDefinition) {
-      rootModule.addSubmodule(moduleDefinition.module())
-      loadedModules.add(moduleDefinition.path)
+   private fun loadModule(moduleProvider: ModuleProvider) {
+      rootModule.addSubmodule(moduleProvider.provideModule(LanguageModuleInterpreter()))
+      loadedModules.add(moduleProvider.path)
    }
 
-   private fun loadDependencies(moduleDefinition: ModuleDefinition) {
-      moduleDefinition.dependencies().forEach { dependencyPath ->
+   private fun loadDependencies(moduleProvider: ModuleProvider) {
+      moduleProvider.dependencies().forEach { dependencyPath ->
          if (!loadedModules.contains(dependencyPath)) {
             val dependency = requestModulesForPath(dependencyPath)
             loadModule(dependency)

app/src/main/kotlin/io/smnp/evaluation/evaluator/Evaluator.kt

@@ -8,49 +8,66 @@ import io.smnp.evaluation.model.enumeration.EvaluationResult
 import kotlin.reflect.KClass
 
 abstract class Evaluator {
-    fun evaluate(node: Node, environment: Environment): EvaluatorOutput {
-        if(supportedNodes().any { it.isInstance(node) }) {
-            return tryToEvaluate(node, environment)
-        }
+   fun evaluate(node: Node, environment: Environment): EvaluatorOutput {
+      if (supportedNodes().any { it.isInstance(node) }) {
+         return tryToEvaluate(node, environment)
+      }
 
-        return EvaluatorOutput.fail()
-    }
+      return EvaluatorOutput.fail()
+   }
 
-    protected abstract fun supportedNodes(): List<KClass<out Node>>
-    protected abstract fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput
+   protected abstract fun supportedNodes(): List<KClass<out Node>>
+   protected abstract fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput
 
-    companion object {
-        fun oneOf(vararg evaluators: Evaluator): Evaluator {
-            return object : Evaluator() {
-                override fun supportedNodes() = listOf(Node::class)
+   companion object {
+      fun oneOf(vararg evaluators: Evaluator): Evaluator {
+         return object : Evaluator() {
+            override fun supportedNodes() = listOf(Node::class)
 
-                override fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput {
-                    for(evaluator in evaluators) {
-                        val output = evaluator.evaluate(node, environment)
-                        if(output.result != EvaluationResult.FAILED) {
-                            return output
-                        }
-                    }
+            override fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput {
+               for (evaluator in evaluators) {
+                  val output = evaluator.evaluate(node, environment)
+                  if (output.result != EvaluationResult.FAILED) {
+                     return output
+                  }
+               }
 
-                    return EvaluatorOutput.fail()
-                }
+               return EvaluatorOutput.fail()
             }
-        }
+         }
+      }
 
-        fun assert(evaluator: Evaluator, expected: String): Evaluator {
-            return object : Evaluator() {
-                override fun supportedNodes() = listOf(Node::class)
+      fun repeat(evaluator: Evaluator): Evaluator {
+         return object : Evaluator() {
+            override fun supportedNodes() = listOf(Node::class)
 
-                override fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput {
-                    val output = evaluator.evaluate(node, environment)
+            override fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput {
+               for (child in node.children) {
+                  val output = evaluator.evaluate(child, environment)
+                  if (output.result == EvaluationResult.FAILED) {
+                     return EvaluatorOutput.fail()
+                  }
+               }
 
-                    if(output.result == EvaluationResult.FAILED) {
-                        throw EvaluationException("Expected $expected", node.position)
-                    }
-
-                    return output
-                }
+               return EvaluatorOutput.ok()
             }
-        }
-    }
+         }
+      }
+
+      fun assert(evaluator: Evaluator, expected: String): Evaluator {
+         return object : Evaluator() {
+            override fun supportedNodes() = listOf(Node::class)
+
+            override fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput {
+               val output = evaluator.evaluate(node, environment)
+
+               if (output.result == EvaluationResult.FAILED) {
+                  throw EvaluationException("Expected $expected", node.position)
+               }
+
+               return output
+            }
+         }
+      }
+   }
 }

app/src/main/kotlin/io/smnp/evaluation/evaluator/RootEvaluator.kt

@@ -4,27 +4,17 @@ import io.smnp.dsl.ast.model.node.Node
 import io.smnp.dsl.ast.model.node.RootNode
 import io.smnp.environment.Environment
 import io.smnp.evaluation.model.entity.EvaluatorOutput
-import io.smnp.evaluation.model.enumeration.EvaluationResult
 
 class RootEvaluator : Evaluator() {
     override fun supportedNodes() = listOf(RootNode::class)
 
     override fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput {
-        val evaluator = assert(oneOf(
+        return repeat(assert(oneOf(
             ImportEvaluator(),
             ExpressionEvaluator(),
             FunctionDefinitionEvaluator(),
             ExtendEvaluator(),
             DefaultEvaluator()
-        ), "correct statement")
-
-        for(child in node.children) {
-            val output = evaluator.evaluate(child, environment)
-            if(output.result == EvaluationResult.FAILED) {
-                return EvaluatorOutput.fail()
-            }
-        }
-
-        return EvaluatorOutput.ok()
+        ), "correct statement")).evaluate(node, environment)
     }
 }

app/src/main/kotlin/io/smnp/ext/DefaultModuleRegistry.kt

@@ -3,18 +3,18 @@ package io.smnp.ext
 import org.pf4j.DefaultPluginManager
 
 object DefaultModuleRegistry : ModuleRegistry {
-    private val modules = mutableMapOf<String, ModuleDefinition>()
+    private val modules = mutableMapOf<String, ModuleProvider>()
     init {
         val pluginManager = DefaultPluginManager()
         pluginManager.loadPlugins()
         pluginManager.startPlugins()
 
-        pluginManager.getExtensions(ModuleDefinition::class.java).forEach {
+        pluginManager.getExtensions(ModuleProvider::class.java).forEach {
             modules[it.path] = it
         }
     }
 
-    override fun requestModulesForPath(path: String): ModuleDefinition {
+    override fun requestModulesForPath(path: String): ModuleProvider {
         return modules[path] ?: throw RuntimeException("Module $path not found")
     }
 

app/src/main/kotlin/io/smnp/interpreter/DefaultInterpreter.kt

@@ -8,7 +8,7 @@ import io.smnp.evaluation.evaluator.RootEvaluator
 import io.smnp.evaluation.model.enumeration.EvaluationResult
 import java.io.File
 
-class Interpreter {
+class DefaultInterpreter : Interpreter {
     private val tokenizer = DefaultTokenizer()
     private val parser = RootParser()
     private val evaluator = RootEvaluator()
@@ -46,4 +46,6 @@ class Interpreter {
         val lines = file.readLines()
         run(lines, printTokens, printAst, dryRun)
     }
+
+    override fun run(code: String) = run(code, printTokens = false, printAst = false, dryRun = false)
 }

app/src/main/kotlin/io/smnp/interpreter/LanguageModuleInterpreter.kt

@@ -0,0 +1,47 @@
+package io.smnp.interpreter
+
+import io.smnp.dsl.ast.parser.RootParser
+import io.smnp.dsl.token.tokenizer.DefaultTokenizer
+import io.smnp.environment.DefaultEnvironment
+import io.smnp.environment.Environment
+import io.smnp.evaluation.evaluator.Evaluator
+import io.smnp.evaluation.evaluator.ExtendEvaluator
+import io.smnp.evaluation.evaluator.FunctionDefinitionEvaluator
+import io.smnp.evaluation.model.enumeration.EvaluationResult
+import io.smnp.type.module.Module
+
+class LanguageModuleInterpreter : Interpreter {
+   private var rootModule = Module.create("<root>")
+   private val tokenizer = DefaultTokenizer()
+   private val parser = RootParser()
+   private val evaluator = Evaluator.repeat(
+      Evaluator.assert(Evaluator.oneOf(
+         FunctionDefinitionEvaluator(),
+         ExtendEvaluator()
+      ), "function definition or extend statement")
+   )
+
+   override fun updateRootModule(newRootModule: Module) {
+      rootModule = newRootModule
+   }
+
+   override fun run(code: String) {
+      val lines = code.split("\n")
+      val tokens = tokenizer.tokenize(lines)
+      val ast = parser.parse(tokens)
+
+      val environment = createEnvironment()
+      val result = evaluator.evaluate(ast.node, environment)
+
+      if (result.result == EvaluationResult.FAILED) {
+         throw RuntimeException("Evaluation failed")
+      }
+   }
+
+   private fun createEnvironment(): Environment {
+      val environment = DefaultEnvironment(rootModule)
+      environment.loadModule("smnp.lang")
+
+      return environment
+   }
+}