Push automatic is Any down and out of the parser

sorear · Jul 22, 2010 · e337510 · e337510
1 parent 2ed08c1
commit e337510
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/Decl.pm b/Decl.pm
@@ -240,6 +240,9 @@ use CgOp;
                 CgOp::wrap(CgOp::clr_string($self->name // 'ANON'))),
 
             CgOp::proto_var($self->var . '!HOW', CgOp::letvar("how")),
+            ((grep { $_->isa('Decl::Super') } @{ $self->body->decls }) ? () :
+                CgOp::sink(CgOp::methodcall(CgOp::letvar("how"), "add-super",
+                        CgOp::scopedlex("Any!HOW")))),
 
             # TODO: Initialize the protoobject to a failure here so an awesome
             # error is produced if someone tries to use an incomplete class in

diff --git a/Niecza/Actions.pm b/Niecza/Actions.pm
@@ -959,21 +959,8 @@ sub package_def { my ($cl, $M) = @_;
     my $blocktype = $::PKGDECL;
     my $bodyvar = $cl->gensym;
 
-    if (($blocktype eq 'class' || $blocktype eq 'grammar')
-            && !$M->{decl}{stub}) {
-        unshift @{ $::CURLEX->{'!decls'} //= [] },
-            map { $_->{_ast} } @{ $M->{trait} };
-
-        AUTOANY: {
-            for my $d (@{ $::CURLEX->{'!decls'} //= [] }) {
-                next unless $d->isa('Decl::Super');
-                last AUTOANY;
-            }
-
-            $cl->add_decl(Decl::Super->new(name => ($blocktype eq 'grammar' ?
-                    'Cursor' : 'Any')));
-        }
-    }
+    unshift @{ $::CURLEX->{'!decls'} //= [] },
+        map { $_->{_ast} } @{ $M->{trait} };
 
     if (!$M->{decl}{stub}) {
         my $stmts = $M->{statementlist} // $M->{blockoid};