8000 Merge branch 'master' into implement_robust_data_accessor · mrubyc/mrubyc@2cd05f6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2cd05f6

Browse files
HirohitoHigashiHirohitoHigashi
committed
Merge branch 'master' into implement_robust_data_accessor
2 parents 6af74d5 + 58ec64d commit 2cd05f6

File tree

3 files changed

+121
-106
lines changed

3 files changed

+121
-106
lines changed

‎src/_autogen_builtin_symbol.h

Lines changed: 112 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -176,59 +176,62 @@ static const char *builtin_symbols[] = {
176176
"printf", // MRBC_SYMID_printf = 169(0xa9)
177177
"priority", // MRBC_SYMID_priority = 170(0xaa)
178178
"priority=", // MRBC_SYMID_priority_EQ = 171(0xab)
179-
"push", // MRBC_SYMID_push = 172(0xac)
180-
"puts", // MRBC_SYMID_puts = 173(0xad)
181-
"raise", // MRBC_SYMID_raise = 174(0xae)
182-
"reject", // MRBC_SYMID_reject = 175(0xaf)
183-
"reject!", // MRBC_SYMID_reject_E = 176(0xb0)
184-
"resume", // MRBC_SYMID_resume = 177(0xb1)
185-
"rewind", // MRBC_SYMID_rewind = 178(0xb2)
186-
"rjust", // MRBC_SYMID_rjust = 179(0xb3)
187-
"rstrip", // MRBC_SYMID_rstrip = 180(0xb4)
188-
"rstrip!", // MRBC_SYMID_rstrip_E = 181(0xb5)
189-
"run", // MRBC_SYMID_run = 182(0xb6)
190-
"setbyte", // MRBC_SYMID_setbyte = 183(0xb7)
191-
"shift", // MRBC_SYMID_shift = 184(0xb8)
192-
"sin", // MRBC_SYMID_sin = 185(0xb9)
193-
"sinh", // MRBC_SYMID_sinh = 186(0xba)
194-
"size", // MRBC_SYMID_size = 187(0xbb)
195-
"slice", // MRBC_SYMID_slice = 188(0xbc)
196-
"slice!", // MRBC_SYMID_slice_E = 189(0xbd)
197-
"sort", // MRBC_SYMID_sort = 190(0xbe)
198-
"sort!", // MRBC_SYMID_sort_E = 191(0xbf)
199-
"split", // MRBC_SYMID_split = 192(0xc0)
200-
"sprintf", // MRBC_SYMID_sprintf = 193(0xc1)
201-
"sqrt", // MRBC_SYMID_sqrt = 194(0xc2)
202-
"start_with?", // MRBC_SYMID_start_with_Q = 195(0xc3)
203-
"status", // MRBC_SYMID_status = 196(0xc4)
204-
"strip", // MRBC_SYMID_strip = 197(0xc5)
205-
"strip!", // MRBC_SYMID_strip_E = 198(0xc6)
206-
"suspend", // MRBC_SYMID_suspend = 199(0xc7)
207-
"tan", // MRBC_SYMID_tan = 200(0xc8)
208-
"tanh", // MRBC_SYMID_tanh = 201(0xc9)
209-
"terminate", // MRBC_SYMID_terminate = 202(0xca)
210-
"tick", // MRBC_SYMID_tick = 203(0xcb)
211-
"times", // MRBC_SYMID_times = 204(0xcc)
212-
"to_a", // MRBC_SYMID_to_a = 205(0xcd)
213-
"to_f", // MRBC_SYMID_to_f = 206(0xce)
214-
"to_h", // MRBC_SYMID_to_h = 207(0xcf)
215-
"to_i", // MRBC_SYMID_to_i = 208(0xd0)
216-
"to_s", // MRBC_SYMID_to_s = 209(0xd1)
217-
"to_sym", // MRBC_SYMID_to_sym = 210(0xd2)
218-
"tr", // MRBC_SYMID_tr = 211(0xd3)
219-
"tr!", // MRBC_SYMID_tr_E = 212(0xd4)
220-
"try_lock", // MRBC_SYMID_try_lock = 213(0xd5)
221-
"uniq", // MRBC_SYMID_uniq = 214(0xd6)
222-
"uniq!", // MRBC_SYMID_uniq_E = 215(0xd7)
223-
"unlock", // MRBC_SYMID_unlock = 216(0xd8)
224-
"unshift", // MRBC_SYMID_unshift = 217(0xd9)
225-
"upcase", // MRBC_SYMID_upcase = 218(0xda)
226-
"upcase!", // MRBC_SYMID_upcase_E = 219(0xdb)
227-
"upto", // MRBC_SYMID_upto = 220(0xdc)
228-
"value", // MRBC_SYMID_value = 221(0xdd)
229-
"values", // MRBC_SYMID_values = 222(0xde)
230-
"|", // MRBC_SYMID_OR = 223(0xdf)
231-
"~", // MRBC_SYMID_NEG = 224(0xe0)
179+
"private", // MRBC_SYMID_private = 172(0xac)
180+
"protected", // MRBC_SYMID_protected = 173(0xad)
181+
"public", // MRBC_SYMID_public = 174(0xae)
182+
"push", // MRBC_SYMID_push = 175(0xaf)
183+
"puts", // MRBC_SYMID_puts = 176(0xb0)
184+
"raise", // MRBC_SYMID_raise = 177(0xb1)
185+
"reject", // MRBC_SYMID_reject = 178(0xb2)
186+
"reject!", // MRBC_SYMID_reject_E = 179(0xb3)
187+
"resume", // MRBC_SYMID_resume = 180(0xb4)
188+
"rewind", // MRBC_SYMID_rewind = 181(0xb5)
189+
"rjust", // MRBC_SYMID_rjust = 182(0xb6)
190+
"rstrip", // MRBC_SYMID_rstrip = 183(0xb7)
191+
"rstrip!", // MRBC_SYMID_rstrip_E = 184(0xb8)
192+
"run", // MRBC_SYMID_run = 185(0xb9)
193+
"setbyte", // MRBC_SYMID_setbyte = 186(0xba)
194+
"shift", // MRBC_SYMID_shift = 187(0xbb)
195+
"sin", // MRBC_SYMID_sin = 188(0xbc)
196+
"sinh", // MRBC_SYMID_sinh = 189(0xbd)
197+
"size", // MRBC_SYMID_size = 190(0xbe)
198+
"slice", // MRBC_SYMID_slice = 191(0xbf)
199+
"slice!", // MRBC_SYMID_slice_E = 192(0xc0)
200+
"sort", // MRBC_SYMID_sort = 193(0xc1)
201+
"sort!", // MRBC_SYMID_sort_E = 194(0xc2)
202+
"split", // MRBC_SYMID_split = 195(0xc3)
203+
"sprintf", // MRBC_SYMID_sprintf = 196(0xc4)
204+
"sqrt", // MRBC_SYMID_sqrt = 197(0xc5)
205+
"start_with?", // MRBC_SYMID_start_with_Q = 198(0xc6)
206+
"status", // MRBC_SYMID_status = 199(0xc7)
207+
"strip", // MRBC_SYMID_strip = 200(0xc8)
208+
"strip!", // MRBC_SYMID_strip_E = 201(0xc9)
209+
"suspend", // MRBC_SYMID_suspend = 202(0xca)
210+
"tan", // MRBC_SYMID_tan = 203(0xcb)
211+
"tanh", // MRBC_SYMID_tanh = 204(0xcc)
212+
"terminate", // MRBC_SYMID_terminate = 205(0xcd)
213+
"tick", // MRBC_SYMID_tick = 206(0xce)
214+
"times", // MRBC_SYMID_times = 207(0xcf)
215+
"to_a", // MRBC_SYMID_to_a = 208(0xd0)
216+
"to_f", // MRBC_SYMID_to_f = 209(0xd1)
217+
"to_h", // MRBC_SYMID_to_h = 210(0xd2)
218+
"to_i", // MRBC_SYMID_to_i = 211(0xd3)
219+
"to_s", // MRBC_SYMID_to_s = 212(0xd4)
220+
"to_sym", // MRBC_SYMID_to_sym = 213(0xd5)
221+
"tr", // MRBC_SYMID_tr = 214(0xd6)
222+
"tr!", // MRBC_SYMID_tr_E = 215(0xd7)
223+
"try_lock", // MRBC_SYMID_try_lock = 216(0xd8)
224+
"uniq", // MRBC_SYMID_uniq = 217(0xd9)
225+
"uniq!", // MRBC_SYMID_uniq_E = 218(0xda)
226+
"unlock", // MRBC_SYMID_unlock = 219(0xdb)
227+
"unshift", // MRBC_SYMID_unshift = 220(0xdc)
228+
"upcase", // MRBC_SYMID_upcase = 221(0xdd)
229+
"upcase!", // MRBC_SYMID_upcase_E = 222(0xde)
230+
"upto", // MRBC_SYMID_upto = 223(0xdf)
231+
"value", // MRBC_SYMID_value = 224(0xe0)
232+
"values", // MRBC_SYMID_values = 225(0xe1)
233+
"|", // MRBC_SYMID_OR = 226(0xe2)
234+
"~", // MRBC_SYMID_NEG = 227(0xe3)
232235
};
233236
#endif
234237

