Merge pull request #791 from in3otd/fix_sparams_parsing

Use left recursion for parsing S-parameters files
Qucs · May 10, 2018 · ccbf8cb · ccbf8cb
2 parents b4f27d9 + e29fd00
commit ccbf8cb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/qucs-core/src/check_touchstone.cpp b/qucs-core/src/check_touchstone.cpp
@@ -49,6 +49,7 @@ using namespace qucs;
 
 strlist * touchstone_idents = NULL;
 dataset * touchstone_result = NULL;
+qucs::vector  * touchstone_line = NULL;
 qucs::vector  * touchstone_vector = NULL;
 
 /* default touchstone options */

diff --git a/qucs-core/src/check_touchstone.h b/qucs-core/src/check_touchstone.h
@@ -45,6 +45,7 @@ namespace qucs {
 }
 
 extern qucs::dataset * touchstone_result;
+extern qucs::vector  * touchstone_line;
 extern qucs::vector  * touchstone_vector;
 extern qucs::strlist * touchstone_idents;
 

diff --git a/qucs-core/src/parse_touchstone.ypp b/qucs-core/src/parse_touchstone.ypp
@@ -35,7 +35,7 @@
 
 #define YYERROR_VERBOSE 42
 #define YYDEBUG 1
-#define YYMAXDEPTH 1000000
+//#define YYMAXDEPTH 1000000
 
 #include "logging.h"
 #include "complex.h"
@@ -76,36 +76,42 @@ Input:
 
 OptionLine: /* option line */
     '#' OptionList 'R' Float OptionList Eol {
-    touchstone_vector = NULL;
+    touchstone_line = NULL;
     touchstone_options.resistance = $4;
   }
   | '#' OptionList Eol {
-    touchstone_vector = NULL;
+    touchstone_line = NULL;
     touchstone_options.resistance = 50.0;
   }
   | Eol OptionLine { /* skip this line */ }
 ;
 
 OptionList: /* nothing */ { }
-  | Option OptionList {
+  | OptionList Option {
     if (touchstone_idents == NULL) touchstone_idents = new strlist ();
-    touchstone_idents->add ($1);
-    free ($1);
+    touchstone_idents->add ($2);
+    free ($2);
   }
 ;
 
 Dataset: /* nothing */ { }
-  | DataLine Eol Dataset { /* append vector lines */
-    $1->setNext (touchstone_vector);
-    touchstone_vector = $1;
+  | Dataset DataLine Eol { /* append vector lines */
+    if (!touchstone_vector)
+      touchstone_vector = $2; /* save first vector location */
+    if (touchstone_line)
+      touchstone_line->setNext($2);
+    touchstone_line = $2;
   }
-  | DataLine { /* last line, no trailing end-of-line */
-    $1->setNext (touchstone_vector);
-    touchstone_vector = $1;
+  | Dataset DataLine { /* last line, no trailing end-of-line */
+    if (!touchstone_vector)
+      touchstone_vector = $2; /* save first vector location */
+    if (touchstone_line)
+      touchstone_line->setNext($2);
+    touchstone_line = $2;
     logprint (LOG_ERROR, "line %d: no trailing end-of-line found, "
 	      "continuing...\n", touchstone_lineno);
   }
-  | Eol Dataset { /* skip this line */ }
+  | Dataset Eol { /* skip this line */ }
 ;
 
 DataLine: