Merge pull request #23 from 422404/feature/print-only-exception-message

Print Actor Lang runtime exception messages instead of stacktraces
422404 · Jun 10, 2021 · 0ea52b3 · 0ea52b3
2 parents 50d04a9 + b75bbf7
commit 0ea52b3
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 13 deletions.
diff --git a/src/main/kotlin/org/actorlang/exceptions/ActorLangRuntimeException.kt b/src/main/kotlin/org/actorlang/exceptions/ActorLangRuntimeException.kt
@@ -0,0 +1,3 @@
+package org.actorlang.exceptions
+
+open class ActorLangRuntimeException(msg: String) : Exception(msg)
diff --git a/src/main/kotlin/org/actorlang/interpreter/comms/CommunicationsManager.kt b/src/main/kotlin/org/actorlang/interpreter/comms/CommunicationsManager.kt
@@ -1,7 +1,7 @@
 package org.actorlang.interpreter.comms
 
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.Context
-import org.actorlang.interpreter.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.objects.Actor
 import kotlin.random.Random
 

diff --git a/src/main/kotlin/org/actorlang/interpreter/eval/AbstractEvaluator.kt b/src/main/kotlin/org/actorlang/interpreter/eval/AbstractEvaluator.kt
@@ -19,11 +19,11 @@ import org.actorlang.ast.StringLiteralNode
 import org.actorlang.ast.UnaryOpNode
 import org.actorlang.ast.UnaryOpType
 import org.actorlang.ast.visitor.BaseAstVisitor
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.Context
 import org.actorlang.interpreter.comms.Message
 import org.actorlang.interpreter.eval.scopes.BaseScope
 import org.actorlang.interpreter.eval.scopes.Scope
-import org.actorlang.interpreter.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.objects.Actor
 import org.actorlang.parser.Position
 import java.util.LinkedList

diff --git a/src/main/kotlin/org/actorlang/interpreter/eval/BehaviorEvaluator.kt b/src/main/kotlin/org/actorlang/interpreter/eval/BehaviorEvaluator.kt
@@ -4,11 +4,11 @@ import org.actorlang.ast.BecomeNode
 import org.actorlang.ast.BehaviorNode
 import org.actorlang.ast.IdentifierNode
 import org.actorlang.ast.SelfLiteralNode
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.Context
 import org.actorlang.interpreter.eval.scopes.ActorScope
 import org.actorlang.interpreter.eval.scopes.BaseScope
 import org.actorlang.interpreter.eval.scopes.Scope
-import org.actorlang.interpreter.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.exceptions.ChangeActorTypeException
 import org.actorlang.interpreter.objects.Actor
 

diff --git a/src/main/kotlin/org/actorlang/interpreter/eval/scopes/ActorScope.kt b/src/main/kotlin/org/actorlang/interpreter/eval/scopes/ActorScope.kt
@@ -1,6 +1,6 @@
 package org.actorlang.interpreter.eval.scopes
 
-import org.actorlang.interpreter.exceptions.ActorLangRuntimeException
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.objects.Actor
 
 class ActorScope(

diff --git a/src/main/kotlin/org/actorlang/interpreter/eval/scopes/BaseScope.kt b/src/main/kotlin/org/actorlang/interpreter/eval/scopes/BaseScope.kt
@@ -1,6 +1,6 @@
 package org.actorlang.interpreter.eval.scopes
 
-import org.actorlang.interpreter.exceptions.ActorLangRuntimeException
+import org.actorlang.exceptions.ActorLangRuntimeException
 
 class BaseScope(parent: Scope?) : Scope(parent) {
     private val vars = mutableMapOf<String, Any>()

diff --git a/src/main/kotlin/org/actorlang/interpreter/exceptions/ActorLangRuntimeException.kt b/src/main/kotlin/org/actorlang/interpreter/exceptions/ActorLangRuntimeException.kt
diff --git a/src/main/kotlin/org/actorlang/interpreter/objects/Actor.kt b/src/main/kotlin/org/actorlang/interpreter/objects/Actor.kt
@@ -4,10 +4,10 @@ import org.actorlang.ast.BooleanLiteralNode
 import org.actorlang.ast.IdentifierNode
 import org.actorlang.ast.IntegerLiteralNode
 import org.actorlang.ast.StringLiteralNode
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.Context
 import org.actorlang.interpreter.comms.ActorMessageQueueImpl
 import org.actorlang.interpreter.comms.Message
-import org.actorlang.interpreter.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.scheduler.ActorThreadImpl
 
 class Actor(

diff --git a/src/main/kotlin/org/actorlang/main.kt b/src/main/kotlin/org/actorlang/main.kt
@@ -1,6 +1,7 @@
 package org.actorlang
 
 import org.actorlang.config.Configuration
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.InterpreterImpl
 import org.actorlang.interpreter.comms.CommunicationsManager
 import org.actorlang.interpreter.scheduler.SchedulerImpl
@@ -39,6 +40,7 @@ fun main(vararg args: String) {
 }
 
 private fun execute(code: String, sourceName: String): Int {
+    var result = 0
     val config = Configuration().apply {
         // debug = true
         // messageDuplicates = true
@@ -59,8 +61,16 @@ private fun execute(code: String, sourceName: String): Int {
     )
 
     println("---- start system ----")
-    interpreter.run(code, sourceName)
+    try {
+        interpreter.run(code, sourceName)
+    } catch (e: ActorLangRuntimeException) {
+        println(e.message)
+        result = -1
+    } catch (e: Exception) {
+        e.printStackTrace()
+        result = -1
+    }
     println("---- stop system -----")
 
-    return 0
+    return result
 }
diff --git a/src/main/kotlin/org/actorlang/parser/exceptions/SyntaxError.kt b/src/main/kotlin/org/actorlang/parser/exceptions/SyntaxError.kt
@@ -1,8 +1,9 @@
 package org.actorlang.parser.exceptions
 
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.parser.Position
 
 class SyntaxError(
     msg: String,
     position: Position
-) : Exception("Syntax error at ${position.sourceName}:${position.line}:${position.column}: $msg")
+) : ActorLangRuntimeException("Syntax error at ${position.sourceName}:${position.line}:${position.column}: $msg")
diff --git a/src/test/kotlin/org/actorlang/interpreter/InterpreterImplIT.kt b/src/test/kotlin/org/actorlang/interpreter/InterpreterImplIT.kt
@@ -1,10 +1,10 @@
 package org.actorlang.interpreter
 
 import org.actorlang.config.Configuration
+import org.actorlang.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.comms.CommunicationsBinder
 import org.actorlang.interpreter.comms.CommunicationsManager
 import org.actorlang.interpreter.comms.CommunicationsSender
-import org.actorlang.interpreter.exceptions.ActorLangRuntimeException
 import org.actorlang.interpreter.scheduler.Scheduler
 import org.actorlang.interpreter.scheduler.SchedulerImpl
 import org.actorlang.interpreter.scheduler.SchedulerSynchronization