Skip to content

Fix null reference exceptions #166

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
merged 7 commits into from
Jan 7, 2025
Merged

Fix null reference exceptions #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a73bc16
Fix null reference exceptions
marcin-golebiowski Jan 7, 2025
97205d8
Update example
marcin-golebiowski Jan 7, 2025
2c76341
Remove .NET 6 support
marcin-golebiowski Jan 7, 2025
1bc124a
Fix linux build
marcin-golebiowski Jan 7, 2025
ce2dcb9
Update packages
marcin-golebiowski Jan 7, 2025
ceb08b1
Migrate to .NET 8 in test projects
marcin-golebiowski Jan 7, 2025
772dd9d
Migrate to .NET 8
marcin-golebiowski Jan 7, 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
2 changes: 1 addition & 1 deletion .github/workflows/test-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup dotnet tooling
uses: actions/setup-dotnet@master
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'

- name: Restore dependencies
run:
Expand Down
2 changes: 1 addition & 1 deletion src/SpiceSharpParser.CodeAnalysis/SpiceSharpParser.CodeAnalysis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="SpiceSharp" Version="3.2.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
Expand Down
9 changes: 9 additions & 0 deletions src/SpiceSharpParser.IntegrationTests/Examples/Circuits/band-pass_1.cir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
* Band pass filter - AC simulation
V1 IN 0 AC 1
LI IN MIDDLE {mc(0.6, tol)}
C1 MIDDLE OUT {mc(10e-6, tol)}
R1 OUT 0 {mc(1000, tol)}
.ac oct 100 1 500
.param tol=0.2
.plot ac v(OUT)
.end
10 changes: 10 additions & 0 deletions src/SpiceSharpParser.IntegrationTests/Examples/Circuits/band-pass_2.cir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
* Band pass filter - AC simulation stepping with mc()
V1 IN 0 AC 1
LI IN MIDDLE {mc(0.6, tol)}
C1 MIDDLE OUT {mc(10e-6, tol)}
R1 OUT 0 {mc(1000, tol)}
.ac oct 100 1 500
.step param X 0 10 1
.param tol=0.2
.plot ac v(OUT) merge
.end
44 changes: 44 additions & 0 deletions src/SpiceSharpParser.IntegrationTests/Examples/ExampleBandPass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
using System.IO;
using Xunit;

namespace SpiceSharpParser.IntegrationTests.Examples
{
public class ExampleBandPass : BaseTests
{
[Fact]
public void When_SimulatedBandPass_Expect_NoExceptions()
{
string path = Path.Combine(Directory.GetCurrentDirectory(), "Examples/Circuits/band-pass_1.cir");
var netlistContent = File.ReadAllText(path);

var parser = new SpiceNetlistParser();
parser.Settings.Lexing.HasTitle = true;

var parseResult = parser.ParseNetlist(netlistContent);

var spiceSharpReader = new SpiceSharpReader();
spiceSharpReader.Settings.ExpandSubcircuits = false;
var spiceSharpModel = spiceSharpReader.Read(parseResult.FinalModel);

RunSimulations(spiceSharpModel);
}

[Fact]
public void When_SimulatedBandPass2_Expect_NoExceptions()
{
string path = Path.Combine(Directory.GetCurrentDirectory(), "Examples/Circuits/band-pass_2.cir");
var netlistContent = File.ReadAllText(path);

var parser = new SpiceNetlistParser();
parser.Settings.Lexing.HasTitle = true;

var parseResult = parser.ParseNetlist(netlistContent);

var spiceSharpReader = new SpiceSharpReader();
spiceSharpReader.Settings.ExpandSubcircuits = false;
var spiceSharpModel = spiceSharpReader.Read(parseResult.FinalModel);

RunSimulations(spiceSharpModel);
}
}
}
16 changes: 11 additions & 5 deletions src/SpiceSharpParser.IntegrationTests/SpiceSharpParser.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ProjectGuid>{57920E91-873B-4E66-B0EC-4CAC45007AA9}</ProjectGuid>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -16,12 +16,12 @@


<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PackageReference Include="coverlet.msbuild" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="SpiceSharp" Version="3.2.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.2.0" />
<PackageReference Include="xunit" Version="2.9.2" />
Expand All @@ -30,7 +30,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -42,6 +42,12 @@
</ItemGroup>

