Start using KnowHOWAttribute from the 6model core instead. Means we n…

…ow create all meta-attributes during the compile. Toss the knowhow-specific workarounds.
Raku · Apr 27, 2011 · 2af2457 · 2af2457
1 parent cc013b6
commit 2af2457
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 44 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -445,8 +445,7 @@ class NQP::Actions is HLL::Actions {
                 );
 
                 # Make sure the attribute exists.
-                # XXX Can't check for knowhow yet.
-                unless $*IN_DECL || $*PKGDECL eq 'knowhow' {
+                unless $*IN_DECL {
                     my $attr;
                     for $*PACKAGE.HOW.attributes($*PACKAGE, :local(1)) {
                         if $_.name eq $name {
@@ -455,7 +454,9 @@ class NQP::Actions is HLL::Actions {
                         }
                     }
                     if pir::defined($attr) {
-                        $past.type($attr.type);
+                        if pir::can($attr, 'type') {
+                            $past.type($attr.type);
+                        }
                     }
                     else {
                         $/.CURSOR.panic("Attribute '$name' not declared");
@@ -615,47 +616,22 @@ class NQP::Actions is HLL::Actions {
             $/.CURSOR.panic("Redeclaration of symbol ", $name);
         }
         if $*SCOPE eq 'has' {
-            # Create and add a meta-attribute.
-            if $*PKGDECL ne 'knowhow' {
-                # Locate the type of meta-attribute we need.
-                unless pir::exists(%*HOW, $*PKGDECL ~ '-attr') {
-                    $/.CURSOR.panic("$*PKGDECL packages do not support attributes");
-                }
-
-                # Set up arguments for meta-attribute instantiation.
-                my %lit_args;
-                my %obj_args;
-                %lit_args<name> := $name;
-                if $<typename> {
-                    %obj_args<type> := find_sym([~$<typename>[0]], $/);
-                }
-
-                # Add it.
-                $*SC.pkg_add_attribute($*PACKAGE, %*HOW{$*PKGDECL ~ '-attr'},
-                    %lit_args, %obj_args);
+            # Locate the type of meta-attribute we need.
+            unless pir::exists(%*HOW, $*PKGDECL ~ '-attr') {
+                $/.CURSOR.panic("$*PKGDECL packages do not support attributes");
             }
-            else {
-                # XXX Still need to do it this way for KnowHOW...
-                my $meta-attr-type := 'KnowHOWAttribute';
-                $*PACKAGE-SETUP.push(PAST::Op.new(
-                    :pasttype('callmethod'), :name('add_attribute'),
-                    PAST::Op.new(
-                        :pirop('get_how PP'),
-                        PAST::Var.new( :name('type_obj'), :scope('register') )
-                    ),
-                    PAST::Var.new( :name('type_obj'), :scope('register') ),
-                    (my $meta_args := PAST::Op.new(
-                        :pasttype('callmethod'), :name('new'),
-                        PAST::Var.new( :name($meta-attr-type), :namespace(''), :scope('package') ),
-                        PAST::Val.new( :value($name), :named('name') )
-                    ))
-                ));
-                if $<typename> {
-                    my $type := $<typename>[0].ast;
-                    $type.named('type');
-                    $meta_args.push($type);
-                }
+
+            # Set up arguments for meta-attribute instantiation.
+            my %lit_args;
+            my %obj_args;
+            %lit_args<name> := $name;
+            if $<typename> {
+                %obj_args<type> := find_sym([~$<typename>[0]], $/);
             }
+
+            # Add it.
+            $*SC.pkg_add_attribute($*PACKAGE, %*HOW{$*PKGDECL ~ '-attr'},
+                %lit_args, %obj_args);
 
             $past := PAST::Stmts.new();
         }

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -10,9 +10,11 @@ grammar NQP::Grammar is HLL::Grammar {
         %*LANG<MAIN-actions>  := NQP::Actions;
 
         # Package declarator to meta-package mapping. Note that there is
-        # one universal KnowHOW from the 6model core.
+        # one universal KnowHOW from the 6model core, and an attribute
+        # meta-object to go with it.
         my %*HOW;
-        %*HOW<knowhow> := pir::get_knowhow__P();
+        %*HOW<knowhow>      := pir::get_knowhow__P();
+        %*HOW<knowhow-attr> := pir::get_knowhow_attribute__P();
 
         # Serialization context builder - keeps track of objects that
         # cross the compile-time/run-time boundary that are associated