Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
2bb47add
Commit
2bb47add
authored
Nov 30, 2016
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prohibit instantiation of immediate objects
parent
f7c0024b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
0 deletions
+13
-0
src/class.c
src/class.c
+3
-0
src/numeric.c
src/numeric.c
+3
-0
src/object.c
src/object.c
+4
-0
src/symbol.c
src/symbol.c
+3
-0
No files found.
src/class.c
View file @
2bb47add
...
@@ -1348,6 +1348,9 @@ mrb_instance_alloc(mrb_state *mrb, mrb_value cv)
...
@@ -1348,6 +1348,9 @@ mrb_instance_alloc(mrb_state *mrb, mrb_value cv)
mrb_raise
(
mrb
,
E_TYPE_ERROR
,
"can't create instance of singleton class"
);
mrb_raise
(
mrb
,
E_TYPE_ERROR
,
"can't create instance of singleton class"
);
if
(
ttype
==
0
)
ttype
=
MRB_TT_OBJECT
;
if
(
ttype
==
0
)
ttype
=
MRB_TT_OBJECT
;
if
(
ttype
<=
MRB_TT_CPTR
)
{
mrb_raisef
(
mrb
,
E_TYPE_ERROR
,
"can't create instance of %S"
,
cv
);
}
o
=
(
struct
RObject
*
)
mrb_obj_alloc
(
mrb
,
ttype
,
c
);
o
=
(
struct
RObject
*
)
mrb_obj_alloc
(
mrb
,
ttype
,
c
);
return
mrb_obj_value
(
o
);
return
mrb_obj_value
(
o
);
}
}
...
...
src/numeric.c
View file @
2bb47add
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
#include <mruby/array.h>
#include <mruby/array.h>
#include <mruby/numeric.h>
#include <mruby/numeric.h>
#include <mruby/string.h>
#include <mruby/string.h>
#include <mruby/class.h>
#ifdef MRB_USE_FLOAT
#ifdef MRB_USE_FLOAT
#define trunc(f) truncf(f)
#define trunc(f) truncf(f)
...
@@ -1265,6 +1266,7 @@ mrb_init_numeric(mrb_state *mrb)
...
@@ -1265,6 +1266,7 @@ mrb_init_numeric(mrb_state *mrb)
/* Integer Class */
/* Integer Class */
integer
=
mrb_define_class
(
mrb
,
"Integer"
,
numeric
);
/* 15.2.8 */
integer
=
mrb_define_class
(
mrb
,
"Integer"
,
numeric
);
/* 15.2.8 */
MRB_SET_INSTANCE_TT
(
integer
,
MRB_TT_FIXNUM
);
mrb_undef_class_method
(
mrb
,
integer
,
"new"
);
mrb_undef_class_method
(
mrb
,
integer
,
"new"
);
mrb_define_method
(
mrb
,
integer
,
"to_i"
,
int_to_i
,
MRB_ARGS_NONE
());
/* 15.2.8.3.24 */
mrb_define_method
(
mrb
,
integer
,
"to_i"
,
int_to_i
,
MRB_ARGS_NONE
());
/* 15.2.8.3.24 */
mrb_define_method
(
mrb
,
integer
,
"to_int"
,
int_to_i
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
integer
,
"to_int"
,
int_to_i
,
MRB_ARGS_NONE
());
...
@@ -1291,6 +1293,7 @@ mrb_init_numeric(mrb_state *mrb)
...
@@ -1291,6 +1293,7 @@ mrb_init_numeric(mrb_state *mrb)
/* Float Class */
/* Float Class */
mrb
->
float_class
=
fl
=
mrb_define_class
(
mrb
,
"Float"
,
numeric
);
/* 15.2.9 */
mrb
->
float_class
=
fl
=
mrb_define_class
(
mrb
,
"Float"
,
numeric
);
/* 15.2.9 */
MRB_SET_INSTANCE_TT
(
fl
,
MRB_TT_FLOAT
);
mrb_undef_class_method
(
mrb
,
fl
,
"new"
);
mrb_undef_class_method
(
mrb
,
fl
,
"new"
);
mrb_define_method
(
mrb
,
fl
,
"+"
,
flo_plus
,
MRB_ARGS_REQ
(
1
));
/* 15.2.9.3.1 */
mrb_define_method
(
mrb
,
fl
,
"+"
,
flo_plus
,
MRB_ARGS_REQ
(
1
));
/* 15.2.9.3.1 */
mrb_define_method
(
mrb
,
fl
,
"-"
,
flo_minus
,
MRB_ARGS_REQ
(
1
));
/* 15.2.9.3.2 */
mrb_define_method
(
mrb
,
fl
,
"-"
,
flo_minus
,
MRB_ARGS_REQ
(
1
));
/* 15.2.9.3.2 */
...
...
src/object.c
View file @
2bb47add
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
#include <mruby/class.h>
#include <mruby/class.h>
#include <mruby/numeric.h>
#include <mruby/numeric.h>
#include <mruby/string.h>
#include <mruby/string.h>
#include <mruby/class.h>
MRB_API
mrb_bool
MRB_API
mrb_bool
mrb_obj_eq
(
mrb_state
*
mrb
,
mrb_value
v1
,
mrb_value
v2
)
mrb_obj_eq
(
mrb_state
*
mrb
,
mrb_value
v1
,
mrb_value
v2
)
...
@@ -265,6 +266,7 @@ mrb_init_object(mrb_state *mrb)
...
@@ -265,6 +266,7 @@ mrb_init_object(mrb_state *mrb)
struct
RClass
*
f
;
struct
RClass
*
f
;
mrb
->
nil_class
=
n
=
mrb_define_class
(
mrb
,
"NilClass"
,
mrb
->
object_class
);
mrb
->
nil_class
=
n
=
mrb_define_class
(
mrb
,
"NilClass"
,
mrb
->
object_class
);
MRB_SET_INSTANCE_TT
(
n
,
MRB_TT_TRUE
);
mrb_undef_class_method
(
mrb
,
n
,
"new"
);
mrb_undef_class_method
(
mrb
,
n
,
"new"
);
mrb_define_method
(
mrb
,
n
,
"&"
,
false_and
,
MRB_ARGS_REQ
(
1
));
/* 15.2.4.3.1 */
mrb_define_method
(
mrb
,
n
,
"&"
,
false_and
,
MRB_ARGS_REQ
(
1
));
/* 15.2.4.3.1 */
mrb_define_method
(
mrb
,
n
,
"^"
,
false_xor
,
MRB_ARGS_REQ
(
1
));
/* 15.2.4.3.2 */
mrb_define_method
(
mrb
,
n
,
"^"
,
false_xor
,
MRB_ARGS_REQ
(
1
));
/* 15.2.4.3.2 */
...
@@ -274,6 +276,7 @@ mrb_init_object(mrb_state *mrb)
...
@@ -274,6 +276,7 @@ mrb_init_object(mrb_state *mrb)
mrb_define_method
(
mrb
,
n
,
"inspect"
,
nil_inspect
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
n
,
"inspect"
,
nil_inspect
,
MRB_ARGS_NONE
());
mrb
->
true_class
=
t
=
mrb_define_class
(
mrb
,
"TrueClass"
,
mrb
->
object_class
);
mrb
->
true_class
=
t
=
mrb_define_class
(
mrb
,
"TrueClass"
,
mrb
->
object_class
);
MRB_SET_INSTANCE_TT
(
t
,
MRB_TT_TRUE
);
mrb_undef_class_method
(
mrb
,
t
,
"new"
);
mrb_undef_class_method
(
mrb
,
t
,
"new"
);
mrb_define_method
(
mrb
,
t
,
"&"
,
true_and
,
MRB_ARGS_REQ
(
1
));
/* 15.2.5.3.1 */
mrb_define_method
(
mrb
,
t
,
"&"
,
true_and
,
MRB_ARGS_REQ
(
1
));
/* 15.2.5.3.1 */
mrb_define_method
(
mrb
,
t
,
"^"
,
true_xor
,
MRB_ARGS_REQ
(
1
));
/* 15.2.5.3.2 */
mrb_define_method
(
mrb
,
t
,
"^"
,
true_xor
,
MRB_ARGS_REQ
(
1
));
/* 15.2.5.3.2 */
...
@@ -282,6 +285,7 @@ mrb_init_object(mrb_state *mrb)
...
@@ -282,6 +285,7 @@ mrb_init_object(mrb_state *mrb)
mrb_define_method
(
mrb
,
t
,
"inspect"
,
true_to_s
,
MRB_ARGS_NONE
());
mrb_define_method
(
mrb
,
t
,
"inspect"
,
true_to_s
,
MRB_ARGS_NONE
());
mrb
->
false_class
=
f
=
mrb_define_class
(
mrb
,
"FalseClass"
,
mrb
->
object_class
);
mrb
->
false_class
=
f
=
mrb_define_class
(
mrb
,
"FalseClass"
,
mrb
->
object_class
);
MRB_SET_INSTANCE_TT
(
f
,
MRB_TT_TRUE
);
mrb_undef_class_method
(
mrb
,
f
,
"new"
);
mrb_undef_class_method
(
mrb
,
f
,
"new"
);
mrb_define_method
(
mrb
,
f
,
"&"
,
false_and
,
MRB_ARGS_REQ
(
1
));
/* 15.2.6.3.1 */
mrb_define_method
(
mrb
,
f
,
"&"
,
false_and
,
MRB_ARGS_REQ
(
1
));
/* 15.2.6.3.1 */
mrb_define_method
(
mrb
,
f
,
"^"
,
false_xor
,
MRB_ARGS_REQ
(
1
));
/* 15.2.6.3.2 */
mrb_define_method
(
mrb
,
f
,
"^"
,
false_xor
,
MRB_ARGS_REQ
(
1
));
/* 15.2.6.3.2 */
...
...
src/symbol.c
View file @
2bb47add
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
#include <mruby/khash.h>
#include <mruby/khash.h>
#include <mruby/string.h>
#include <mruby/string.h>
#include <mruby/dump.h>
#include <mruby/dump.h>
#include <mruby/class.h>
/* ------------------------------------------------------ */
/* ------------------------------------------------------ */
typedef
struct
symbol_name
{
typedef
struct
symbol_name
{
...
@@ -481,6 +482,8 @@ mrb_init_symbol(mrb_state *mrb)
...
@@ -481,6 +482,8 @@ mrb_init_symbol(mrb_state *mrb)
struct
RClass
*
sym
;
struct
RClass
*
sym
;
mrb
->
symbol_class
=
sym
=
mrb_define_class
(
mrb
,
"Symbol"
,
mrb
->
object_class
);
/* 15.2.11 */
mrb
->
symbol_class
=
sym
=
mrb_define_class
(
mrb
,
"Symbol"
,
mrb
->
object_class
);
/* 15.2.11 */
MRB_SET_INSTANCE_TT
(
sym
,
MRB_TT_SYMBOL
);
mrb_undef_class_method
(
mrb
,
sym
,
"new"
);
mrb_define_method
(
mrb
,
sym
,
"==="
,
sym_equal
,
MRB_ARGS_REQ
(
1
));
/* 15.2.11.3.1 */
mrb_define_method
(
mrb
,
sym
,
"==="
,
sym_equal
,
MRB_ARGS_REQ
(
1
));
/* 15.2.11.3.1 */
mrb_define_method
(
mrb
,
sym
,
"id2name"
,
mrb_sym_to_s
,
MRB_ARGS_NONE
());
/* 15.2.11.3.2 */
mrb_define_method
(
mrb
,
sym
,
"id2name"
,
mrb_sym_to_s
,
MRB_ARGS_NONE
());
/* 15.2.11.3.2 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment