Ununderscore scope_declarator

rakudo · Jun 10, 2023 · 5d8ca40 · 5d8ca40
1 parent c7ecdd8
commit 5d8ca40
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/Raku/Actions.nqp b/src/Raku/Actions.nqp
@@ -1272,8 +1272,8 @@ class Raku::Actions is HLL::Actions does Raku::CommonActions {
         self.attach: $/, $<package-declarator>.ast;
     }
 
-    method term:sym<scope_declarator>($/) {
-        self.attach: $/, $<scope_declarator>.ast;
+    method term:sym<scope-declarator>($/) {
+        self.attach: $/, $<scope-declarator>.ast;
     }
 
     method term:sym<routine_declarator>($/) {
@@ -1666,15 +1666,15 @@ class Raku::Actions is HLL::Actions does Raku::CommonActions {
         $*R.pop-package();
     }
 
-    method scope_declarator:sym<my>($/)    { self.attach: $/, $<scoped>.ast; }
-    method scope_declarator:sym<our>($/)   { self.attach: $/, $<scoped>.ast; }
-    method scope_declarator:sym<has>($/)   { self.attach: $/, $<scoped>.ast; }
-    method scope_declarator:sym<HAS>($/)   { self.attach: $/, $<scoped>.ast; }
-    method scope_declarator:sym<anon>($/)  { self.attach: $/, $<scoped>.ast; }
-    method scope_declarator:sym<state>($/) { self.attach: $/, $<scoped>.ast; }
-    method scope_declarator:sym<unit>($/)  { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<my>($/)    { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<our>($/)   { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<has>($/)   { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<HAS>($/)   { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<anon>($/)  { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<state>($/) { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<unit>($/)  { self.attach: $/, $<scoped>.ast; }
 
-    method scope_declarator:sym<augment>($/) { self.attach: $/, $<scoped>.ast; }
+    method scope-declarator:sym<augment>($/) { self.attach: $/, $<scoped>.ast; }
 
     method scoped($/) {
         self.attach: $/, $<DECL>.ast;

diff --git a/src/Raku/Grammar.nqp b/src/Raku/Grammar.nqp
@@ -1818,7 +1818,7 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
     token term:sym<colonpair>          { <colonpair> }
     token term:sym<variable>           { <variable> { $*VAR := $<variable> unless $*VAR; } }
     token term:sym<package-declarator> { <package-declarator> }
-    token term:sym<scope_declarator>   { <scope_declarator> }
+    token term:sym<scope-declarator>   { <scope-declarator> }
     token term:sym<routine_declarator> { <routine_declarator> }
     token term:sym<multi_declarator>   { <?before 'multi'|'proto'|'only'> <multi_declarator> }
     token term:sym<regex_declarator>   { <regex_declarator> }
@@ -2262,17 +2262,17 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
     token enter-package-scope($*SIGNATURE) { <?> }
     token leave-package-scope { <?> }
 
-    proto token scope_declarator {*}
-    token scope_declarator:sym<my>    { <sym> <scoped('my')> }
-    token scope_declarator:sym<our>   { <sym> <scoped('our')> }
-    token scope_declarator:sym<has>   { <sym> <scoped('has')> }
-    token scope_declarator:sym<HAS>   { <sym> <scoped('HAS')> }
-    token scope_declarator:sym<anon>  { <sym> <scoped('anon')> }
-    token scope_declarator:sym<state> { <sym> <scoped('state')> }
-    token scope_declarator:sym<unit>  { <sym> <scoped('unit')> }
-
-    token scope_declarator:sym<augment>   { <sym> <scoped('augment')> }
-    token scope_declarator:sym<supersede> {
+    proto token scope-declarator {*}
+    token scope-declarator:sym<my>    { <sym> <scoped('my')> }
+    token scope-declarator:sym<our>   { <sym> <scoped('our')> }
+    token scope-declarator:sym<has>   { <sym> <scoped('has')> }
+    token scope-declarator:sym<HAS>   { <sym> <scoped('HAS')> }
+    token scope-declarator:sym<anon>  { <sym> <scoped('anon')> }
+    token scope-declarator:sym<state> { <sym> <scoped('state')> }
+    token scope-declarator:sym<unit>  { <sym> <scoped('unit')> }
+
+    token scope-declarator:sym<augment>   { <sym> <scoped('augment')> }
+    token scope-declarator:sym<supersede> {
         <sym> <scoped('supersede')> <.NYI('"supersede"')>
     }