diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-15 10:55:46 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-15 10:55:46 +0900 |
| commit | 5138f62d6ba666dc0cb43618f407701b0414040e (patch) | |
| tree | 6847b42135cba62a7ef7f4e359647122d1be173a /src/class.c | |
| parent | 6e0c48d7584d27883d8fb7e5c6fe8eb6f1db0a91 (diff) | |
| parent | f3f99fa2cde9b05fde3fa5e4317ed7dc5e81aea8 (diff) | |
| download | mruby-5138f62d6ba666dc0cb43618f407701b0414040e.tar.gz mruby-5138f62d6ba666dc0cb43618f407701b0414040e.zip | |
resolve conflict
Diffstat (limited to 'src/class.c')
| -rw-r--r-- | src/class.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/class.c b/src/class.c index 30c33d692..33515de2c 100644 --- a/src/class.c +++ b/src/class.c @@ -1944,9 +1944,9 @@ mrb_init_class(mrb_state *mrb) /* name each classes */ name_class(mrb, bob, mrb_intern_lit(mrb, "BasicObject")); - name_class(mrb, obj, mrb_intern_lit(mrb, "Object")); - name_class(mrb, mod, mrb_intern_lit(mrb, "Module")); - name_class(mrb, cls, mrb_intern_lit(mrb, "Class")); + name_class(mrb, obj, mrb_intern_lit(mrb, "Object")); /* 15.2.1 */ + name_class(mrb, mod, mrb_intern_lit(mrb, "Module")); /* 15.2.2 */ + name_class(mrb, cls, mrb_intern_lit(mrb, "Class")); /* 15.2.3 */ MRB_SET_INSTANCE_TT(cls, MRB_TT_CLASS); mrb_define_method(mrb, bob, "initialize", mrb_bob_init, MRB_ARGS_NONE()); |