Merge commit '7e7f1b2' into stable

AUTHORS

@@ -1,13 +1,13 @@
 # Authors of mruby (mruby developers)
 
-## The List of Contributors sorted by number of commits (as of 2021-11-22 01cadd3)
+## The List of Contributors sorted by number of commits (as of 2022-01-10 69b1667)
 
-   7874 Yukihiro "Matz" Matsumoto (@matz)*
+   7956 Yukihiro "Matz" Matsumoto (@matz)*
     586 KOBAYASHI Shuji (@shuujii)
     376 Daniel Bovensiepen (@bovi)
     346 Takeshi Watanabe (@take-cheeze)*
+    342 dearblue (@dearblue)*
     334 Masaki Muranaka (@monaka)
-    321 dearblue (@dearblue)*
     298 Tomoyuki Sahara (@tsahara)*
     234 Jun Hiroe (@suzukaze)
     219 Cremno (@cremno)*
@@ -19,13 +19,13 @@
      80 Masamitsu MURASE (@masamitsu-murase)
      74 Yuichiro MASUI (@masuidrive)
      71 Tatsuhiko Kubo (@cubicdaiya)*
-     67 Hiroshi Mimaki (@mimaki)*
+     68 Hiroshi Mimaki (@mimaki)*
      63 Akira Yumiyama (@akiray03)*
      62 Paolo Bosetti (@pbosetti)*
      59 Kurebayashi, Takahiro (@crimsonwoods)*
      56 h2so5 (@h2so5)
      52 Ralph Desir (@Mav7)*
-     47 John Bampton (@jbampton)
+     49 John Bampton (@jbampton)
      45 Rory O'Connell (@RoryO)*
      43 Yuichiro Kaneko (@yui-knk)+
      42 fleuria (@flaneur2020)

mrbgems/mruby-compiler/core/parse.y

@@ -712,9 +712,6 @@ new_cvar(parser_state *p, mrb_sym sym)
 static node*
 new_nvar(parser_state *p, int num)
 {
-  int nvars = intn(p->nvars->car);
-
-  p->nvars->car = nint(nvars > num ? nvars : num);
   return cons((node*)NODE_NVAR, nint(num));
 }
 
@@ -6425,12 +6422,17 @@ parser_yylex(parser_state *p)
             nvars = nvars->cdr;
           }
           nvar = intn(p->nvars->car);
-          if (nvar == -1) {
-            yywarning(p, "numbered parameter used in inner block");
+          if (nvar != -2) {     /* numbered parameters never appear on toplevel */
+            if (nvar == -1) {
+              yywarning(p, "numbered parameter used in inner block");
+            }
+            else {
+              p->nvars->car = nint(nvar > n ? nvar : n);
+            }
+            pylval.num = n;
+            p->lstate = EXPR_END;
+            return tNUMPARAM;
           }
-          pylval.num = n;
-          p->lstate = EXPR_END;
-          return tNUMPARAM;
         }
       }
       /* fall through */

src/cdump.c

@@ -1,5 +1,5 @@
 /*
-** dump.c - mruby binary dumper (mrbc binary format)
+** cdump.c - mruby binary dumper (in C)
 **
 ** See Copyright Notice in mruby.h
 */

src/dump.c

@@ -1,5 +1,5 @@
 /*
-** cdump.c - mruby binary dumper (in C)
+** dump.c - mruby binary dumper (mrbc binary format)
 **
 ** See Copyright Notice in mruby.h
 */