strips/pork
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/pork.git synced 2025-08-03 21:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

language: introduce the requirement to use return to return a value from a function

Browse Source
This commit is contained in:
Alex Zenla
2023-11-21 04:28:46 -08:00
parent 5540918e7c
commit 0a2d029c5c
27 changed files with 115 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
evaluator/src/main/kotlin/gay/pizza/pork/evaluator/BlockFunction.kt
View File

@ -1,5 +1,5 @@
package gay.pizza.pork.evaluator
abstract class BlockFunction {
abstract fun call(): Any
abstract fun call(isFunctionContext: Boolean): Any
}

15
evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationVisitor.kt
View File

@ -28,7 +28,7 @@ class EvaluationVisitor(root: Scope, val stack: CallStack) : FunctionLevelVisito
scoped(reuseScope, node = node) {
currentScope.define(node.item.symbol.id, item ?: None)
result = blockFunction.call()
result = blockFunction.call(false)
}
} catch (_: BreakMarker) {
break
@ -90,7 +90,7 @@ class EvaluationVisitor(root: Scope, val stack: CallStack) : FunctionLevelVisito
if (reuseScope == null) {
reuseScope = currentScope.fork(name = "While")
}
scoped(reuseScope, node = node) { result = blockFunction.call() }
scoped(reuseScope, node = node) { result = blockFunction.call(false) }
} catch (_: BreakMarker) {
break
} catch (_: ContinueMarker) {
@ -122,6 +122,8 @@ class EvaluationVisitor(root: Scope, val stack: CallStack) : FunctionLevelVisito
}
}
override fun visitReturn(node: Return): Any = ReturnValue(node.value.visit(this))
private fun unaryNumericOperation(node: PrefixOperation, value: Number) = when (value) {
is Double -> {
unaryNumericOperation(
@ -186,10 +188,10 @@ class EvaluationVisitor(root: Scope, val stack: CallStack) : FunctionLevelVisito
val condition = node.condition.visit(this)
return if (condition == true) {
val blockFunction = node.thenBlock.visit(this) as BlockFunction
scoped(node = node) { blockFunction.call() }
scoped(node = node) { blockFunction.call(false) }
} else if (node.elseBlock != null) {
val blockFunction = node.elseBlock!!.visit(this) as BlockFunction
scoped(node = node) { blockFunction.call() }
scoped(node = node) { blockFunction.call(false) }
} else None
}
@ -370,10 +372,13 @@ class EvaluationVisitor(root: Scope, val stack: CallStack) : FunctionLevelVisito
override fun visitBlock(node: Block): BlockFunction {
val visitor = this
return object : BlockFunction() {
override fun call(): Any {
override fun call(isFunctionContext: Boolean): Any {
var value: Any? = null
for (expression in node.expressions) {
value = expression.visit(visitor)
if (isFunctionContext && value is ReturnValue) {
return value.value
}
}
return value ?: None
}

2
evaluator/src/main/kotlin/gay/pizza/pork/evaluator/FunctionContext.kt
View File

@ -40,7 +40,7 @@ class FunctionContext(val slabContext: SlabContext, val node: FunctionDefinition
stack.push(this)
val blockFunction = visitor.visitBlock(node.block!!)
try {
return blockFunction.call()
return blockFunction.call(true)
} catch (e: PorkError) {
throw e
} catch (e: Exception) {

3
evaluator/src/main/kotlin/gay/pizza/pork/evaluator/ReturnValue.kt Normal file
View File

@ -0,0 +1,3 @@
package gay.pizza.pork.evaluator
class ReturnValue(val value: Any)