Add support for 'include' and move Test.rb into the Test module.

Test.rb

@@ -0,0 +1,78 @@
+module Test
+    $testnum = 1
+    $failed = 0
+    $planned = 0
+    $started = 0
+    $todo_upto = 0
+    $todo_reason
+
+    def plan(num)
+        print '1..',num,"\n"
+        $started = 1
+        $testnum = 1
+        $planned = num
+    end
+
+    def pass(desc='')
+        proclaim(1,desc)
+    end
+
+    def flunk(desc='')
+        proclaim(0,desc)
+    end
+
+    def ok(cond,desc='')
+        proclaim(cond, desc)
+    end
+
+    def nok(cond,desc='')
+        if cond then
+            flunk desc
+        else
+            pass desc
+        end
+    end
+
+    def is(got,expected,desc='')
+        proclaim(got == expected, desc)
+    end
+
+    def isgt(got,expected,desc='')
+        proclaim(got > expected, desc)
+    end
+
+    def isge(got,expected,desc='')
+        proclaim(got >= expected, desc)
+    end
+
+    def isnt(got,expected,desc='')
+        proclaim(got != expected, desc)
+    end
+
+    def todo(reason,count=1)
+        $todo_upto = $testnum + count
+        $todo_reason = '# TODO ' + reason
+    end
+
+    def skip(reason='',count=1)
+        1.upto(count) { proclaim(1,'# SKIP ' + reason) }
+    end
+
+    def skip_rest(reason='')
+        skip(reason,$planned - $testnum)
+    end
+
+    def proclaim(cond,desc)
+        if cond then
+        else
+            print "n"
+            $failed += 1 if $todo_upto < $testnum
+        end
+        print 'ok ', $testnum, ' - ', desc
+        $testnum += 1
+        if $todo_reason and $todo_upto < $testnum then
+            print $todo_reason
+        end
+        puts
+    end
+end

build/Makefile.in

@@ -30,7 +30,7 @@ PCT           = $(BUILD_DIR)/runtime/parrot/library/PCT.pbc
 
 PMC_DIR       = src/pmc
 
-all: cardinal.pbc test.pir cardinal$(EXE)
+all: cardinal.pbc Test.pir cardinal$(EXE)
 
 CARDINAL_GROUP = $(PMC_DIR)/cardinal_group$(LOAD_EXT)
 
@@ -86,8 +86,8 @@ installable_cardinal$(EXE): cardinal.pbc
 cardinal.pbc: $(PARROT) $(SOURCES)
 	$(PARROT) $(PARROT_ARGS) -o cardinal.pbc cardinal.pir
 
-test.pir: $(PARROT) test.rb cardinal.pbc
-	$(PARROT) $(PARROT_ARGS) cardinal.pbc --target=pir --output=test.pir test.rb
+Test.pir: $(PARROT) Test.rb cardinal.pbc
+	$(PARROT) $(PARROT_ARGS) cardinal.pbc --target=pir --output=Test.pir Test.rb
 
 src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg
 	$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \

src/builtins/eval.pir

@@ -112,6 +112,21 @@ such as C<eval>, C<require>, and C<use>.
     .return (result)
 .end
 
+.sub 'include'
+    .param pmc module
+    .local pmc it, item, callerns
+    $P0 = getinterp
+    callerns = $P0['namespace';1]
+    it = new 'Iterator', module
+  it_loop:
+    unless it goto it_loop_end
+    $S0 = shift it
+    item = module[$S0]
+    callerns[$S0] = item
+    goto it_loop
+  it_loop_end:
+.end
+
 
 .sub 'load'
     .param string file

t/02-functions.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 
 plan 7
 

t/05-op-cmp.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 12
 
 ok 1 < 2, '<';

t/07-loops.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 12
 
 i = 1

t/09-test.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 
 plan 3
 

t/10-regex.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 3
 
 ok "foo" =~ /oo/, 'basic regex matching'

t/11-slurpy.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 def foo(*n)

t/12-gather.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 items = gather do

t/99-other.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 8
 
 n = 5

t/alias.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 2
 
 class NumberHolder

t/array/array.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 10
 
 a = [ 1, 2, 3, 4 ]

t/array/clear.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 8
 
 a = Array.new()

t/array/collect.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 2
 
 a = [ "a", "b", "c", "d" ]

t/array/empty.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 2
 
 a = [ 1, 2 ]

t/array/equals.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 2
 
 a = [ 1, 2, 3 ]

t/array/fill.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 a = Array.new(2)

t/array/grep.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 1
 
 

t/array/include.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 6
 
 a = [ 1, 2 ]

t/array/intersection.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 6
 
 a = [  0,  1, 2, 3, 4, 5, 6 ]

t/array/mathop.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 10
 
 a = [ 1, 2 ]

t/array/sort.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 8
 
 a = [ 2, 1, 3 ]

t/array/to_s.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 1
 
 a = [ 1, 2 ]

t/array/uniq.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 6
 
 a = [ 1, 1, 2, 2, 3, 3, 1, 2, 3, 1, 2, 3]

t/array/warray.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 3
 
 a = %w{ fe fi fo }

t/assignment.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 a = 1

t/blocks.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 1.upto(2) { |x| is x, x, 'curly brace block' }

t/constants.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 2
 
 is RUBY_PLATFORM, 'parrot', 'RUBY_PLATORM'

t/continuation.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 k = 0

t/file/dir.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 d = Dir.new('.')

t/file/file.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 12 
 
 

t/file/stat.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 20
 
 # need a better test for these things. this shows that we at least can parse and execute these commands

t/freeze.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 1
 
 class NumberHolder

t/gc.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 4
 
 

t/hash/hash.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 5
 
 a = { "a" => "ok", "b" => 1}

t/integer/integer.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 51
 
 # add a test against the expected class type when we get .class worked out better

t/integer/times.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 5
 j = 0
 5.times do |i|

t/kernel/exit.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 1
 
 pass '.exit! on Kernel'

t/kernel/open.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 2
 
 pipe = open("| echo *.t")

t/kernel/sprintf.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 11
 
 Kernel.printf("%s %d %s\n", 'ok', 1, '- .printf() on Kernel')

t/math/functions.t

@@ -1,4 +1,5 @@
-require 'test'
+require 'Test'
+include Test
 plan 3