Directive exceptions catch

maccasoft · May 23, 2023 · bd50385 · bd50385
1 parent b053a95
commit bd50385
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/modules/spin-tools/src/com/maccasoft/propeller/spin1/Spin1ExpressionBuilder.java b/modules/spin-tools/src/com/maccasoft/propeller/spin1/Spin1ExpressionBuilder.java
@@ -183,6 +183,10 @@ public List<Token> getTokens() {
     }
 
     public Expression getExpression() {
+        if (tokens.size() == 0) {
+            throw new RuntimeException("expecting expression");
+        }
+
         Expression node = parseLevel(parseAtom(), 0);
 
         Token token = peek();

diff --git a/modules/spin-tools/src/com/maccasoft/propeller/spin1/Spin1ObjectCompiler.java b/modules/spin-tools/src/com/maccasoft/propeller/spin1/Spin1ObjectCompiler.java
@@ -107,7 +107,13 @@ public void compile(Node root) {
 
             @Override
             public void visitDirective(DirectiveNode node) {
-                compileDirective(node);
+                try {
+                    compileDirective(node);
+                } catch (CompilerException e) {
+                    logMessage(e);
+                } catch (Exception e) {
+                    logMessage(new CompilerException(e, node));
+                }
             }
 
             @Override

diff --git a/modules/spin-tools/src/com/maccasoft/propeller/spin2/Spin2ExpressionBuilder.java b/modules/spin-tools/src/com/maccasoft/propeller/spin2/Spin2ExpressionBuilder.java
@@ -231,6 +231,10 @@ public void addTokenLiteral(Token token) {
     }
 
     public Expression getExpression() {
+        if (tokens.size() == 0) {
+            throw new RuntimeException("expecting expression");
+        }
+
         Expression node = parseLevel(parseAtom(), 0);
 
         Token token = peek();

diff --git a/modules/spin-tools/src/com/maccasoft/propeller/spin2/Spin2ObjectCompiler.java b/modules/spin-tools/src/com/maccasoft/propeller/spin2/Spin2ObjectCompiler.java
@@ -116,7 +116,13 @@ public void compile(Node root) {
 
             @Override
             public void visitDirective(DirectiveNode node) {
-                compileDirective(node);
+                try {
+                    compileDirective(node);
+                } catch (CompilerException e) {
+                    logMessage(e);
+                } catch (Exception e) {
+                    logMessage(new CompilerException(e, node));
+                }
             }
 
             @Override