From d17e28b7bff751755dcd87ff9579788932cdd58a Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Wed, 23 Jul 2014 14:57:37 +0400 Subject: [PATCH 1/2] Fixing *.stm32f4 builds. --- src/libruntime/target/stm32f4/serializer.c | 9 ++++++++- src/main.c | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libruntime/target/stm32f4/serializer.c b/src/libruntime/target/stm32f4/serializer.c index 88d7bd200..ac561a981 100644 --- a/src/libruntime/target/stm32f4/serializer.c +++ b/src/libruntime/target/stm32f4/serializer.c @@ -26,4 +26,11 @@ serializer_dump_data (const void *data __unused, size_t size __unused) { } -TODO (Dump memory) \ No newline at end of file +TODO (Dump memory) + +void +serializer_rewrite_data (const int8_t offset, const void *data, size_t size) +{ + TODO (implement); + JERRY_UNIMPLEMENTED_REF_UNUSED_VARS( offset, data, size); +} diff --git a/src/main.c b/src/main.c index e944ff09b..0690e1419 100644 --- a/src/main.c +++ b/src/main.c @@ -98,7 +98,8 @@ fake_exit (void) } int -main (int argc, char **argv) +main (int argc __unused, + char **argv __unused) { #ifdef __HOST const char *file_name = NULL; From 1b2a52da514a11a719634eec7d0c8bd16c7a3347 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Wed, 23 Jul 2014 15:39:01 +0400 Subject: [PATCH 2/2] Parse blinky --- src/libjsparser/lexer.c | 4 +- src/libjsparser/parser.c | 84 ++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/libjsparser/lexer.c b/src/libjsparser/lexer.c index 16235dfb3..50e07c034 100644 --- a/src/libjsparser/lexer.c +++ b/src/libjsparser/lexer.c @@ -880,7 +880,7 @@ lexer_next_token (void) token tok = lexer_next_token_private (); if (tok.type == TOK_NEWLINE) return tok; - if (tok.type == TOK_CLOSE_PAREN) + if (tok.type == TOK_CLOSE_BRACE) { // if (i == 300) __fprintf (lexer_debug_log, "lexer_next_token(%d): type=%d, data=%d\n", i, tok.type, tok.data.uid); @@ -894,7 +894,7 @@ void lexer_save_token (token tok) { #ifdef __HOST - if (tok.type == TOK_CLOSE_PAREN) + if (tok.type == TOK_CLOSE_BRACE) __fprintf (lexer_debug_log, "lexer_save_token(%d): type=%d, data=%d\n", i, tok.type, tok.data.uid); #endif saved_token = tok; diff --git a/src/libjsparser/parser.c b/src/libjsparser/parser.c index c6809aab3..cb558d7b7 100644 --- a/src/libjsparser/parser.c +++ b/src/libjsparser/parser.c @@ -55,7 +55,7 @@ assert_keyword (keyword kw) if (tok.type != TOK_KEYWORD || tok.data.kw != kw) { #ifdef __HOST - __printf ("assert_keyword: 0x%x\n", kw); + __printf ("assert_keyword: %d\n", kw); #endif JERRY_UNREACHABLE (); } @@ -73,7 +73,7 @@ current_token_must_be(token_type tt) if (tok.type != tt) { #ifdef __HOST - __printf ("current_token_must_be: 0x%x\n", tt); + __printf ("current_token_must_be: %d\n", tt); #endif parser_fatal (ERR_PARSER); } @@ -94,7 +94,7 @@ next_token_must_be (token_type tt) if (tok.type != tt) { #ifdef __HOST - __printf ("next_token_must_be: 0x%x\n", tt); + __printf ("next_token_must_be: %d\n", tt); #endif parser_fatal (ERR_PARSER); } @@ -771,43 +771,39 @@ parse_call_expression (void) obj = lhs; skip_newlines (); - if (tok.type == TOK_OPEN_PAREN || tok.type == TOK_OPEN_SQUARE - || tok.type == TOK_DOT) + while (tok.type == TOK_OPEN_PAREN || tok.type == TOK_OPEN_SQUARE + || tok.type == TOK_DOT) { - while (tok.type == TOK_OPEN_PAREN || tok.type == TOK_OPEN_SQUARE - || tok.type == TOK_DOT) - { - switch (tok.type) - { - case TOK_OPEN_PAREN: - lhs = parse_argument_list (AL_CALL_EXPR, obj); - break; - - case TOK_OPEN_SQUARE: - NEXT (prop, expression); - next_token_must_be (TOK_CLOSE_SQUARE); - - DUMP_OPCODE (prop_access, lhs, obj, prop); - obj = lhs; - skip_newlines (); - break; - - case TOK_DOT: - token_after_newlines_must_be (TOK_NAME); - prop = tok.data.uid; - - DUMP_OPCODE (prop_access, lhs, obj, prop); - obj = lhs; - skip_newlines (); - break; - - default: - JERRY_UNREACHABLE (); - } - } + switch (tok.type) + { + case TOK_OPEN_PAREN: + lhs = parse_argument_list (AL_CALL_EXPR, obj); + skip_newlines (); + break; + + case TOK_OPEN_SQUARE: + NEXT (prop, expression); + next_token_must_be (TOK_CLOSE_SQUARE); + + DUMP_OPCODE (prop_access, lhs, obj, prop); + obj = lhs; + skip_newlines (); + break; + + case TOK_DOT: + token_after_newlines_must_be (TOK_NAME); + prop = tok.data.uid; + + DUMP_OPCODE (prop_access, lhs, obj, prop); + obj = lhs; + skip_newlines (); + break; + + default: + JERRY_UNREACHABLE (); + } } - else - lexer_save_token (tok); + lexer_save_token (tok); return obj; } @@ -1663,7 +1659,10 @@ static void parse_statement (void) { if (tok.type == TOK_CLOSE_BRACE) - return; + { + lexer_save_token (tok); + return; + } if (tok.type == TOK_OPEN_BRACE) { skip_newlines (); @@ -1682,7 +1681,6 @@ parse_statement (void) } if (tok.type == TOK_SEMICOLON) { - skip_newlines (); return; } if (is_keyword (KW_IF)) @@ -1789,7 +1787,11 @@ static void parse_source_element_list (void) { while (tok.type != TOK_EOF && tok.type != TOK_CLOSE_BRACE) - parse_source_element (); + { + parse_source_element (); + skip_newlines (); + } + lexer_save_token (tok); } /* program