<ItemGroup>
<None Update="Examples\Circuits\band-pass_2.cir">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Examples\Circuits\band-pass_1.cir">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Examples\Circuits\example02.cir">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
7 changes: 4 additions & 3 deletions src/SpiceSharpParser.PerformanceTests/SpiceSharpParser.PerformanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<ProjectGuid>{53D996E7-8D58-49D0-97F6-71CAD49670A2}</ProjectGuid>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="SpiceSharp" Version="3.2.3" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.runner.console" Version="2.9.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
11 changes: 6 additions & 5 deletions src/SpiceSharpParser.Tests/SpiceSharpParser.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ProjectGuid>{94394567-BC35-43EE-92CB-31AC780305FE}</ProjectGuid>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -14,12 +14,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PackageReference Include="coverlet.msbuild" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="SpiceSharp" Version="3.2.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
Expand All @@ -32,7 +33,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
14 changes: 7 additions & 7 deletions src/SpiceSharpParser/ModelWriters/CSharp/Events/ACWithEvents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

public event OnBeforeTemperature EventBeforeTemperature;

public event OnAfterTemperature EventAfterTemperature;

Check warning on line 30 in src/SpiceSharpParser/ModelWriters/CSharp/Events/ACWithEvents.cs

View workflow job for this annotation

GitHub Actions / build 

The event 'ACWithEvents.EventAfterTemperature' is never used

Check warning on line 30 in src/SpiceSharpParser/ModelWriters/CSharp/Events/ACWithEvents.cs

View workflow job for this annotation

GitHub Actions / build 

The event 'ACWithEvents.EventAfterTemperature' is never used

public event OnBeforeExecute EventBeforeExecute;

Expand All @@ -42,25 +42,25 @@
switch (code)
{
case Simulation.BeforeValidation:
EventBeforeValidation.Invoke(this, EventArgs.Empty);
EventBeforeValidation?.Invoke(this, EventArgs.Empty);
break;

case Simulation.AfterValidation:
EventAfterValidation.Invoke(this, EventArgs.Empty);
EventAfterValidation?.Invoke(this, EventArgs.Empty);
break;

case Simulation.BeforeSetup:
EventBeforeSetup.Invoke(this, EventArgs.Empty);
EventBeforeSetup?.Invoke(this, EventArgs.Empty);
break;
case Simulation.AfterSetup:
EventAfterSetup.Invoke(this, EventArgs.Empty);
EventAfterSetup?.Invoke(this, EventArgs.Empty);
break;
case Simulation.BeforeUnsetup:
EventBeforeUnSetup.Invoke(this, EventArgs.Empty);
EventBeforeUnSetup?.Invoke(this, EventArgs.Empty);
break;

case Simulation.BeforeExecute:
EventBeforeExecute.Invoke(this, EventArgs.Empty);
EventBeforeExecute?.Invoke(this, EventArgs.Empty);

if (this is IBiasingSimulation)
{
Expand All @@ -70,7 +70,7 @@
break;

case Simulation.AfterExecute:
EventAfterExecute.Invoke(this, EventArgs.Empty);
EventAfterExecute?.Invoke(this, EventArgs.Empty);
break;

case AC.ExportSmallSignal:
Expand Down
10 changes: 5 additions & 5 deletions src/SpiceSharpParser/SpiceSharpParser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<PropertyGroup>
<ProjectGuid>{DF3DD787-71CC-4C89-9E33-DC4536A52278}</ProjectGuid>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<Authors>SpiceSharp</Authors>
<PackageProjectUrl>https://github.com/SpiceSharp/SpiceSharpParser</PackageProjectUrl>
<Copyright>Copyright 2024</Copyright>
<Copyright>Copyright 2025</Copyright>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<RepositoryUrl>https://github.com/SpiceSharp/SpiceSharpParser</RepositoryUrl>
<RepositoryType></RepositoryType>
Expand All @@ -22,7 +22,7 @@
<StartupObject />
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<LangVersion>latest</LangVersion>
<Version>3.2.3</Version>
<Version>3.2.4</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.5|AnyCPU'">
Expand All @@ -35,10 +35,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="SpiceSharp" Version="3.2.3" />
<PackageReference Include="SpiceSharpBehavioral" Version="3.2.0" />
<PackageReference Include="SpiceSharpGenerator" Version="1.0.7">
<PackageReference Include="SpiceSharpGenerator" Version="1.0.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading