Parse method/submethod in RakuAST frontend

And wire them up to the existing AST nodes. Still some work to go until we can actually call a declared method.
rakudo · Aug 27, 2020 · 7a82872 · 7a82872
1 parent d62cee4
commit 7a82872
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/Raku/Actions.nqp b/src/Raku/Actions.nqp
@@ -617,6 +617,12 @@ class Raku::Actions is HLL::Actions does Raku::CommonActions {
     method routine_declarator:sym<sub>($/) {
         make $<routine_def>.ast;
     }
+    method routine_declarator:sym<method>($/) {
+        make $<method_def>.ast;
+    }
+    method routine_declarator:sym<submethod>($/) {
+        make $<method_def>.ast;
+    }
 
     method routine_def($/) {
         my $routine := $*BLOCK;
@@ -628,6 +634,16 @@ class Raku::Actions is HLL::Actions does Raku::CommonActions {
         make $routine;
     }
 
+    method method_def($/) {
+        my $routine := $*BLOCK;
+        if $<signature> {
+            $routine.replace-signature($<signature>.ast);
+        }
+        $routine.replace-body($<blockoid>.ast);
+        $routine.calculate-sink();
+        make $routine;
+    }
+
     ##
     ## Values
     ##

diff --git a/src/Raku/Grammar.nqp b/src/Raku/Grammar.nqp
@@ -1204,6 +1204,12 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
     token routine_declarator:sym<sub> {
         <sym> <.end_keyword> <routine_def('sub')>
     }
+    token routine_declarator:sym<method> {
+        <sym> <.end_keyword> <method_def('method')>
+    }
+    token routine_declarator:sym<submethod> {
+        <sym> <.end_keyword> <method_def('submethod')>
+    }
 
     rule routine_def($declarator) {
         :my $*IN_DECL := $declarator;
@@ -1215,6 +1221,16 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
         <.leave-block-scope>
     }
 
+    rule method_def($declarator) {
+        :my $*IN_DECL := $declarator;
+        :my $*BLOCK;
+        <.enter-block-scope(nqp::tclc($declarator))>
+        <deflongname>?
+        [ '(' <signature> ')' ]?
+        <blockoid>
+        <.leave-block-scope>
+    }
+
     ##
     ## Values
     ##