@@ -404,59 +407,62 @@ enum {
404407
MRBC_SYMID_printf = 169,
405408
MRBC_SYMID_priority = 170,
406409
MRBC_SYMID_priority_EQ = 171,
407-
MRBC_SYMID_push = 172,
408-
MRBC_SYMID_puts = 173,
409-
MRBC_SYMID_raise = 174,
410-
MRBC_SYMID_reject = 175,
411-
MRBC_SYMID_reject_E = 176,
412-
MRBC_SYMID_resume = 177,
413-
MRBC_SYMID_rewind = 178,
414-
MRBC_SYMID_rjust = 179,
415-
MRBC_SYMID_rstrip = 180,
416-
MRBC_SYMID_rstrip_E = 181,
417-
MRBC_SYMID_run = 182,
418-
MRBC_SYMID_setbyte = 183,
419-
MRBC_SYMID_shift = 184,
420-
MRBC_SYMID_sin = 185,
421-
MRBC_SYMID_sinh = 186,
422-
MRBC_SYMID_size = 187,
423-
MRBC_SYMID_slice = 188,
424-
MRBC_SYMID_slice_E = 189,
425-
MRBC_SYMID_sort = 190,
426-
MRBC_SYMID_sort_E = 191,
427-
MRBC_SYMID_split = 192,
428-
MRBC_SYMID_sprintf = 193,
429-
MRBC_SYMID_sqrt = 194,
430-
MRBC_SYMID_start_with_Q = 195,
431-
MRBC_SYMID_status = 196,
432-
MRBC_SYMID_strip = 197,
433-
MRBC_SYMID_strip_E = 198,
434-
MRBC_SYMID_suspend = 199,
435-
MRBC_SYMID_tan = 200,
436-
MRBC_SYMID_tanh = 201,
437-
MRBC_SYMID_terminate = 202,
438-
MRBC_SYMID_tick = 203,
439-
MRBC_SYMID_times = 204,
440-
MRBC_SYMID_to_a = 205,
441-
MRBC_SYMID_to_f = 206,
442-
MRBC_SYMID_to_h = 207,
443-
MRBC_SYMID_to_i = 208,
444-
MRBC_SYMID_to_s = 209,
445-
MRBC_SYMID_to_sym = 210,
446-
MRBC_SYMID_tr = 211,
447-
MRBC_SYMID_tr_E = 212,
448-
MRBC_SYMID_try_lock = 213,
449-
MRBC_SYMID_uniq = 214,
450-
MRBC_SYMID_uniq_E = 215,
451-
MRBC_SYMID_unlock = 216,
452-
MRBC_SYMID_unshift = 217,
453-
MRBC_SYMID_upcase = 218,
454-
MRBC_SYMID_upcase_E = 219,
455-
MRBC_SYMID_upto = 220,
456-
MRBC_SYMID_value = 221,
457-
MRBC_SYMID_values = 222,
458-
MRBC_SYMID_OR = 223,
459-
MRBC_SYMID_NEG = 224,
410+
MRBC_SYMID_private = 172,
411+
MRBC_SYMID_protected = 173,
412+
MRBC_SYMID_public = 174,
413+
MRBC_SYMID_push = 175,
414+
MRBC_SYMID_puts = 176,
415+
MRBC_SYMID_raise = 177,
416+
MRBC_SYMID_reject = 178,
417+
MRBC_SYMID_reject_E = 179,
418+
MRBC_SYMID_resume = 180,
419+
MRBC_SYMID_rewind = 181,
420+
MRBC_SYMID_rjust = 182,
421+
MRBC_SYMID_rstrip = 183,
422+
MRBC_SYMID_rstrip_E = 184,
423+
MRBC_SYMID_run = 185,
424+
MRBC_SYMID_setbyte = 186,
425+
MRBC_SYMID_shift = 187,
426+
MRBC_SYMID_sin = 188,
427+
MRBC_SYMID_sinh = 189,
428+
MRBC_SYMID_size = 190,
429+
MRBC_SYMID_slice = 191,
430+
MRBC_SYMID_slice_E = 192,
431+
MRBC_SYMID_sort = 193,
432+
MRBC_SYMID_sort_E = 194,
433+
MRBC_SYMID_split = 195,
434+
MRBC_SYMID_sprintf = 196,
435+
MRBC_SYMID_sqrt = 197,
436+
MRBC_SYMID_start_with_Q = 198,
437+
MRBC_SYMID_status = 199,
438+
MRBC_SYMID_strip = 200,
439+
MRBC_SYMID_strip_E = 201,
440+
MRBC_SYMID_suspend = 202,
441+
MRBC_SYMID_tan = 203,
442+
MRBC_SYMID_tanh = 204,
443+
MRBC_SYMID_terminate = 205,
444+
MRBC_SYMID_tick = 206,
445+
MRBC_SYMID_times = 207,
446+
MRBC_SYMID_to_a = 208,
447+
MRBC_SYMID_to_f = 209,
448+
MRBC_SYMID_to_h = 210,
449+
MRBC_SYMID_to_i = 211,
450+
MRBC_SYMID_to_s = 212,
451+
MRBC_SYMID_to_sym = 213,
452+
MRBC_SYMID_tr = 214,
453+
MRBC_SYMID_tr_E = 215,
454+
MRBC_SYMID_try_lock = 216,
455+
MRBC_SYMID_uniq = 217,
456+
MRBC_SYMID_uniq_E = 218,
457+
MRBC_SYMID_unlock = 219,
458+
MRBC_SYMID_unshift = 220,
459+
MRBC_SYMID_upcase = 221,
460+
MRBC_SYMID_upcase_E = 222,
461+
MRBC_SYMID_upto = 223,
462+
MRBC_SYMID_value = 224,
463+
MRBC_SYMID_values = 225,
464+
MRBC_SYMID_OR = 226,
465+
MRBC_SYMID_NEG = 227,
460466
};
461467

