hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a slight bug in parsing 'and' and 'or' in compile_basic_expression().

Browse Source 
writing SocketStream
This commit is contained in:
hyunghwan.chung 2018-06-09 16:48:18 +00:00
parent e074607a00
commit 48bdf7df2c
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moo/kernel/Collect.moo
View File

@ -162,7 +162,7 @@ class(#pointer) Array(SequenceableCollection)
method replaceFrom: start to: stop with: replacement method replaceFrom: start to: stop with: replacement
{ {
self replaceFrom: start to: stop with: replacement startingAt: 0. ^self replaceFrom: start to: stop with: replacement startingAt: 0.
} }
method replaceFrom: start to: stop with: replacement startingAt: rstart method replaceFrom: start to: stop with: replacement startingAt: rstart
@ -177,6 +177,16 @@ class(#pointer) Array(SequenceableCollection)
}. }.
} }
method replaceFrom: start count: count with: replacement
{
^self replaceFrom: start to: (start + count - 1) with: replacement startingAt: 0.
}
method replaceFrom: start count: count with: replacement startingAt: rstart
{
^self replaceFrom: start to: (start + count - 1) with: replacement startingAt: rstart
}
method = anArray method = anArray
{ {
| size i | | size i |

1
moo/kernel/Moo.moo
View File

@ -7,6 +7,7 @@
#include 'Magnitu.moo'. #include 'Magnitu.moo'.
#include 'Collect.moo'. #include 'Collect.moo'.
#include 'Process.moo'. #include 'Process.moo'.
#include 'Stream.moo'.
(* -------------------------------------------------------------------------- *) (* -------------------------------------------------------------------------- *)
## #include 'FFI.moo'. ## #include 'FFI.moo'.

15
moo/lib/comp.c
View File

@ -5523,22 +5523,12 @@ static int compile_basic_expression (moo_t* moo, const moo_oocs_t* ident, const
start_over: start_over:
if (compile_expression_primary(moo, ident, ident_loc, ident_dotted, &to_super) <= -1) goto oops; if (compile_expression_primary(moo, ident, ident_loc, ident_dotted, &to_super) <= -1) goto oops;
#if 0
if (TOKEN_TYPE(moo) != MOO_IOTOK_EOF &&
TOKEN_TYPE(moo) != MOO_IOTOK_RBRACE &&
TOKEN_TYPE(moo) != MOO_IOTOK_PERIOD &&
TOKEN_TYPE(moo) != MOO_IOTOK_SEMICOLON)
{
if (compile_message_expression(moo, to_super) <= -1) goto oops;
}
#else
if (TOKEN_TYPE(moo) == MOO_IOTOK_IDENT || if (TOKEN_TYPE(moo) == MOO_IOTOK_IDENT ||
TOKEN_TYPE(moo) == MOO_IOTOK_BINSEL || TOKEN_TYPE(moo) == MOO_IOTOK_BINSEL ||
TOKEN_TYPE(moo) == MOO_IOTOK_KEYWORD) TOKEN_TYPE(moo) == MOO_IOTOK_KEYWORD)
{ {
if (compile_message_expression(moo, to_super) <= -1) goto oops; if (compile_message_expression(moo, to_super) <= -1) goto oops;
} }
#endif
if (TOKEN_TYPE(moo) == MOO_IOTOK_AND || TOKEN_TYPE(moo) == MOO_IOTOK_OR) if (TOKEN_TYPE(moo) == MOO_IOTOK_AND || TOKEN_TYPE(moo) == MOO_IOTOK_OR)
{ {
@ -5548,6 +5538,9 @@ start_over:
if (add_to_oow_pool(moo, &jumptoend, moo->c->mth.code.len) <= -1 || if (add_to_oow_pool(moo, &jumptoend, moo->c->mth.code.len) <= -1 ||
emit_single_param_instruction(moo, bcode, MAX_CODE_JUMP) <= -1) goto oops; emit_single_param_instruction(moo, bcode, MAX_CODE_JUMP) <= -1) goto oops;
GET_TOKEN (moo); GET_TOKEN (moo);
ident = MOO_NULL;
ident_loc = MOO_NULL;
goto start_over; goto start_over;
} }
@ -6133,7 +6126,7 @@ static int compile_method_expression (moo_t* moo, int pop)
{ {
/* what is held in assignee is not an assignee any more. /* what is held in assignee is not an assignee any more.
* potentially it is a variable or object reference * potentially it is a variable or object reference
* to be pused on to the stack */ * to be pushed on to the stack */
assignee.ptr = &moo->c->mth.assignees.ptr[assignee_offset]; assignee.ptr = &moo->c->mth.assignees.ptr[assignee_offset];
if (compile_basic_expression(moo, &assignee, &assignee_loc, assignee_dotted) <= -1) goto oops; if (compile_basic_expression(moo, &assignee, &assignee_loc, assignee_dotted) <= -1) goto oops;
} }