- Added compilation and evaluation of Switch nodes

2 files changed, 12 insertions, 0 deletions

diff --git a/sources/scala/tools/scalai/Evaluator.java b/sources/scala/tools/scalai/Evaluator.java
index 9255a02731..e940b7f194 100644
--- a/sources/scala/tools/scalai/Evaluator.java
+++ b/sources/scala/tools/scalai/Evaluator.java
@@ -158,6 +158,14 @@ public class Evaluator {
             assert value instanceof Boolean : value.getClass();
             return evaluate(((Boolean)value).booleanValue() ? thenp : elsep);
 
+        case Switch(Code test, int[] tags, Code[] bodies, Code otherwise):
+            Object value = evaluate(test);
+            assert value instanceof Integer : value.getClass();
+            int tag = ((Integer)value).intValue();
+            for (int i = 0; i < tags.length; i++)
+                if (tags[i] == tag) return evaluate(bodies[i]);
+            return evaluate(otherwise);
+
         case Literal(Object value):
             return value;
 
diff --git a/sources/scala/tools/scalai/ExpressionCompiler.java b/sources/scala/tools/scalai/ExpressionCompiler.java
index e8a3a88a7c..0edc0a525e 100644
--- a/sources/scala/tools/scalai/ExpressionCompiler.java
+++ b/sources/scala/tools/scalai/ExpressionCompiler.java
@@ -130,6 +130,10 @@ public class ExpressionCompiler {
                 // !!! can we remove this test ?
                 elsep == Tree.Empty ? Code.Literal(constants.literal()) : compute(elsep));
 
+        case Switch(Tree test, int[] tags, Tree[] bodies, Tree otherwise):
+            return Code.Switch(
+                compute(test), tags, compute(bodies), compute(otherwise));
+
         case New(Tree.Template(Tree[] bases, Tree[] body)): // !!!
             assert bases.length == 1 : Debug.show(tree);
             assert body.length == 0 : Debug.show(tree);