tweaks for new unit declarator

Raku · May 15, 2015 · 1c4b217 · 1c4b217
1 parent 159f61d
commit 1c4b217
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 35 deletions.
diff --git a/S02-lexical-conventions/sub-block-parsing.t b/S02-lexical-conventions/sub-block-parsing.t
@@ -43,7 +43,7 @@ throws_like { EVAL q[
 # RT #85844
 {
     throws_like { EVAL 'sub foo;' },
-      X::SemicolonForm::Invalid,
+      X::UnitScope::Invalid,
       'RT #85844';
 }
 

diff --git a/S06-other/main-semicolon.t b/S06-other/main-semicolon.t
@@ -24,17 +24,17 @@ is &?ROUTINE.name, "MAIN", "...and we're actually in MAIN now";
 
 {
     throws_like { EVAL "module AtBeginning \{\}\nsub MAIN;" },
-        X::SemicolonForm::TooLate, what => "sub"
+        X::UnitScope::TooLate, what => "sub"
 }
 
 {
     throws_like { EVAL '{ sub MAIN; }' },
-        X::SemicolonForm::Invalid, what => "sub"
+        X::UnitScope::Invalid, what => "sub"
 }
 
 {
     throws_like { EVAL 'multi sub MAIN;' },
-        X::SemicolonForm::Invalid, what => "sub"
+        X::UnitScope::Invalid, what => "sub"
 }
 
 # vim: ft=perl6
diff --git a/S10-packages/precompilation.t b/S10-packages/precompilation.t
@@ -111,7 +111,7 @@ unlink $_ for @precomp-paths; # don't care if worked
 
     is_run
       "use $module-name;
-       class C does Bar { };",
+       unit class C does Bar { };",
       { err    => '',
         out    => '',
         status => 0,

diff --git a/S11-modules/InnerModule.pm b/S11-modules/InnerModule.pm
@@ -1,4 +1,4 @@
-module InnerModule;
+unit module InnerModule;
 use v6;
 
 sub foo is export(:DEFAULT) {'Inner::foo'}

diff --git a/S11-modules/OuterModule.pm b/S11-modules/OuterModule.pm
@@ -1,4 +1,4 @@
-module OuterModule;
+unit module OuterModule;
 use v6;
 
 use InnerModule :ALL :EXPORT;
diff --git a/S24-testing/use_ok_test.pm b/S24-testing/use_ok_test.pm
@@ -1,3 +1,3 @@
-module use_ok_test-0.0.1;
+unit module use_ok_test-0.0.1;
 
 sub it_worked { 1 }
diff --git a/S32-exceptions/misc.t b/S32-exceptions/misc.t
@@ -256,7 +256,7 @@ throws_like 'sub f() { }; &f.unwrap("foo")', X::Routine::Unwrap;
 throws_like 'my %h = 1', X::Hash::Store::OddNumber;
 
 # TOOD: might be X::Syntax::Malformed too...
-throws_like 'sub foo;', X::SemicolonForm::Invalid, what => 'sub';
+throws_like 'sub foo;', X::UnitScope::Invalid, what => 'sub';
 # RT #75776
 throws_like 'my $d; my class A {method x { $d }}; for () { sub }', X::Syntax::Missing, what => 'block';
 throws_like 'constant foo;', X::Syntax::Missing, what => /initializer/;

diff --git a/integration/advent2011-day15.t b/integration/advent2011-day15.t
@@ -38,7 +38,7 @@ for @inputs Z @results Z @expected -> ($input, $result, $expected) {
         or diag "got: $result";
 }
 
-try EVAL q[ class A; method { $!x } ];
+try EVAL q[ unit class A; method { $!x } ];
 is $!, 'Attribute $!x not declared in class A', 'compiler error message';
 isa-ok $!, X::Attribute::Undeclared, 'compiler error class';
 ok $! ~~ X::Comp, 'compile error does X::Comp';

diff --git a/packages/A/B.pm b/packages/A/B.pm
@@ -1,6 +1,6 @@
 # used in t/spec/S11-modules/nested.t 
 
-module A::B;
+unit module A::B;
 role B { };
 class D does A::B::B { };
 

diff --git a/packages/ArrayInit.pm b/packages/ArrayInit.pm
@@ -1,4 +1,4 @@
-module ArrayInit;
+unit module ArrayInit;
 
 # used by t/spec/S10-packages/basic.t
 

diff --git a/packages/B/Grammar.pm b/packages/B/Grammar.pm
@@ -1,3 +1,3 @@
-grammar B::Grammar {
+unit grammar B::Grammar {
     token TOP { 'B' };
 }
diff --git a/packages/Bar.pm b/packages/Bar.pm
@@ -2,7 +2,7 @@ use v6;
 
 use Foo;
 
-class Bar is ::Foo;
+unit class Bar is ::Foo;
 
 method bar { "bar" }
 
diff --git a/packages/Exportops.pm b/packages/Exportops.pm
@@ -1,4 +1,4 @@
-module Exportops;
+unit module Exportops;
 
 sub postfix:<!>(Int $x)      is export(:DEFAULT) { [*] 1..$x }
 sub infix:<yadayada>($a, $b) is export(:DEFAULT) { $a ~ ".." ~ $b }

diff --git a/packages/Foo.pm b/packages/Foo.pm
@@ -1,7 +1,7 @@
 use v6;
 
 
-class Foo;
+unit class Foo;
 
 method foo { "foo" }
 

diff --git a/packages/FooBar.pm b/packages/FooBar.pm
@@ -2,6 +2,6 @@ use v6;
 
 use Bar;
 
-class FooBar is ::Bar;
+unit class FooBar is ::Bar;
 
 method foobar { "foobar" }
diff --git a/packages/Import.pm b/packages/Import.pm
@@ -1,2 +1,2 @@
-module t::spec::packages::Import;
+unit module t::spec::packages::Import;
 # note the absence of a sub import() { }
diff --git a/packages/LoadCounter.pm b/packages/LoadCounter.pm
@@ -1,6 +1,6 @@
 use v6;
 
-module t::packages::LoadCounter;
+unit module t::packages::LoadCounter;
 
 $Main::loaded++;
 

diff --git a/packages/PackageTest.pm b/packages/PackageTest.pm
@@ -1,9 +1,4 @@
-# The semicolon form of "package" would be illegal in the
-# middle of a Perl 6 file.
-# At the top, it would mean the rest of the file was Perl 5 code.
-# So we use "package" with a block:
-
-package t::spec::packages::PackageTest {
+unit package t::spec::packages::PackageTest;
 
 sub ns  { "t::spec::packages::PackageTest" }
 
@@ -37,5 +32,3 @@ sub cant_see_pkg {
 }
 
 sub dummy_sub_with_params($arg1, $arg2) is export { "[$arg1] [$arg2]" }
-
-}
diff --git a/packages/RT84280.pm b/packages/RT84280.pm
@@ -1,4 +1,4 @@
-module RT84280;
+unit module RT84280;
 
 sub foo(Str $a) is export {
 }

diff --git a/packages/RequireAndUse3.pm b/packages/RequireAndUse3.pm
@@ -5,6 +5,6 @@ use v6;
 # started by Ingo Blechschmidt,
 # L<"http://www.nntp.perl.org/group/perl.perl6.language/22258">.
 
-module t::spec::packages::RequireAndUse3;
+unit module t::spec::packages::RequireAndUse3;
 
 23;
diff --git a/packages/RoleA.pm b/packages/RoleA.pm
@@ -1,6 +1,6 @@
 use lib 't/spec/packages';
 use RoleB;
 
-role RoleA;
+unit role RoleA;
 
 # vim: ft=perl6
diff --git a/packages/RoleB.pm b/packages/RoleB.pm
@@ -1,3 +1,3 @@
-role RoleB;
+unit role RoleB;
 
 # vim: ft=perl6
diff --git a/packages/S11-modules/Foo.pm b/packages/S11-modules/Foo.pm
@@ -1,6 +1,6 @@
 # L<S11/"Exportation"/>
 
-module t::spec::packages::S11-modules::Foo;
+unit module t::spec::packages::S11-modules::Foo;
 sub foo is export(:DEFAULT)          { 'Foo::foo' }  #  :DEFAULT, :ALL
 sub bar is export(:DEFAULT, :others) { 'Foo::bar' }  #  :DEFAULT, :ALL, :others
 sub baz is export(:MANDATORY)        { 'Foo::baz' }  #  (always exported)

diff --git a/packages/Test/Compile.pm b/packages/Test/Compile.pm
@@ -1,4 +1,4 @@
-module Test::Compile;
+unit module Test::Compile;
 use nqp;
 use Test;
 

diff --git a/packages/Test/Tap.pm b/packages/Test/Tap.pm
@@ -1,4 +1,4 @@
-module Test::Tap;
+unit module Test::Tap;
 
 use Test;
 

diff --git a/packages/Test/Util.pm b/packages/Test/Util.pm
@@ -1,4 +1,4 @@
-module Test::Util;
+unit module Test::Util;
 
 use Test;