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

Clearer error message.

This commit is contained in:
Jeff Young 2022-12-04 17:56:28 +00:00
parent bed22272e5
commit 672927e183
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
eeschema/sim/spice_grammar.h
View File

@ -264,29 +264,31 @@ namespace SPICE_GRAMMAR
template <typename> inline constexpr const char* errorMessage = nullptr; template <typename> inline constexpr const char* errorMessage = nullptr;
template <> inline constexpr auto errorMessage<newline> = template <> inline constexpr auto errorMessage<newline> =
"expected newline not followed by a line continuation"; "expected newline";
template <> inline constexpr auto errorMessage<sep> = template <> inline constexpr auto errorMessage<sep> =
"expected token separator (one or more whitespace, parenthesis, '=', ',', line continuation)"; "expected token separator (one or more whitespace, parenthesis, '=', ',', or 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<dotModelType> = "expected model type"; template <> inline constexpr auto errorMessage<modelName> =
template <> inline constexpr auto errorMessage<opt<sep, "expected model name";
dotModelType>> = ""; template <> inline constexpr auto errorMessage<dotModelType> =
template <> inline constexpr auto errorMessage<opt<sep, "expected model type";
paramValuePairs>> = ""; template <> inline constexpr auto errorMessage<opt<sep, dotModelType>> =
template <> inline constexpr auto errorMessage<opt<sep, "";
dotSubcktPinSequence>> = ""; template <> inline constexpr auto errorMessage<opt<sep, paramValuePairs>> =
template <> inline constexpr auto errorMessage<opt<sep, "";
dotSubcktParams>> = ""; template <> inline constexpr auto errorMessage<opt<sep, dotSubcktPinSequence>> =
template <> inline constexpr auto errorMessage<until<dotSubcktEnd, "";
spiceUnit>> = template <> inline constexpr auto errorMessage<opt<sep, dotSubcktParams>> =
"";
template <> inline constexpr auto errorMessage<until<dotSubcktEnd, spiceUnit>> =
"expected (possibly empty) sequence of Spice lines followed by an .ends line"; "expected (possibly empty) sequence of Spice lines followed by an .ends line";
template <> inline constexpr auto errorMessage<spiceUnit> = template <> inline constexpr auto errorMessage<spiceUnit> =
"expected Spice directive, item, subcircuit definitions, or empty or commented out line"; "expected Spice directive, item, subcircuit definitions, or empty or commented-out line";
template <> inline constexpr auto errorMessage<spiceSource> = template <> inline constexpr auto errorMessage<spiceSource> =
"expected zero or more Spice directives, items, subcircuit definitions, or empty or commented out lines"; "expected zero or more Spice directives, items, subcircuit definitions, or empty or commented-out lines";
template <> inline constexpr auto errorMessage<spiceSourceNothrow> = template <> inline constexpr auto errorMessage<spiceSourceNothrow> =
"expected zero or more Spice directives, items, subcircuit definitions, or empty or commented out lines"; "expected zero or more Spice directives, items, subcircuit definitions, or empty or commented-out lines";
// We create a custom PEGTL control to modify the parser error messages. // We create a custom PEGTL control to modify the parser error messages.
struct error struct error