[Truffle] Implemented TrueClass#& and FalseClass#&.

jruby · Nov 21, 2014 · f34f2c9 · f34f2c9
1 parent 8c6750d
commit f34f2c9
Showing 4 changed files with 53 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FalseClassNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/FalseClassNodes.java
@@ -17,6 +17,28 @@
 @CoreClass(name = "FalseClass")
 public abstract class FalseClassNodes {
 
+    @CoreMethod(names = "&", needsSelf = false, required = 1)
+    public abstract static class AndNode extends CoreMethodNode {
+
+        public AndNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public AndNode(AndNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public boolean and(boolean other) {
+            return false;
+        }
+
+        @Specialization
+        public boolean and(RubyObject other) {
+            return false;
+        }
+    }
+
     @CoreMethod(names = "^", needsSelf = false, required = 1)
     public abstract static class XorNode extends CoreMethodNode {
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/TrueClassNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/TrueClassNodes.java
@@ -17,6 +17,37 @@
 @CoreClass(name = "TrueClass")
 public abstract class TrueClassNodes {
 
+    @CoreMethod(names = "&", needsSelf = false, required = 1)
+    public abstract static class AndNode extends CoreMethodNode {
+
+        public AndNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public AndNode(AndNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public boolean and(boolean other) {
+            return other;
+        }
+
+        @Specialization
+        public boolean and(RubyNilClass other) {
+            return false;
+        }
+
+        @Specialization(guards = "isNotNil")
+        public boolean and(RubyObject other) {
+            return true;
+        }
+
+        static boolean isNotNil(RubyObject o) {
+            return ! (o instanceof RubyNilClass);
+        }
+    }
+
     @CoreMethod(names = "^", needsSelf = false, required = 1)
     public abstract static class XorNode extends CoreMethodNode {
 

diff --git a/spec/truffle/tags/core/false/and_tags.txt b/spec/truffle/tags/core/false/and_tags.txt
diff --git a/spec/truffle/tags/core/true/and_tags.txt b/spec/truffle/tags/core/true/and_tags.txt