jruby · Oct 13, 2014 · Oct 13, 2014
diff --git a/core/src/main/java/org/jruby/truffle/nodes/methods/AssertCompilationConstantNode.java b/core/src/main/java/org/jruby/truffle/nodes/methods/AssertCompilationConstantNode.java
@@ -17,7 +17,7 @@
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 
-@NodeChild("body")
+@NodeChild("value")
 public abstract class AssertCompilationConstantNode extends RubyNode {
 
     public AssertCompilationConstantNode(RubyContext context, SourceSection sourceSection) {
@@ -30,27 +30,32 @@ public AssertCompilationConstantNode(AssertCompilationConstantNode prev) {
 
     @Specialization
     public boolean assertCompilationConstant(boolean value) {
-        return CompilerAsserts.compilationConstant(value);
+        CompilerAsserts.compilationConstant(value);
+        return value;
     }
 
     @Specialization
     public int assertCompilationConstant(int value) {
-        return CompilerAsserts.compilationConstant(value);
+        CompilerAsserts.compilationConstant(value);
+        return value;
     }
 
     @Specialization
     public long assertCompilationConstant(long value) {
-        return CompilerAsserts.compilationConstant(value);
+        CompilerAsserts.compilationConstant(value);
+        return value;
     }
 
     @Specialization
     public double assertCompilationConstant(double value) {
-        return CompilerAsserts.compilationConstant(value);
+        CompilerAsserts.compilationConstant(value);
+        return value;
     }
 
     @Specialization
     public Object assertCompilationConstant(Object value) {
-        return CompilerAsserts.compilationConstant(value);
+        CompilerAsserts.compilationConstant(value);
+        return value;
     }
 
 }
diff --git a/test/pom.rb b/test/pom.rb
@@ -243,7 +243,7 @@
                         '<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">' +
                           '<arg value="-J-server" />' +
                           '<arg value="-J-G:-TruffleBackgroundCompilation" />' +
-                          '<arg value="-J-G:+TruffleCompilationExceptionsAreThrown" />' +
+                          '<arg value="-J-G:+TruffleCompilationExceptionsAreFatal" />' +
                           '<arg value="-X+T" />' +
                           '<arg value="-Xtruffle.debug.enable_assert_constant=true" />' +
                           '<arg value="test/truffle/pe/pe.rb" />' +

diff --git a/test/pom.xml b/test/pom.xml
@@ -407,7 +407,7 @@
                     <exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
                       <arg value="-J-server" />
                       <arg value="-J-G:-TruffleBackgroundCompilation" />
-                      <arg value="-J-G:+TruffleCompilationExceptionsAreThrown" />
+                      <arg value="-J-G:+TruffleCompilationExceptionsAreFatal" />
                       <arg value="-X+T" />
                       <arg value="-Xtruffle.debug.enable_assert_constant=true" />
                       <arg value="test/truffle/pe/pe.rb" />

diff --git a/test/truffle/pe/core/fixnum_pe.rb b/test/truffle/pe/core/fixnum_pe.rb
@@ -1,4 +1,12 @@
-# Literals
+PETests.tests do
 
-example { truffle_assert_constant 14 }
-example { truffle_assert_constant 0xffffffffffff }
+  describe "A Fixnum" do
+
+    example "literal" do
+      truffle_assert_constant 14
+      truffle_assert_constant 0xffffffffffff
+    end
+
+  end
+
+end
diff --git a/test/truffle/pe/core/float_pe.rb b/test/truffle/pe/core/float_pe.rb
@@ -1,3 +1,11 @@
-# Literals
+PETests.tests do
 
-example { truffle_assert_constant 14.2 }
+  describe "A Fixnum" do
+
+    example "literal" do
+      truffle_assert_constant 14.2
+    end
+
+  end
+
+end
diff --git a/test/truffle/pe/core/symbol_pe.rb b/test/truffle/pe/core/symbol_pe.rb
@@ -1,3 +1,11 @@
-# Literals
+PETests.tests do
 
-example { truffle_assert_constant :foo }
+  describe "A Symbol" do
+
+    example "literal" do
+      truffle_assert_constant :foo
+    end
+
+  end
+
+end
diff --git a/test/truffle/pe/core/truefalse_pe.rb b/test/truffle/pe/core/truefalse_pe.rb
@@ -1,4 +1,15 @@
-# Literals
+PETests.tests do
 
-example { truffle_assert_constant true }
-example { truffle_assert_constant false }
+  describe "A boolean" do
+
+    example "true literal" do
+      truffle_assert_constant true
+    end
+
+    example "false literal" do
+      truffle_assert_constant false
+    end
+
+  end
+
+end
diff --git a/test/truffle/pe/pe.rb b/test/truffle/pe/pe.rb
@@ -12,34 +12,101 @@
 # helper method. truffle_assert_constant looks like a method but is replaced
 # in the parser with a specific node.
 
-$failures = 0
+# Definition of the DSL
 
-def example
-  1_000_000.times do
-    yield
+module PETests
+
+  def self.start
+    @description_stack = []
+    @failures = []
+    @successes = []
+    @dots = 0
   end
 
-  print "."
-rescue RubyTruffleError
-  $failures += 1
-  print "E"
-end
+  def self.tests(&block)
+    instance_eval &block
+  end
+
+  def self.describe(description)
+    @description_stack.push description
+
+    begin
+      yield
+    ensure
+      @description_stack.pop
+    end
+  end
+
+  def self.example(description)
+    describe "#{description} is constant" do
+      inner_example do
+        yield
+      end
+    end
+  end
+
+  def self.counter_example(description)
+    puts "warning: counter examples not run"
+    #describe "#{description} is not constant" do
+    #  inner_example do
+    #    yield
+    #  end
+    #end
+  end
+
+  def self.finish
+    print "\n"
+
+    if @failures.empty?
+      puts "success - #{@successes.length} passed"
+      true
+    else
+      puts "failure - #{@failures.length} failed, #{@successes.length} passed"
+
+      @failures.each do |message|
+        puts "failed: #{message}"
+      end
 
-def counter_example
-  1_000_000.times do
-    yield
+      false
+    end
+  end
+
+  def self.inner_example
+    1_000_000.times do
+      yield
+    end
+
+    @successes.push @description_stack.join(" ")
+    print "."
+  rescue RubyTruffleError
+    @failures.push @description_stack.join(" ")
+    print "E"
+  ensure
+    @dots += 1
+    puts if @dots == 80
   end
 
-  $failures += 1
-  print "E"
-rescue RubyTruffleError
-  print "."
 end
 
-# Two simple tests to check we're working
+PETests.start
+
+# Test we're working
+
+PETests.tests do
+
+  describe "For example" do
 
-example { truffle_assert_constant 14 }
-#counter_example { truffle_assert_constant rand }
+    example "a fixnum literal" do
+      truffle_assert_constant 14
+    end
+
+    counter_example "a call to #rand" do
+      truffle_assert_constant rand
+    end
+
+  end
+
+end
 
 # Tests organised by class
 
@@ -50,6 +117,6 @@ def counter_example
 require "core/float_pe.rb"
 require "core/symbol_pe.rb"
 
-print "\n"
+# Finished
 
-exit 1 unless $failures.zero?
+exit 1 unless PETests.finish