Merge branch 'master' of git-server.vd:jerry

This commit is contained in:
Ruben Ayrapetyan 2014-07-22 22:15:03 +04:00
commit 3ef9ee9eb4
2 changed files with 8 additions and 3 deletions

View File

@ -253,11 +253,14 @@ add_num_to_seen_tokens (num_and_token nat)
uint8_t
lexer_get_strings (const char **strings)
{
int i;
if (strings)
{
int i;
for (i = 0; i < seen_names_count; i++)
{
strings[i] = seen_names[i].str;
}
}
return seen_names_count;
}
@ -276,7 +279,9 @@ lexer_get_nums (int *nums)
int i;
for (i = 0; i < seen_nums_count; i++)
{
nums[i] = seen_nums[i].num;
}
return seen_nums_count;
}

View File

@ -319,7 +319,6 @@ parse_argument_list (argument_list_type alt, T_IDX obj)
lhs = 0,
args[3+1/* +1 for stack protector */],
current_arg = 0;
bool is_first_opcode = true;
switch (alt)
{
@ -361,6 +360,7 @@ parse_argument_list (argument_list_type alt, T_IDX obj)
skip_newlines ();
if (tok.type != close_tt)
{
bool is_first_opcode = true;
while (true)
{
if (is_first_opcode)