Support SomeType(x) falling back to being a coercion call (x.SomeType…

…). If SomeType already overrides postcircumfix:<( )> then we call that directly, just as before.
rakudo · Feb 18, 2012 · 76e282a · 76e282a
1 parent 1e966bb
commit 76e282a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -1864,7 +1864,7 @@ grammar Perl6::Grammar is HLL::Grammar {
     token term:sym<!!!> { <sym> <args> }
 
     token term:sym<identifier> {
-        <identifier> <?[(]> <args>
+        <identifier> <!{ $*W.is_type([~$<identifier>]) }> <?[(]> <args>
     }
 
     token term:sym<name> {

diff --git a/src/Perl6/Metamodel/BOOTSTRAP.pm b/src/Perl6/Metamodel/BOOTSTRAP.pm
@@ -786,10 +786,18 @@ Perl6::Metamodel::ClassHOW.add_stash(ObjAt);
 # to postcircumfix:<( )>.
 my $invoke_forwarder :=
     sub ($self, *@pos, *%named) {
-        my $c := nqp::create(Capture);
-        nqp::bindattr($c, Capture, '$!list', @pos);
-        nqp::bindattr($c, Capture, '$!hash', %named);
-        $self.postcircumfix:<( )>($c);
+        if !nqp::isconcrete($self) && !pir::can__IPs($self, 'postcircumfix:<( )>') {
+            my $coercer_name := $self.HOW.name($self);
+            +@pos == 1 ??
+                @pos[0]."$coercer_name"() !!
+                @pos # (should be marshalled to a Parcel by the binder...)
+        }
+        else {
+            my $c := nqp::create(Capture);
+            nqp::bindattr($c, Capture, '$!list', @pos);
+            nqp::bindattr($c, Capture, '$!hash', %named);
+            $self.postcircumfix:<( )>($c);
+        }
     }
 Perl6::Metamodel::ClassHOW.set_invoke_forwarder($invoke_forwarder);
 Mu.HOW.add_parrot_vtable_mapping(Mu, 'invoke', $invoke_forwarder);

diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -1604,6 +1604,16 @@ class Perl6::World is HLL::World {
         $is_name
     }
 
+    # Checks if a given symbol is declared and a type object.
+    method is_type(@name) {
+        my $is_name := 0;
+        try {
+            # This throws if it's not a known name.
+            $is_name := !nqp::isconcrete(self.find_symbol(@name))
+        }
+        $is_name
+    }
+
     # Checks if a symbol has already been declared in the current
     # scope, and thus may not be redeclared.
     method already_declared($scope, $curpackage, $curpad, @name) {