Improve parsing

- Make multi-file more robust
- Error reporting is more accurate (shows file:line and prints offending
  string)
- Allow `.include` directives in subcircuits

1 files changed, 9 insertions, 3 deletions

diff --git a/src/parser/parser.y b/src/parser/parser.y
index 36be00f..855277e 100644
--- a/src/parser/parser.y
+++ b/src/parser/parser.y
@@ -10,6 +10,9 @@
 
     //extern int yylineno;
     //extern char *yytext;
+
+    string yyget_filename ( yyscan_t scanner );
+    string yyget_current_line ( yyscan_t scanner );
 }
 
 %{
@@ -954,8 +957,11 @@ int yyerror(yyscan_t scanner, ParseTree *pt, const char *err)
         }
     }
     string token_escaped = ss.str();
-    printf("-- Error in the netlist (line %u): %s\n", yyget_lineno(scanner), err);
-    printf("-- \"%s\"\n", token_escaped.c_str());
-    //cerr << err << endl;
+    
+    cerr << "Parsing error (" << yyget_filename(scanner) << ":" << yyget_lineno(scanner) << "): " << err << endl;
+    cerr << "-- offending token: \"" << token_escaped.c_str() << "\"" << endl;
+    string str = yyget_current_line(scanner);
+    if (!str.empty())
+        cerr << "-- while parsing line: \"" << str << "\"" << endl;
     exit(1);
 }