Generate lexical accessor after declaring var.

Unbusts S12-attributes/class.t.
rakudo · Jul 1, 2013 · 080a6bb · 080a6bb
1 parent dbc5f1a
commit 080a6bb
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -1925,17 +1925,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
             $past<metaattr> := $attr;
         }
         elsif $*SCOPE eq 'my' || $*SCOPE eq 'our' || $*SCOPE eq 'state' {
-            # Twigil handling.
+            # Some things can't be done to our vars.
-            if $twigil eq '.' {
-                add_lexical_accessor($/, $past, $desigilname, $*W.cur_lexpad());
-                $name := $sigil ~ $desigilname;
-            }
-            elsif $twigil eq '!' {
-                $*W.throw($/, ['X', 'Syntax', 'Variable', 'Twigil'],
-                    twigil => $twigil,
-                    scope  => $*SCOPE,
-                );
-            }
             if $*SCOPE eq 'our' {
                 if $*OFTYPE {
                     $/.CURSOR.panic("Cannot put a type constraint on an 'our'-scoped variable");
@@ -1981,6 +1971,18 @@ class Perl6::Actions is HLL::Actions does STDActions {
                     ));
                 }
             }
+
+            # Twigil handling.
+            if $twigil eq '.' {
+                add_lexical_accessor($/, $past, $desigilname, $*W.cur_lexpad());
+                $name := $sigil ~ $desigilname;
+            }
+            elsif $twigil eq '!' {
+                $*W.throw($/, ['X', 'Syntax', 'Variable', 'Twigil'],
+                    twigil => $twigil,
+                    scope  => $*SCOPE,
+                );
+            }
         }
         else {
             $*W.throw($/, 'X::Comp::NYI',