Start to store attribute type constraints so we can introspect them.

rakudo · Jun 12, 2010 · 46e9ac2 · 46e9ac2
1 parent 6fe0817
commit 46e9ac2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -916,7 +916,8 @@ sub declare_variable($/, $past, $sigil, $twigil, $desigilname, $trait_list) {
         }
         my %attr_info;
         %attr_info<name>      := $attrname;
-        %attr_info<accessor> := $twigil eq '.' ?? 1 !! 0;
+        %attr_info<type>      := $*TYPENAME;
+        %attr_info<accessor>  := $twigil eq '.' ?? 1 !! 0;
         %attr_info<rw>        := $trait_list && has_compiler_trait_with_val($trait_list, '&trait_mod:<is>', 'rw') ?? 1 !! 0;
         @PACKAGE[0].attributes.push(%attr_info);
 

diff --git a/src/Perl6/Compiler/Package.pm b/src/Perl6/Compiler/Package.pm
@@ -177,6 +177,10 @@ method finish($block) {
             $_<build>.named('build');
             $attr.push($_<build>);
         }
+        if $_<type> ~~ PAST::Node {
+            $_<type>.named('type');
+            $attr.push($_<type>);
+        }
         $decl.push(PAST::Op.new(
             :pasttype('callmethod'),
             :name('add_attribute'),

diff --git a/src/metamodel/Attribute.nqp b/src/metamodel/Attribute.nqp
@@ -63,6 +63,7 @@ method compose($package) {
         my $meth := $!rw ?? pir::find_lex__Ps('accessor_helper_rw') !! pir::find_lex__Ps('accessor_helper_ro');
         my $meth_name := pir::substr__SSi($name, 2);
         $meth := pir::clone($meth);
+
         # introspection looks at the actual sub name, so set it
         # to the value the user expects
         # set $P0, $S0  is parrot's clunky PIR API for setting the sub name.