From 8aaca0509c1343c9a2265fb3a20da46f179bac82 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 13 May 2024 21:41:40 +0100
Subject: [PATCH] More PEGTL tomfoolery.

---
 eeschema/sim/spice_grammar.h | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/eeschema/sim/spice_grammar.h b/eeschema/sim/spice_grammar.h
index 2a531cacb1..e0f32f3a5f 100644
--- a/eeschema/sim/spice_grammar.h
+++ b/eeschema/sim/spice_grammar.h
@@ -156,6 +156,17 @@ namespace SPICE_GRAMMAR
                                      opt<sep>,
                                      newline>> {};
 
+    struct dotModelCPL : seq<opt<sep>,
+                             if_must<seq<TAO_PEGTL_ISTRING( ".model" ),
+                                         sep,
+                                         modelName,
+                                         sep,
+                                         TAO_PEGTL_ISTRING( "CPL" )>,
+                                     opt<sep,
+                                         cplParamValuePairs>,
+                                     opt<sep>,
+                                     newline>> {};
+
     struct dotModel : seq<opt<sep>,
                           if_must<TAO_PEGTL_ISTRING( ".model" ),
                                   sep,
@@ -167,19 +178,6 @@ namespace SPICE_GRAMMAR
                                   opt<sep>,
                                   newline>> {};
 
-    struct dotModelCPL : seq<opt<sep>,
-                         if_must<TAO_PEGTL_ISTRING( ".model" ),
-                                 sep,
-                                 modelName,
-                                 sep,
-                                 TAO_PEGTL_ISTRING( "CPL" ),
-                                 opt<sep,
-                                     cplParamValuePairs>,
-                                 opt<sep>,
-                                 newline>> {};
-                                     
-
-
     struct dotSubcktParamValuePair : seq<param,
                                          // TODO: Check if these `star<space>`s match Ngspice's
                                          // behavior.
@@ -216,6 +214,7 @@ namespace SPICE_GRAMMAR
 
     struct modelUnit : seq<star<commentLine>,
                            sor<dotModelAko,
+                               dotModelCPL,
                                dotModel,
                                dotSubckt>> {};
 
@@ -305,7 +304,9 @@ namespace SPICE_GRAMMAR
             "";
     template <> inline constexpr auto errorMessage<opt<sep, paramValuePairs>> = 
             "";
-    template <> inline constexpr auto errorMessage<opt<sep, dotSubcktPinSequence>> = 
+    template <> inline constexpr auto errorMessage<opt<sep, cplParamValuePairs>> =
+            "";
+    template <> inline constexpr auto errorMessage<opt<sep, dotSubcktPinSequence>> =
             "";
     template <> inline constexpr auto errorMessage<opt<sep, dotSubcktParams>> = 
             "";