include/presym.h: MRB_GVSYM() for global variables is now available

matz · matz · commit d13e6ff8c98f · 2024-12-14T16:03:35.000+09:00
diff --git a/doc/guides/symbol.md b/doc/guides/symbol.md
@@ -63,6 +63,7 @@ header.
 - `MRB_SYM_B(xor)` //=> xor! (Method with Bang)
 - `MRB_SYM_Q(xor)` //=> xor? (Method with Question mark)
 - `MRB_SYM_E(xor)` //=> xor= (Method with Equal)
+- `MRB_GVSYM(xor)` //=> $xor (Global Variable)
 - `MRB_CVSYM(xor)` //=> @@xor (Class Variable)
 - `MRB_IVSYM(xor)` //=> @xor (Instance Variable)
 - `MRB_OPSYM(xor)` //=> ^ (Operator)
diff --git a/include/mruby.h b/include/mruby.h
@@ -1141,8 +1141,9 @@ MRB_API mrb_value mrb_funcall_argv(mrb_state *mrb, mrb_value val, mrb_sym name,
  */
 MRB_API mrb_value mrb_funcall_with_block(mrb_state *mrb, mrb_value val, mrb_sym name, mrb_int argc, const mrb_value *argv, mrb_value block);
 /**
- * Create a symbol from C string. But usually it's better to use MRB_SYM,
- * MRB_OPSYM, MRB_CVSYM, MRB_IVSYM, MRB_SYM_B, MRB_SYM_Q, MRB_SYM_E macros.
+ * Create a symbol from C string. But usually it's better to
+ * use MRB_SYM, MRB_OPSYM, MRB_CVSYM, MRB_IVSYM, MRB_GVSYM,
+ * MRB_SYM_B, MRB_SYM_Q, MRB_SYM_E macros.
  *
  * Example:
  *
diff --git a/include/mruby/presym.h b/include/mruby/presym.h
@@ -19,6 +19,7 @@
  * macros.
  *
  *   MRB_OPSYM(xor)  //=> ^      (Operator)
+ *   MRB_GVSYM(xor)  //=> $xor   (Global Variable)
  *   MRB_CVSYM(xor)  //=> @@xor  (Class Variable)
  *   MRB_IVSYM(xor)  //=> @xor   (Instance Variable)
  *   MRB_SYM_B(xor)  //=> xor!   (Method with Bang)
diff --git a/include/mruby/presym/disable.h b/include/mruby/presym/disable.h
@@ -12,6 +12,7 @@
 #define MRB_PRESYM_MAX 0
 
 #define MRB_OPSYM(name) MRB_OPSYM__##name(mrb)
+#define MRB_GVSYM(name) mrb_intern_lit(mrb, "$" #name)
 #define MRB_CVSYM(name) mrb_intern_lit(mrb, "@@" #name)
 #define MRB_IVSYM(name) mrb_intern_lit(mrb, "@" #name)
 #define MRB_SYM_B(name) mrb_intern_lit(mrb, #name "!")
@@ -20,6 +21,7 @@
 #define MRB_SYM(name) mrb_intern_lit(mrb, #name)
 
 #define MRB_OPSYM_2(mrb, name) MRB_OPSYM__##name(mrb)
+#define MRB_GVSYM_2(mrb, name) mrb_intern_lit(mrb, "$" #name)
 #define MRB_CVSYM_2(mrb, name) mrb_intern_lit(mrb, "@@" #name)
 #define MRB_IVSYM_2(mrb, name) mrb_intern_lit(mrb, "@" #name)
 #define MRB_SYM_B_2(mrb, name) mrb_intern_lit(mrb, #name "!")
diff --git a/include/mruby/presym/enable.h b/include/mruby/presym/enable.h
@@ -10,6 +10,7 @@
 #include <mruby/presym/id.h>
 
 #define MRB_OPSYM(name) MRB_OPSYM__##name
+#define MRB_GVSYM(name) MRB_GVSYM__##name
 #define MRB_CVSYM(name) MRB_CVSYM__##name
 #define MRB_IVSYM(name) MRB_IVSYM__##name
 #define MRB_SYM_B(name) MRB_SYM_B__##name
@@ -18,6 +19,7 @@
 #define MRB_SYM(name) MRB_SYM__##name
 
 #define MRB_OPSYM_2(mrb, name) MRB_OPSYM__##name
+#define MRB_GVSYM_2(mrb, name) MRB_GVSYM__##name
 #define MRB_CVSYM_2(mrb, name) MRB_CVSYM__##name
 #define MRB_IVSYM_2(mrb, name) MRB_IVSYM__##name
 #define MRB_SYM_B_2(mrb, name) MRB_SYM_B__##name
diff --git a/include/mruby/presym/scanning.h b/include/mruby/presym/scanning.h
@@ -30,6 +30,7 @@
 #define mrb_funcall(mrb, v, name, ...) MRB_PRESYM_SCANNING_TAGGED(name) (v) (__VA_ARGS__)
 
 #define MRB_OPSYM(name) MRB_OPSYM__##name(mrb)
+#define MRB_GVSYM(name) MRB_PRESYM_SCANNING_TAGGED("$" #name)
 #define MRB_CVSYM(name) MRB_PRESYM_SCANNING_TAGGED("@@" #name)
 #define MRB_IVSYM(name) MRB_PRESYM_SCANNING_TAGGED("@" #name)
 #define MRB_SYM_B(name) MRB_PRESYM_SCANNING_TAGGED(#name "!")
@@ -38,6 +39,7 @@
 #define MRB_SYM(name) MRB_PRESYM_SCANNING_TAGGED(#name)
 
 #define MRB_OPSYM_2(mrb, name) MRB_OPSYM__##name(mrb)
+#define MRB_GVSYM_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED("$" #name)
 #define MRB_CVSYM_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED("@@" #name)
 #define MRB_IVSYM_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED("@" #name)
 #define MRB_SYM_B_2(mrb, name) MRB_PRESYM_SCANNING_TAGGED(#name "!")
diff --git a/lib/mruby/presym.rb b/lib/mruby/presym.rb
@@ -36,6 +36,7 @@ class Presym
     SYMBOL_TO_MACRO = {
     #      Symbol      =>      Macro
     # [prefix, suffix] => [prefix, suffix]
+      ["$"   , ""    ] => ["GV"  , ""    ],
       ["@@"  , ""    ] => ["CV"  , ""    ],
       ["@"   , ""    ] => ["IV"  , ""    ],
       [""    , "!"   ] => [""    , "_B"  ],

Original file line number	Diff line number	Diff line change
`@@ -1141,8 +1141,9 @@ MRB_API mrb_value mrb_funcall_argv(mrb_state *mrb, mrb_value val, mrb_sym name,`
`1141`	`1141`	`*/`
`1142`	`1142`	`MRB_API mrb_value mrb_funcall_with_block(mrb_state mrb, mrb_value val, mrb_sym name, mrb_int argc, const mrb_value argv, mrb_value block);`
`1143`	`1143`	`/**`
`1144`		`- * Create a symbol from C string. But usually it's better to use MRB_SYM,`
`1145`		`- * MRB_OPSYM, MRB_CVSYM, MRB_IVSYM, MRB_SYM_B, MRB_SYM_Q, MRB_SYM_E macros.`
	`1144`	`+ * Create a symbol from C string. But usually it's better to`
	`1145`	`+ * use MRB_SYM, MRB_OPSYM, MRB_CVSYM, MRB_IVSYM, MRB_GVSYM,`
	`1146`	`+ * MRB_SYM_B, MRB_SYM_Q, MRB_SYM_E macros.`
`1146`	`1147`	`*`
`1147`	`1148`	`* Example:`
`1148`	`1149`	`*`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`* macros.`
`20`	`20`	`*`
`21`	`21`	`* MRB_OPSYM(xor) //=> ^ (Operator)`
	`22`	`+ * MRB_GVSYM(xor) //=> $xor (Global Variable)`
`22`	`23`	`* MRB_CVSYM(xor) //=> @@xor (Class Variable)`
`23`	`24`	`* MRB_IVSYM(xor) //=> @xor (Instance Variable)`
`24`	`25`	`* MRB_SYM_B(xor) //=> xor! (Method with Bang)`