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
b231bcb8
Commit
b231bcb8
authored
Aug 04, 2012
by
Masaki Muranaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
load_exec(): Fix message lenghtes in mrb_exc_new().
mrb_run(): Fix not to use a magic number but sizeof.
parent
472d214a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
12 deletions
+15
-12
src/parse.y
src/parse.y
+4
-2
src/vm.c
src/vm.c
+11
-10
No files found.
src/parse.y
View file @
b231bcb8
...
@@ -4875,7 +4875,8 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
...
@@ -4875,7 +4875,8 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
return mrb_undef_value();
return mrb_undef_value();
}
}
else {
else {
mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, "syntax error", 0));
static const char msg[] = "syntax error";
mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SYNTAX_ERROR, msg, sizeof(msg) - 1));
mrb_parser_free(p);
mrb_parser_free(p);
return mrb_nil_value();
return mrb_nil_value();
}
}
...
@@ -4883,7 +4884,8 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
...
@@ -4883,7 +4884,8 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
n = mrb_generate_code(mrb, p->tree);
n = mrb_generate_code(mrb, p->tree);
mrb_parser_free(p);
mrb_parser_free(p);
if (n < 0) {
if (n < 0) {
mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SCRIPT_ERROR, "codegen error", 0));
static const char msg[] = "codegen error";
mrb->exc = (struct RObject*)mrb_object(mrb_exc_new(mrb, E_SCRIPT_ERROR, msg, sizeof(msg) - 1));
return mrb_nil_value();
return mrb_nil_value();
}
}
if (c) {
if (c) {
...
...
src/vm.c
View file @
b231bcb8
...
@@ -905,13 +905,13 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
...
@@ -905,13 +905,13 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
if
(
lv
==
0
)
stack
=
regs
+
1
;
if
(
lv
==
0
)
stack
=
regs
+
1
;
else
{
else
{
struct
REnv
*
e
=
uvenv
(
mrb
,
lv
-
1
);
struct
REnv
*
e
=
uvenv
(
mrb
,
lv
-
1
);
if
(
!
e
)
{
if
(
!
e
)
{
mrb_value
exc
;
mrb_value
exc
;
static
const
char
m
[]
=
"super called outside of method"
;
static
const
char
m
[]
=
"super called outside of method"
;
exc
=
mrb_exc_new
(
mrb
,
E_NOMETHOD_ERROR
,
m
,
sizeof
(
m
)
-
1
);
exc
=
mrb_exc_new
(
mrb
,
E_NOMETHOD_ERROR
,
m
,
sizeof
(
m
)
-
1
);
mrb
->
exc
=
(
struct
RObject
*
)
mrb_object
(
exc
);
mrb
->
exc
=
(
struct
RObject
*
)
mrb_object
(
exc
);
goto
L_RAISE
;
goto
L_RAISE
;
}
}
stack
=
e
->
stack
+
1
;
stack
=
e
->
stack
+
1
;
}
}
if
(
r
==
0
)
{
if
(
r
==
0
)
{
...
@@ -1598,9 +1598,10 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
...
@@ -1598,9 +1598,10 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
CASE
(
OP_TCLASS
)
{
CASE
(
OP_TCLASS
)
{
/* A B R(A) := target_class */
/* A B R(A) := target_class */
if
(
!
mrb
->
ci
->
target_class
)
{
if
(
!
mrb
->
ci
->
target_class
)
{
mrb_value
exc
=
mrb_exc_new
(
mrb
,
E_TYPE_ERROR
,
"no target class or module"
,
25
);
static
const
char
msg
[]
=
"no target class or module"
;
mrb
->
exc
=
(
struct
RObject
*
)
mrb_object
(
exc
);
mrb_value
exc
=
mrb_exc_new
(
mrb
,
E_TYPE_ERROR
,
msg
,
sizeof
(
msg
)
-
1
);
goto
L_RAISE
;
mrb
->
exc
=
(
struct
RObject
*
)
mrb_object
(
exc
);
goto
L_RAISE
;
}
}
regs
[
GETARG_A
(
i
)]
=
mrb_obj_value
(
mrb
->
ci
->
target_class
);
regs
[
GETARG_A
(
i
)]
=
mrb_obj_value
(
mrb
->
ci
->
target_class
);
NEXT
;
NEXT
;
...
...
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