Merge branch 'geppetto'
This commit is contained in:
@@ -53,6 +53,7 @@ typedef enum
|
|||||||
ERR_INT_LITERAL = -7,
|
ERR_INT_LITERAL = -7,
|
||||||
ERR_STRING = -8,
|
ERR_STRING = -8,
|
||||||
ERR_PARSER = -9,
|
ERR_PARSER = -9,
|
||||||
|
ERR_MEMORY = -10,
|
||||||
ERR_GENERAL = -255
|
ERR_GENERAL = -255
|
||||||
} jerry_status_t;
|
} jerry_status_t;
|
||||||
|
|
||||||
|
|||||||
@@ -277,6 +277,8 @@ current_token (void)
|
|||||||
JERRY_ASSERT (token_start <= buffer);
|
JERRY_ASSERT (token_start <= buffer);
|
||||||
size_t length = (size_t) (buffer - token_start);
|
size_t length = (size_t) (buffer - token_start);
|
||||||
char *res = (char *) mem_heap_alloc_block (length + 1, MEM_HEAP_ALLOC_SHORT_TERM);
|
char *res = (char *) mem_heap_alloc_block (length + 1, MEM_HEAP_ALLOC_SHORT_TERM);
|
||||||
|
if (res == NULL)
|
||||||
|
parser_fatal (ERR_MEMORY);
|
||||||
__strncpy (res, token_start, length);
|
__strncpy (res, token_start, length);
|
||||||
res[length] = '\0';
|
res[length] = '\0';
|
||||||
token_start = NULL;
|
token_start = NULL;
|
||||||
|
|||||||
@@ -66,6 +66,9 @@ jerry_exit( jerry_status_t code) /**< status code */
|
|||||||
case ERR_PARSER:
|
case ERR_PARSER:
|
||||||
__printf("ERR_PARSER\n");
|
__printf("ERR_PARSER\n");
|
||||||
break;
|
break;
|
||||||
|
case ERR_MEMORY:
|
||||||
|
__printf("ERR_MEMORY\n");
|
||||||
|
break;
|
||||||
case ERR_GENERAL:
|
case ERR_GENERAL:
|
||||||
__printf("ERR_GENERAL\n");
|
__printf("ERR_GENERAL\n");
|
||||||
break;
|
break;
|
||||||
|
|||||||
+1
-1
@@ -181,6 +181,6 @@ main(void)
|
|||||||
const size_t source_size = sizeof(generated_source);
|
const size_t source_size = sizeof(generated_source);
|
||||||
|
|
||||||
jerry_run( source_p,
|
jerry_run( source_p,
|
||||||
source_size);
|
source_size, false);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user