bartek/smnp-kt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable displaying errors with source (files with code)

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2020-03-17 13:34:07 +01:00
parent 0c0982596a
commit 15b77e2c8b
18 changed files with 112 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/io/smnp/interpreter/DefaultInterpreter.kt
View File

@@ -8,7 +8,7 @@ import io.smnp.evaluation.evaluator.RootEvaluator
import io.smnp.evaluation.model.enumeration.EvaluationResult
import java.io.File
class DefaultInterpreter : Interpreter {
class DefaultInterpreter {
private val tokenizer = DefaultTokenizer()
private val parser = RootParser()
private val evaluator = RootEvaluator()
@@ -21,11 +21,12 @@ class DefaultInterpreter : Interpreter {
dryRun: Boolean = false
): Environment {
val lines = code.split("\n")
return run(lines, environment, printTokens, printAst, dryRun)
return run(lines, "<inline>", environment, printTokens, printAst, dryRun)
}
private fun run(
lines: List<String>,
source: String,
environment: Environment,
printTokens: Boolean,
printAst: Boolean,
@@ -33,7 +34,7 @@ class DefaultInterpreter : Interpreter {
): Environment {
environment.loadModule("smnp.lang")
val tokens = tokenizer.tokenize(lines)
val tokens = tokenizer.tokenize(lines, source)
val ast = parser.parse(tokens)
if (printTokens) println(tokens)
@@ -58,8 +59,6 @@ class DefaultInterpreter : Interpreter {
dryRun: Boolean = false
): Environment {
val lines = file.readLines()
return run(lines, environment, printTokens, printAst, dryRun)
return run(lines, file.canonicalPath, environment, printTokens, printAst, dryRun)
}
override fun run(code: String) = run(code, printTokens = false, printAst = false, dryRun = false)
}

8
app/src/main/kotlin/io/smnp/interpreter/LanguageModuleInterpreter.kt → app/src/main/kotlin/io/smnp/interpreter/DefaultLanguageModuleInterpreter.kt
View File

@@ -8,10 +8,8 @@ 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>")
class DefaultLanguageModuleInterpreter : LanguageModuleInterpreter {
private val tokenizer = DefaultTokenizer()
private val parser = RootParser()
private val evaluator = Evaluator.repeat(
@@ -21,9 +19,9 @@ class LanguageModuleInterpreter : Interpreter {
), "function definition or extend statement")
)
override fun run(code: String): Environment {
override fun run(code: String, source: String): Environment {
val lines = code.split("\n")
val tokens = tokenizer.tokenize(lines)
val tokens = tokenizer.tokenize(lines, source)
val ast = parser.parse(tokens)
val environment = DefaultEnvironment()