Make 'use variable :D' work

rakudo · Oct 8, 2015 · 94d4570 · 94d4570
1 parent c1e9ede
commit 94d4570
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -2314,22 +2314,10 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
           || <?{ $*SCOPE eq 'has' }> <.newpad>
                 [
                 || <.ws> <initializer>
-                || { my $colonpairs := $*OFTYPE<colonpairs>;
-                     if $colonpairs<D> {
-                         self.typed_panic: "X::Syntax::Variable::MissingInitializer", type => ~$*OFTYPE;
-                     }
-                     elsif $colonpairs<U> || $colonpairs<_> {
-                     }
-                     elsif %*PRAGMAS<attributes> -> $default {
-                         if $default eq 'D' {
-                             self.typed_panic: "X::Syntax::Variable::MissingInitializer", type => ~$*OFTYPE ~ ' (with implicit :D)';
-                         }
-                     }
-                     1;
-                   }
+                || <?{ $*W.handle_OFTYPE_for_pragma($/,'attributes') }>
                 ]? { $*ATTR_INIT_BLOCK := $*W.pop_lexpad() }
           || <.ws> <initializer>
-          || <?{ $*OFTYPE<colonpairs><D> }> { self.typed_panic: "X::Syntax::Variable::MissingInitializer", type => ~$*OFTYPE }
+          || <?{ $*W.handle_OFTYPE_for_pragma($/,'variables') }>
           || <?>
           ]
         | '(' ~ ')' <signature('variable')> [ <.ws> <trait>+ ]? [ <.ws> <initializer> ]?

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -810,6 +810,27 @@ class Perl6::World is HLL::World {
         }
     }
 
+    method handle_OFTYPE_for_pragma($/, $pragma) {
+        my $colonpairs := $*OFTYPE<colonpairs>;
+        if $colonpairs<D> {
+            self.throw($/, 'X::Syntax::Variable::MissingInitializer',
+              type => ~$*OFTYPE,
+            );
+        }
+        elsif $colonpairs<U> || $colonpairs<_> { 
+        }
+
+        # no specific smiley found, check for default
+        elsif %*PRAGMAS{$pragma} -> $default {
+            if $default eq 'D' {
+                self.throw($/, 'X::Syntax::Variable::MissingInitializer',
+                  type => $*OFTYPE ~ ' (with implicit :D)',
+                );
+            }
+        }
+        1
+    }
+
     method current_file() {
         my $file := nqp::getlexdyn('$?FILES');
         if nqp::isnull($file) {