added subtype option for thrown exceptions

src/main/java/carpet/script/exception/ThrowStatement.java

@@ -24,6 +24,13 @@ public class ThrowStatement extends InternalExpressionException
         this.type = type;
     }
 
+    public ThrowStatement(Value data, Throwables parent, String subtype)
+    {
+        super(subtype);
+        this.data = data;
+        this.type = new Throwables(subtype, parent);
+    }
+
     /**
      * Creates a throw exception.<br>
      * Conveniently creates a value from the {@code value} String

src/main/java/carpet/script/exception/Throwables.java

@@ -1,9 +1,7 @@
 package carpet.script.exception;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * This class contains default Scarpet catchable types, as well as their inheritance and
@@ -14,7 +12,6 @@ public class Throwables {
     private final Throwables parent;
 
     private static final Map<String, Throwables> byId = new HashMap<>();
-    private static final Map<String, Set<Throwables>> handles = new HashMap<>();
 
     public static final Throwables THROWN_EXCEPTION_TYPE = register("exception", null);
     public static final Throwables VALUE_EXCEPTION       = register("value_exception", THROWN_EXCEPTION_TYPE);
@@ -44,14 +41,6 @@ public class Throwables {
     {
         Throwables exc = new Throwables(id, parent);
         byId.put(id, exc);
-        Set<Throwables> itHandles = new HashSet<>();
-        itHandles.add(exc);
-        while (parent!=null)
-        {
-            handles.get(parent.id).add(exc);
-            parent = parent.parent;
-        }
-        handles.put(id, itHandles);
         return exc;
     }
 
@@ -61,7 +50,7 @@ public class Throwables {
      * Use an {@link InternalExpressionException} for that
      * @param id The exception's value as a {@link String}
      */
-    protected Throwables(String id, Throwables parent)
+    public Throwables(String id, Throwables parent)
     {
         this.id = id;
         this.parent = parent;
@@ -74,7 +63,6 @@ public class Throwables {
         return properType;
     }
 
-
     /**
      * Checks whether the given filter matches an instance of this exception, by checking equality
      * with itself and possible parents.
@@ -83,9 +71,12 @@ public class Throwables {
      */
     public boolean isRelevantFor(String filter)
     {
-        Set<Throwables> relevantSet = handles.get(filter);
-        if (relevantSet == null) throw new InternalExpressionException("Unknown exception type: "+filter);
-        return relevantSet.contains(this);
+        return (id.equals(filter) || (parent != null && parent.isRelevantFor(filter)));
+    }
+
+    public boolean isUserException()
+    {
+        return this == USER_DEFINED || parent == USER_DEFINED;
     }
 
     /**

src/main/java/carpet/script/language/ControlFlow.java

@@ -61,8 +61,10 @@ public class ControlFlow {
                     throw new ThrowStatement(lv.get(0).evalValue(c), Throwables.USER_DEFINED );
                 case 2:
                     throw new ThrowStatement(lv.get(1).evalValue(c), Throwables.getTypeForException(lv.get(0).evalValue(c).getString()));
+                case 3:
+                    throw new ThrowStatement(lv.get(2).evalValue(c), Throwables.getTypeForException(lv.get(1).evalValue(c).getString()), lv.get(0).evalValue(c).getString());
                 default:
-                    throw new InternalExpressionException("throw() can't accept more than 2 parameters");
+                    throw new InternalExpressionException("throw() can't accept more than 3 parameters");
             }
         });
 
@@ -79,7 +81,7 @@ public class ControlFlow {
             {
                 if (lv.size() == 1)
                 {
-                    if (ret.thrownExceptionType != Throwables.USER_DEFINED)
+                    if (!ret.thrownExceptionType.isUserException())
                         throw ret;
                     return (c_, t_) -> Value.NULL;
                 }
@@ -101,7 +103,7 @@ public class ControlFlow {
                                 NumericValue.of(f.getToken().linepos+1)
                         )).collect(Collectors.toList())),
 
-                        StringValue.of("locals"), MapValue.wrap(ret.context.variables.entrySet().stream().collect(Collectors.toMap(
+                        StringValue.of("locals"), MapValue.wrap(ret.context.variables.entrySet().stream().filter(e -> !e.getKey().equals("_trace")).collect(Collectors.toMap(
                                 e -> StringValue.of(e.getKey()),
                                 e -> e.getValue().evalValue(ret.context)
                         ))),
@@ -114,7 +116,7 @@ public class ControlFlow {
 
                 if (lv.size() == 2)
                 {
-                    if (ret.thrownExceptionType == Throwables.USER_DEFINED)
+                    if (ret.thrownExceptionType.isUserException())
                         val = lv.get(1).evalValue(c, t);
                 }
                 else