fbp-parser: print wrong statement on error

Signed-off-by: Bruno Dilly <bruno.dilly@intel.com>
solettaproject · Sep 16, 2015 · d1aacf0 · d1aacf0
1 parent 7e2efb3
commit d1aacf0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/shared/sol-fbp-internal-scanner.h b/src/shared/sol-fbp-internal-scanner.h
@@ -76,6 +76,9 @@ struct sol_fbp_token {
     unsigned int column;
 };
 
+/* To be used together with "%.*s" formatting in printf family of functions. */
+#define SOL_FBP_TOKEN_PRINT(_s) (int)((_s).end - (_s).start + 1), (_s).start
+
 struct sol_fbp_scanner {
     const char *input_end;
     struct sol_fbp_token token;

diff --git a/src/shared/sol-fbp-parser.c b/src/shared/sol-fbp-parser.c
@@ -655,7 +655,8 @@ parse_stmt(struct sol_fbp_parser *p)
     default:
         /* Ensure error is at the token that couldn't be parsed. */
         next_token(p);
-        return set_parse_error(p, "Couldn't parse statement.");
+        return set_parse_error(p, "Couldn't parse statement '%.*s'.",
+            SOL_FBP_TOKEN_PRINT(p->current_token));
     }
 }
 

diff --git a/src/test-fbp/parser-errors/brackets-instead-of-parens.fbp b/src/test-fbp/parser-errors/brackets-instead-of-parens.fbp
@@ -33,6 +33,6 @@
 ## TEST-EXPECTS-ERROR
 
 ## TEST-OUTPUT
-# brackets-instead-of-parens.fbp:31:1 Couldn't parse statement.
+# brackets-instead-of-parens.fbp:31:1 Couldn't parse statement '[F'.
 ## TEST-SKIP-COMPILE This test should not be generated + compiled, test parser errors is its sole purpose
 
diff --git a/src/test-fbp/parser-errors/component-without-node.fbp b/src/test-fbp/parser-errors/component-without-node.fbp
@@ -33,6 +33,6 @@
 ## TEST-EXPECTS-ERROR
 
 ## TEST-OUTPUT
-# component-without-node.fbp:31:1 Couldn't parse statement.
+# component-without-node.fbp:31:1 Couldn't parse statement '(F'.
 ## TEST-SKIP-COMPILE This test should not be generated + compiled, test parser errors is its sole purpose