haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reimplement bracedExpr and token lists for CPL models only. 

This prevents the incompatibility between token lists
and single-token param-value pairs.
This commit is contained in:
Jeff Young 2024-05-13 21:28:24 +01:00
parent 2921d47fb3
commit 086e609c3d
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eeschema/sim/spice_grammar.h
View File

@ -122,10 +122,8 @@ namespace SPICE_GRAMMAR
// Param names cannot be `token` because LTspice models contain spurious values without
// parameter names, which we need to skip, and because tokens can include a very limited
// subset of un-braced expressions
// Note: we must support lists of both braced expressions and tokens for CPL models...
// ... but lists of tokens breaks cases where we have single-token name/values.
struct param : identifier {};
struct paramValue : sor<list<bracedExpr, opt<one<' '>>>,
struct paramValue : sor<bracedExpr,
vectorExpr,
token> {};
@ -133,6 +131,16 @@ namespace SPICE_GRAMMAR
sep,
paramValue> {};
struct paramValuePairs : list<paramValuePair, sep> {};
struct cplSep : opt<one<' '>> {};
struct cplParamValue : sor<list<bracedExpr, cplSep>,
vectorExpr,
list<token, cplSep>> {};
struct cplParamValuePair : seq<param,
sep,
cplParamValue> {};
struct cplParamValuePairs : list<cplParamValuePair, sep> {};
struct dotModelAko : seq<opt<sep>,
if_must<seq<TAO_PEGTL_ISTRING( ".model" ),
sep,
@ -158,6 +166,17 @@ namespace SPICE_GRAMMAR
paramValuePairs>,
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>> {};