From d48ec3aa8c832841b8a22ef2d9ae8064db52899a Mon Sep 17 00:00:00 2001
From: Mikolaj Wielgus <wielgusmikolaj@gmail.com>
Date: Sat, 17 Sep 2022 02:17:54 +0200
Subject: [PATCH] Sim: Slightly simplify grammars

---
 eeschema/sim/sim_model.h     | 22 ++++++-------------
 eeschema/sim/spice_grammar.h | 42 +++++-------------------------------
 2 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/eeschema/sim/sim_model.h b/eeschema/sim/sim_model.h
index bca8ded446..740e01880c 100644
--- a/eeschema/sim/sim_model.h
+++ b/eeschema/sim/sim_model.h
@@ -49,9 +49,7 @@ namespace SIM_MODEL_GRAMMAR
 
 
     struct legacyPinNumber : digits {};
-    struct legacyPinSequence : seq<opt<legacyPinNumber>,
-                                   star<sep,
-                                        legacyPinNumber>> {};
+    struct legacyPinSequence : list<legacyPinNumber, sep> {};
 
     struct legacyPinSequenceGrammar : must<legacyPinSequence,
                                            tao::pegtl::eof> {};
@@ -59,12 +57,9 @@ namespace SIM_MODEL_GRAMMAR
 
     struct pinNumber : plus<not_at<sep>,
                             any> {};
-    struct pinSequence : seq<opt<pinNumber>,
-                             star<sep,
-                                  pinNumber>> {};
-
+    struct pinSequence : list<pinNumber, sep> {};
     struct pinSequenceGrammar : must<opt<sep>,
-                                     pinSequence,
+                                     opt<pinSequence>,
                                      opt<sep>,
                                      tao::pegtl::eof> {};
 
@@ -90,17 +85,12 @@ namespace SIM_MODEL_GRAMMAR
                                      opt<sep>,
                                      one<'='>,
                                      opt<sep>,
-                                     sor<//number<SIM_VALUE::TYPE_FLOAT, NOTATION::SI>,
-                                         //number<SIM_VALUE::TYPE_INT, NOTATION::SI>,
-                                         quotedString,
+                                     sor<quotedString,
                                          unquotedString>> {};
 
-    struct fieldParamValuePairs : seq<opt<fieldParamValuePair>,
-                                      star<sep,
-                                           fieldParamValuePair>> {};
-
+    struct fieldParamValuePairs : list<fieldParamValuePair, sep> {};
     struct fieldParamValuePairsGrammar : must<opt<sep>,
-                                              fieldParamValuePairs,
+                                              opt<fieldParamValuePairs>,
                                               opt<sep>,
                                               tao::pegtl::eof> {};
 }
diff --git a/eeschema/sim/spice_grammar.h b/eeschema/sim/spice_grammar.h
index 0bc4b0af58..8cc7bf9418 100644
--- a/eeschema/sim/spice_grammar.h
+++ b/eeschema/sim/spice_grammar.h
@@ -107,33 +107,10 @@ namespace SPICE_GRAMMAR
     struct paramValuePair : seq<param,
                                 sep,
                                 paramValue> {};
+    struct paramValuePairs : list<paramValuePair, sep> {};
 
-    struct paramValuePairs : seq<opt<paramValuePair>,
-                                 star<sep,
-                                      paramValuePair>> {};
     struct modelName : plus<not_at<garbage>, any> {};
-                       /*sor<alnum,
-                                one<'!', '#', '$', '%', '[', ']', '_'>>> {};*/
-                     /*seq<alpha,
-                           star<sor<alnum,
-                                    one<'!', '#', '$', '%', '[', ']', '_'>>>> {};*/
-    /*struct dotModelType : sor<TAO_PEGTL_ISTRING( "R" ),
-                              TAO_PEGTL_ISTRING( "C" ),
-                              TAO_PEGTL_ISTRING( "L" ),
-                              TAO_PEGTL_ISTRING( "SW" ),
-                              TAO_PEGTL_ISTRING( "CSW" ),
-                              TAO_PEGTL_ISTRING( "URC" ),
-                              TAO_PEGTL_ISTRING( "LTRA" ),
-                              TAO_PEGTL_ISTRING( "D" ),
-                              TAO_PEGTL_ISTRING( "NPN" ),
-                              TAO_PEGTL_ISTRING( "PNP" ),
-                              TAO_PEGTL_ISTRING( "NJF" ),
-                              TAO_PEGTL_ISTRING( "PJF" ),
-                              TAO_PEGTL_ISTRING( "NMOS" ),
-                              TAO_PEGTL_ISTRING( "PMOS" ),
-                              TAO_PEGTL_ISTRING( "NMF" ),
-                              TAO_PEGTL_ISTRING( "PMF" ),
-                              TAO_PEGTL_ISTRING( "VDMOS" )> {};*/
+
     struct dotModelType : plus<alpha> {};
     struct dotModel : seq<opt<sep>,
                           TAO_PEGTL_ISTRING( ".model" ),
@@ -141,15 +118,8 @@ namespace SPICE_GRAMMAR
                           modelName,
                           sep,
                           dotModelType,
-                          opt<sor<seq<opt<sep>,
-                                      one<'('>,
-                                      opt<sep>,
-                                      paramValuePairs,
-                                      opt<sep>,
-                                      // Ngspice doesn't require the parentheses to match, though.
-                                      one<')'>>,
-                                  seq<sep,
-                                      paramValuePairs>>>,
+                          opt<sep,
+                              paramValuePairs>,
                           opt<sep>,
                           newline> {};
 
@@ -157,9 +127,7 @@ namespace SPICE_GRAMMAR
     struct dotSubcktPinName : seq<not_at<TAO_PEGTL_ISTRING( "params:" )>,
                                   plus<not_at<space>,
                                        any>> {};
-    struct dotSubcktPinSequence : seq<opt<dotSubcktPinName>,
-                                      star<sep,
-                                           dotSubcktPinName>> {};
+    struct dotSubcktPinSequence : list<dotSubcktPinName, sep> {};
     struct dotSubcktParams : seq<TAO_PEGTL_ISTRING( "params:" ),
                                  sep,
                                  paramValuePairs> {};