462468
#endif

‎src/_autogen_class_object.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ static const mrbc_sym method_symbols_Object[] = {
4848
MRBC_SYM(printf),
4949
#endif
5050
#endif
51+
MRBC_SYM(private),
52+
MRBC_SYM(protected),
53+
MRBC_SYM(public),
5154
#if !defined(MRBC_NO_STDIO)
5255
MRBC_SYM(puts),
5356
#endif
@@ -106,6 +109,9 @@ static const mrbc_func_t method_functions_Object[] = {
106109
c_object_printf,
107110
#endif
108111
#endif
112+
c_ineffect,
113+
c_ineffect,
114+
c_ineffect,
109115
#if !defined(MRBC_NO_STDIO)
110116
c_object_puts,
111117
#endif

‎src/c_object.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,9 @@ static void c_object_to_s(struct VM *vm, mrbc_value v[], int argc)
829829
METHOD( "include", c_object_include )
830830
METHOD( "extend", c_object_include )
831831
METHOD( "constants", c_object_constants )
832+
METHOD( "public", c_ineffect )
833+
METHOD( "private", c_ineffect )
834+
METHOD( "protected", c_ineffect )
832835
833836
#if MRBC_USE_STRING
834837
METHOD( "sprintf", c_object_sprintf )

0 commit comments

Comments
 (0)
0