Skip to content

Add support for Alpha_&_Omega const (LTSpice support) #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcin-golebiowski merged 2 commits into from
Jan 9, 2025
Merged

Add support for Alpha_&_Omega const (LTSpice support) #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f73f9fa
Add support for Alpha_&_Omega
marcin-golebiowski Jan 9, 2025
b6de01f
Simpify
marcin-golebiowski Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/SpiceSharpParser/Lexers/Expressions/Lexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
{
Type = TokenType.Power;
Continue();
}

Check warning on line 92 in src/SpiceSharpParser/Lexers/Expressions/Lexer.cs

View workflow job for this annotation

GitHub Actions / build

break;
case '/': Type = TokenType.Divide; Continue(); break;
case '%': Type = TokenType.Mod; Continue(); break;
Expand All @@ -107,7 +107,7 @@
{
Type = TokenType.NotEquals;
Continue();
}

Check warning on line 110 in src/SpiceSharpParser/Lexers/Expressions/Lexer.cs

View workflow job for this annotation

GitHub Actions / build

break;
case ',': Type = TokenType.Comma; Continue(); break;
case '<':
Expand Down Expand Up @@ -198,14 +198,15 @@
number >= 'A' && number <= 'Z'))
Continue();
break;
case char letter when letter >= 'a' && letter <= 'z' || letter >= 'A' && letter <= 'Z' || letter == '_':
case char letter when letter >= 'a' && letter <= 'z' || letter >= 'A' && letter <= 'Z':
Type = TokenType.Identifier;
Continue();
while ((Index < _expression.Length) && ((
letter = _expression[Index]) >= 'a' && letter <= 'z' ||
letter >= 'A' && letter <= 'Z' ||
letter >= '0' && letter <= '9' ||
letter == '_'))
letter == '_' ||
letter == '&'))
Continue();
break;

Expand Down
2 changes: 1 addition & 1 deletion src/SpiceSharpParser/Lexers/Netlist/Spice/SpiceLexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void BuildGrammar()
{
var builder = new LexerGrammarBuilder<SpiceLexerState>();
builder.AddRegexRule(new LexerInternalRule("LETTER", "[a-zA-Zµ]"));
builder.AddRegexRule(new LexerInternalRule("CHARACTER", @"[a-zA-Z0-9\-\+§µ]"));
builder.AddRegexRule(new LexerInternalRule("CHARACTER", @"[a-zA-Z0-9\-\+§µ_&]"));
builder.AddRegexRule(new LexerInternalRule("DIGIT", "[0-9]"));
builder.AddRegexRule(new LexerInternalRule("SPECIAL", @"[\/\\_\.:%!\#\-;\<\>\^\*\[\]]"));
builder.AddRegexRule(new LexerTokenRule<SpiceLexerState>(
Expand Down
1 change: 1 addition & 0 deletions src/SpiceSharpParser/ModelReaders/Netlist/Spice/Evaluation/SpiceEvaluationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ private void CreateSpiceParameters()
Parameters.Add("c", new ConstantExpression(299792500));
Parameters.Add("boltz", new ConstantExpression(1.38062e-23));
Parameters.Add("NaN", new ConstantExpression(double.NaN));
Parameters.Add("Alpha_&_Omega", new ConstantExpression(double.PositiveInfinity));
}
}
}
Loading