Merge branch 'nom' into newio

rakudo · Feb 7, 2015 · 727f247 · 727f247
2 parents 3d80ceb + db6254b
commit 727f247
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -934,10 +934,6 @@ my class X::Syntax::Argument::MOPMacro does X::Syntax {
     method message() { "Cannot give arguments to $.macro" };
 }
 
-my class X::Does::TypeObject is Exception {
-    method message() { "Cannot use 'does' operator with a type object." }
-}
-
 my class X::Role::Initialization is Exception {
     has $.role;
     method message() { "Can only supply an initialization value for a role if it has a single public attribute, but this is not the case for '{$.role.^name}'" }

diff --git a/src/core/IO/Symlink.pm b/src/core/IO/Symlink.pm
@@ -0,0 +1,3 @@
+# placeholder file to facilitate switching between nom and newio branches
+
+# vim: ft=perl6 expandtab sw=4
diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -7,6 +7,11 @@ sub infix:<=>(Mu \a, Mu \b) is rw {
     nqp::p6store(a, b)
 }
 
+my class X::Does::TypeObject is Exception {
+    has Mu $.type;
+    method message() { "Cannot use 'does' operator with a type object." }
+}
+
 proto sub infix:<does>(Mu, Mu, *%) { * }
 multi sub infix:<does>(Mu:D \obj, Mu:U \rolish) is rw {
     # XXX Mutability check.
@@ -24,14 +29,14 @@ multi sub infix:<does>(Mu:D \obj, Mu:U \rolish, :$value! is parcel) is rw {
     mixedin.BUILD_LEAST_DERIVED({ substr(mixedin.^mixin_attribute.Str,2) => $value });
 }
 multi sub infix:<does>(Mu:U \obj, Mu:U \role) is rw {
-    X::Does::TypeObject.new().throw
+    X::Does::TypeObject.new(type => obj).throw
 }
 multi sub infix:<does>(Mu:D \obj, @roles) is rw {
     # XXX Mutability check.
     obj.HOW.mixin(obj, |@roles).BUILD_LEAST_DERIVED({});
 }
 multi sub infix:<does>(Mu:U \obj, @roles) is rw {
-    X::Does::TypeObject.new().throw
+    X::Does::TypeObject.new(type => obj).throw
 }
 
 proto sub infix:<but>(Mu, Mu, *%) { * }

diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -124,8 +124,9 @@ J_CORE_SOURCES = \
   src/core/IO.pm \
   src/core/IO/Pathy.pm \
   src/core/IO/Local.pm \
-  src/core/IO/Dir.pm \
   src/core/IO/File.pm \
+  src/core/IO/Dir.pm \
+  src/core/IO/Symlink.pm \
   src/core/IOU.pm \
   src/core/IO/Spec.pm \
   src/core/IO/Spec/Unix.pm \

diff --git a/tools/build/Makefile-Parrot.in b/tools/build/Makefile-Parrot.in
@@ -209,6 +209,7 @@ P_CORE_SOURCES = \
   src/core/IO/Local.pm \
   src/core/IO/Dir.pm \
   src/core/IO/File.pm \
+  src/core/IO/Symlink.pm \
   src/core/IOU.pm \
   src/core/IO/Spec.pm \
   src/core/IO/Spec/Unix.pm \

diff --git a/tools/build/moar_core_sources b/tools/build/moar_core_sources
@@ -74,6 +74,7 @@ src/core/IO/Pathy.pm
 src/core/IO/Local.pm
 src/core/IO/Dir.pm
 src/core/IO/File.pm
+src/core/IO/Symlink.pm
 src/core/IOU.pm
 src/core/IO/Spec.pm
 src/core/IO/Spec/Unix.pm