StackRduino
diff --git a/‎py/grammar.h‎
Lines changed: 1 addition & 1 deletion b/‎py/grammar.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎py/parse.c‎
Lines changed: 5 additions & 0 deletions b/‎py/parse.c‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎tests/basics/parser.py‎
Lines changed: 24 additions & 0 deletions b/‎tests/basics/parser.py‎
Lines changed: 24 additions & 0 deletions
@@ -38,7 +38,7 @@
 // eval_input: testlist NEWLINE* ENDMARKER
 
 DEF_RULE(single_input, nc, or(3), tok(NEWLINE), rule(simple_stmt), rule(compound_stmt))
-DEF_RULE(file_input, nc, and(1), opt_rule(file_input_2))
+DEF_RULE(file_input, c(generic_all_nodes), and(1), opt_rule(file_input_2))
 DEF_RULE(file_input_2, c(generic_all_nodes), one_or_more, rule(file_input_3))
 DEF_RULE(file_input_3, nc, or(2), tok(NEWLINE), rule(stmt))
 DEF_RULE(eval_input, nc, and(2), rule(testlist), opt_rule(eval_input_2))
 
@@ -720,6 +720,11 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
         goto syntax_error;
     }
 
+    // check that parsing resulted in a parse node (can fail on empty input)
+    if (parser.result_stack_top == 0) {
+        goto syntax_error;
+    }
+
     //result_stack_show(parser);
     //printf("rule stack alloc: %d\n", parser.rule_stack_alloc);
     //printf("result stack alloc: %d\n", parser.result_stack_alloc);
 
@@ -0,0 +1,24 @@
+# parser tests
+
+# completely empty string
+# uPy and CPy differ for this case
+#try:
+#    compile("", "stdin", "single")
+#except SyntaxError:
+#    print("SyntaxError")
+try:
+    compile("", "stdin", "eval")
+except SyntaxError:
+    print("SyntaxError")
+compile("", "stdin", "exec")
+
+# empty continued line
+try:
+    compile("\\\n", "stdin", "single")
+except SyntaxError:
+    print("SyntaxError")
+try:
+    compile("\\\n", "stdin", "eval")
+except SyntaxError:
+    print("SyntaxError")
+compile("\\\n", "stdin", "exec")