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

added two new keywords (and, or) for logical operations. work in progress

Browse Source
This commit is contained in:
hyunghwan.chung
2018-05-30 11:31:26 +00:00
parent 380395c910
commit 8965720926
4 changed files with 124 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
moo/lib/comp.c
View File

@ -105,6 +105,7 @@ static struct voca_t
moo_oow_t len;
moo_ooch_t str[11];
} vocas[] = {
{ 3, { 'a','n','d' } },
{ 5, { 'b','r','e','a','k' } },
{ 5, { '#','b','y','t','e' } },
{ 10, { '#','c','h','a','r','a','c','t','e','r' } },
@ -137,6 +138,7 @@ static struct voca_t
{ 3, { 'n','i','l' } },
{ 3, { 'o','f','f' } },
{ 2, { 'o','n' } },
{ 2, { 'o','r' } },
{ 8, { '#','p','o','i','n','t','e','r' } },
{ 7, { 'p','o','o','l','d','i','c' } },
{ 8, { '#','p','o','o','l','d','i','c' } },
@ -169,6 +171,7 @@ static struct voca_t
enum voca_id_t
{
VOCA_AND,
VOCA_BREAK,
VOCA_BYTE_S,
VOCA_CHARACTER_S,
@ -201,6 +204,7 @@ enum voca_id_t
VOCA_NIL,
VOCA_OFF,
VOCA_ON,
VOCA_OR,
VOCA_POINTER_S,
VOCA_POOLDIC,
VOCA_POOLDIC_S,
@ -1228,6 +1232,14 @@ static int get_ident (moo_t* moo, moo_ooci_t char_read_ahead)
{
SET_TOKEN_TYPE (moo, MOO_IOTOK_CONTINUE);
}
else if (is_token_word(moo, VOCA_AND))
{
SET_TOKEN_TYPE (moo, MOO_IOTOK_AND);
}
else if (is_token_word(moo, VOCA_OR))
{
SET_TOKEN_TYPE (moo, MOO_IOTOK_OR);
}
}
return 0;
@ -2621,7 +2633,6 @@ static void eliminate_instructions (moo_t* moo, moo_oow_t start, moo_oow_t end)
last = moo->c->mth.code.len - 1;
if (end >= last)
{
/* eliminate all instructions starting from the start index.
@ -5494,9 +5505,17 @@ static int compile_basic_expression (moo_t* moo, const moo_oocs_t* ident, const
/*
* basic-expression := expression-primary message-expression?
*/
moo_oow_pool_t jumptoend;
moo_oow_pool_chunk_t* jumptoend_chunk;
moo_ioloc_t expr_loc;
moo_oow_t i, j;
int to_super;
if (compile_expression_primary(moo, ident, ident_loc, ident_dotted, &to_super) <= -1) return -1;
expr_loc = *TOKEN_LOC(moo);
init_oow_pool (moo, &jumptoend);
start_over:
if (compile_expression_primary(moo, ident, ident_loc, ident_dotted, &to_super) <= -1) goto oops;
#if 0
if (TOKEN_TYPE(moo) != MOO_IOTOK_EOF &&
@ -5504,18 +5523,54 @@ static int compile_basic_expression (moo_t* moo, const moo_oocs_t* ident, const
TOKEN_TYPE(moo) != MOO_IOTOK_PERIOD &&
TOKEN_TYPE(moo) != MOO_IOTOK_SEMICOLON)
{
if (compile_message_expression(moo, to_super) <= -1) return -1;
if (compile_message_expression(moo, to_super) <= -1) goto oops;
}
#else
if (TOKEN_TYPE(moo) == MOO_IOTOK_IDENT ||
TOKEN_TYPE(moo) == MOO_IOTOK_BINSEL ||
TOKEN_TYPE(moo) == MOO_IOTOK_KEYWORD)
{
if (compile_message_expression(moo, to_super) <= -1) return -1;
if (compile_message_expression(moo, to_super) <= -1) goto oops;
}
#endif
if (TOKEN_TYPE(moo) == MOO_IOTOK_AND)
{
if (add_to_oow_pool(moo, &jumptoend, moo->c->mth.code.len) <= -1 ||
emit_single_param_instruction(moo, BCODE_JUMP_FORWARD_IF_FALSE, MAX_CODE_JUMP) <= -1 ||
emit_byte_instruction(moo, BCODE_POP_STACKTOP) <= -1) goto oops;
GET_TOKEN (moo);
goto start_over;
}
else if (TOKEN_TYPE(moo) == MOO_IOTOK_OR)
{
if (add_to_oow_pool(moo, &jumptoend, moo->c->mth.code.len) <= -1 ||
emit_single_param_instruction(moo, BCODE_JUMP_FORWARD_IF_TRUE, MAX_CODE_JUMP) <= -1 ||
emit_byte_instruction(moo, BCODE_POP_STACKTOP) <= -1) goto oops;
GET_TOKEN (moo);
goto start_over;
}
/* patch instructions that jumps to the end of if expression */
for (jumptoend_chunk = jumptoend.head, i = 0; jumptoend_chunk; jumptoend_chunk = jumptoend_chunk->next)
{
/* pass expr_loc to every call to patch_long_forward_jump_instruction().
* it's harmless because if the first call doesn't flood, the subseqent
* call will never flood either. */
for (j = 0; j < MOO_COUNTOF(jumptoend.static_chunk.buf) && i < jumptoend.count; j++)
{
if (patch_long_forward_jump_instruction (moo, jumptoend_chunk->buf[j], moo->c->mth.code.len, &expr_loc) <= -1) goto oops;
i++;
}
}
fini_oow_pool (moo, &jumptoend);
return 0;
oops:
fini_oow_pool (moo, &jumptoend);
return -1;
}
static int compile_braced_block (moo_t* moo)

4
moo/lib/exec.c
View File

@ -3630,7 +3630,7 @@ static int start_method (moo_t* moo, moo_oop_method_t method, moo_oow_t nargs)
#if defined(MOO_DEBUG_VM_EXEC)
/* set it to a fake value */
moo->last_instruction_pointer = 0;
moo->last_inst_pointer = 0;
#endif
preamble = MOO_OOP_TO_SMOOI(method->preamble);
@ -3765,7 +3765,7 @@ static int start_method (moo_t* moo, moo_oop_method_t method, moo_oow_t nargs)
stack_base = moo->sp - nargs - 1; /* stack base before receiver and arguments */
pfnum = MOO_METHOD_GET_PREAMBLE_INDEX(preamble);
LOG_INST1 (moo, "preamble_primitive %zd", pf_no);
LOG_INST1 (moo, "preamble_primitive %zd", pfnum);
if (pfnum >= 0 && pfnum < MOO_COUNTOF(pftab))
{

5
moo/lib/moo-prv.h
View File

@ -54,7 +54,7 @@
/*#define MOO_DEBUG_LEXER 1*/
#define MOO_DEBUG_COMPILER 1
#define MOO_DEBUG_VM_PROCESSOR 1
/*#define MOO_DEBUG_VM_EXEC*/
#define MOO_DEBUG_VM_EXEC
#define MOO_PROFILE_VM 1
#endif
@ -353,6 +353,9 @@ enum moo_iotok_type_t
MOO_IOTOK_BREAK,
MOO_IOTOK_CONTINUE,
MOO_IOTOK_AND,
MOO_IOTOK_OR,
MOO_IOTOK_IDENT,
MOO_IOTOK_IDENT_DOTTED,
MOO_IOTOK_BINSEL,