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

Sim: Allow Numparam expressions in models inside subckts 

Global-level numparam expressions are not properly supported yet.

Fixes https://gitlab.com/kicad/code/kicad/issues/12953
This commit is contained in:
Mikolaj Wielgus 2022-11-27 06:16:15 +01:00
parent f1556ed801
commit 71d194071b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/sim/spice_grammar.h
View File

@ -94,6 +94,11 @@ namespace SPICE_GRAMMAR
struct dotModelType : plus<alpha> {}; struct dotModelType : plus<alpha> {};
struct numparamBracedExpr : seq<one<'{'>,
star<sor<numparamBracedExpr,
not_one<'}'>>>,
one<'}'>> {};
// Ngspice has some heuristic logic to allow + and - in tokens. We replicate that here. // Ngspice has some heuristic logic to allow + and - in tokens. We replicate that here.
struct tokenStart : seq<opt<one<'+', '-'>>, struct tokenStart : seq<opt<one<'+', '-'>>,
opt<seq<star<sor<tao::pegtl::digit, opt<seq<star<sor<tao::pegtl::digit,
@ -110,7 +115,8 @@ namespace SPICE_GRAMMAR
// Param names cannot be `token` because LTspice models contain spurious values without // Param names cannot be `token` because LTspice models contain spurious values without
// parameter names, which we need to skip. // parameter names, which we need to skip.
struct param : identifier {}; struct param : identifier {};
struct paramValue : token {}; struct paramValue : sor<numparamBracedExpr,
token> {};
struct paramValuePair : seq<param, struct paramValuePair : seq<param,
sep, sep,
@ -255,7 +261,7 @@ namespace SPICE_GRAMMAR
template <> inline constexpr auto errorMessage<newline> = template <> inline constexpr auto errorMessage<newline> =
"expected newline not followed by a line continuation"; "expected newline not followed by a line continuation";
template <> inline constexpr auto errorMessage<sep> = template <> inline constexpr auto errorMessage<sep> =
"expected token separator (typ. one or more whitespace, parenthesis, '=', ',', line continuation)"; "expected token separator (one or more whitespace, parenthesis, '=', ',', line continuation)";
template <> inline constexpr auto errorMessage<opt<sep>> = ""; template <> inline constexpr auto errorMessage<opt<sep>> = "";
template <> inline constexpr auto errorMessage<modelName> = "expected model name"; template <> inline constexpr auto errorMessage<modelName> = "expected model name";
template <> inline constexpr auto errorMessage<dotModelType> = "expected model type"; template <> inline constexpr auto errorMessage<dotModelType> = "expected model type";