Corrected fix for #54

programs/tests/fixtures/operators/booleans.rock

@@ -7,15 +7,22 @@ say not X       (false)
 say not X and not Y (false)
 say not X or not Y (true)
 say not X and not Y and not X or not Y (true)
-
-
+shout "-----------"
 shout 0 or 42
 shout 0 or 0
-shout 16 and 42
-shout 16 and 0
 shout 16 or 42
 shout 16 or 0
 shout 0 and 42
 shout 0 and 0
-
+shout 16 and 42
+shout 16 and 0
+shout "-----------"
+shout true and true
+shout true and false
+shout false and true
+shout false and false
+shout true or true
+shout true or false
+shout false or true
+shout false or false
 

programs/tests/fixtures/operators/booleans.rock.out

@@ -5,11 +5,21 @@ false
 false
 true
 true
+-----------
+42
 0
-0
-16
-16
 16
 16
 0
 0
+42
+0
+-----------
+true
+false
+false
+false
+true
+true
+true
+false

src/rockstar/expression/LogicalExpression.java

@@ -55,17 +55,16 @@ public Value evaluate(BlockContext ctx) {
         // short circuit: do not evaluate expr2 if not needed
         switch (type) {
             case AND:
-                if (v1.isBoolean() && v1.asBoolean().equals(Value.BOOLEAN_TRUE)) {
-                    return ctx.afterExpression(this, v1.and(expr2.evaluate(ctx)));
+                if (v1.asBoolean().equals(Value.BOOLEAN_TRUE)) {
+                    return ctx.afterExpression(this, expr2.evaluate(ctx));                    
                 }
                 return ctx.afterExpression(this, v1);
             case OR:
-                if (v1.isBoolean() && v1.asBoolean().equals(Value.BOOLEAN_FALSE)) {
-                    return ctx.afterExpression(this, v1.or(expr2.evaluate(ctx)));
-                }
+                if (v1.asBoolean().equals(Value.BOOLEAN_FALSE)) {
+                    return ctx.afterExpression(this, expr2.evaluate(ctx));                }
                 return ctx.afterExpression(this, v1);
             case NOR:
-                if (v1.isBoolean() && v1.asBoolean().equals(Value.BOOLEAN_FALSE)) {
+                if (v1.asBoolean().equals(Value.BOOLEAN_FALSE)) {
                     return ctx.afterExpression(this, v1.nor(expr2.evaluate(ctx)));
                 }
                 return ctx.afterExpression(this, Value.BOOLEAN_FALSE);