[nqp]: Add simple parameters to signatures.

perl6 · Oct 26, 2009 · 4c594ad · 4c594ad
1 parent 4c4a0e2
commit 4c594ad
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -145,6 +145,21 @@ method routine_def($/) {
     make $past;
 }
 
+method signature($/) {
+    my $BLOCKINIT := @BLOCK[0][0];
+    for $<parameter> { $BLOCKINIT.push($_.ast); }
+}
+
+method parameter($/) { make $<param_var>.ast; }
+
+method param_var($/) {
+    my $past := $<variable>.ast;
+    $past.isdecl(1);
+    $past.scope('parameter');
+    @BLOCK[0].symbol($past.name, :scope('lexical') );
+    make $past;
+}
+
 method term:sym<identifier>($/) {
     my $past := $<args>.ast;
     $past.name(~$<identifier>);

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -100,9 +100,17 @@ token routine_declarator:sym<sub> { <sym> <routine_def> }
 rule routine_def {
     <deflongname=ident>?
     <.newpad>
+    [ '(' <signature> ')'
+        || <.panic: 'Routine declaration requires a signature'> ]
     <blockoid>
 }
 
+token signature { [ [<.ws><parameter><.ws>] ** ',' ]? }
+
+token parameter { <param_var> }
+
+token param_var { <variable> }
+
 proto token term { <...> }
 
 token term:sym<identifier> {