Skip to content

Commit 6cfb438

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev/pexplicit_checker
2 parents 73525f9 + e629bad commit 6cfb438

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+149
-125
lines changed

P.sln

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.30011.22
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runtime", "Runtime", "{D641DC13-F2F0-4365-963A-DCFC80BABCAA}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{31FBBC4D-8756-4D60-B8D5-ED9E0FC8D4C1}"
97
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "Tst\UnitTests\UnitTests.csproj", "{71691381-D3C9-478C-BA37-A94032A536DF}"
@@ -15,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCommandLine", "Src\PCompil
1513
EndProject
1614
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompilerCore", "Src\PCompiler\CompilerCore\CompilerCore.csproj", "{41F39ADD-B75F-473F-AC41-D1A9CDA9A9CD}"
1715
EndProject
18-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "CSharpRuntime", "Src\PRuntimes\PCSharpRuntime\CSharpRuntime.csproj", "{27E011B3-3995-454A-B200-57800CC941DA}"
19-
EndProject
2016
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PChecker", "PChecker", "{F7D2A6F5-841A-4E22-9ECD-2E1CF736F7EA}"
2117
EndProject
2218
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CheckerCore", "Src\PChecker\CheckerCore\CheckerCore.csproj", "{37778F65-BDBF-4AEA-BA34-01026A223083}"
@@ -41,10 +37,6 @@ Global
4137
{41F39ADD-B75F-473F-AC41-D1A9CDA9A9CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
4238
{41F39ADD-B75F-473F-AC41-D1A9CDA9A9CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
4339
{41F39ADD-B75F-473F-AC41-D1A9CDA9A9CD}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{27E011B3-3995-454A-B200-57800CC941DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{27E011B3-3995-454A-B200-57800CC941DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{27E011B3-3995-454A-B200-57800CC941DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{27E011B3-3995-454A-B200-57800CC941DA}.Release|Any CPU.Build.0 = Release|Any CPU
4840
{37778F65-BDBF-4AEA-BA34-01026A223083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4941
{37778F65-BDBF-4AEA-BA34-01026A223083}.Debug|Any CPU.Build.0 = Debug|Any CPU
5042
{37778F65-BDBF-4AEA-BA34-01026A223083}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +48,6 @@ Global
5648
GlobalSection(NestedProjects) = preSolution
5749
{71691381-D3C9-478C-BA37-A94032A536DF} = {31FBBC4D-8756-4D60-B8D5-ED9E0FC8D4C1}
5850
{41F39ADD-B75F-473F-AC41-D1A9CDA9A9CD} = {1B21372A-3030-4532-8B30-2A1A3E74527A}
59-
{27E011B3-3995-454A-B200-57800CC941DA} = {D641DC13-F2F0-4365-963A-DCFC80BABCAA}
6051
{37778F65-BDBF-4AEA-BA34-01026A223083} = {F7D2A6F5-841A-4E22-9ECD-2E1CF736F7EA}
6152
{C1A8AF94-F550-4EC7-889A-9D0CCA259502} = {8BAB6184-8545-4E17-8199-86110AC5228F}
6253
EndGlobalSection

Src/PRuntimes/PCSharpRuntime/Exceptions/PFrozenMutationException.cs renamed to Src/PChecker/CheckerCore/PRuntime/Exceptions/PFrozenMutationException.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2-
using System.Runtime.Serialization;
32

4-
namespace Plang.CSharpRuntime.Exceptions
3+
namespace PChecker.PRuntime.Exceptions
54
{
65
public class PFrozenMutationException : Exception
76
{

Src/PRuntimes/PCSharpRuntime/Exceptions/PIllegalCoercionException.cs renamed to Src/PChecker/CheckerCore/PRuntime/Exceptions/PIllegalCoercionException.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2-
using System.Runtime.Serialization;
32

4-
namespace Plang.CSharpRuntime.Exceptions
3+
namespace PChecker.PRuntime.Exceptions
54
{
65
public class PIllegalCoercionException : Exception
76
{

Src/PRuntimes/PCSharpRuntime/Exceptions/PInternalException.cs renamed to Src/PChecker/CheckerCore/PRuntime/Exceptions/PInternalException.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2-
using System.Runtime.Serialization;
32

4-
namespace Plang.CSharpRuntime.Exceptions
3+
namespace PChecker.PRuntime.Exceptions
54
{
65
public class PInternalException : Exception
76
{

Src/PRuntimes/PCSharpRuntime/Exceptions/PNonStandardReturnException.cs renamed to Src/PChecker/CheckerCore/PRuntime/Exceptions/PNonStandardReturnException.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2-
using System.Runtime.Serialization;
32

4-
namespace Plang.CSharpRuntime.Exceptions
3+
namespace PChecker.PRuntime.Exceptions
54
{
65
public enum NonStandardReturn
76
{

Src/PRuntimes/PCSharpRuntime/Exceptions/PUnReachableCodeException.cs renamed to Src/PChecker/CheckerCore/PRuntime/Exceptions/PUnReachableCodeException.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2-
using System.Runtime.Serialization;
32

4-
namespace Plang.CSharpRuntime.Exceptions
3+
namespace PChecker.PRuntime.Exceptions
54
{
65
public class PUnreachableCodeException : Exception
76
{

Src/PRuntimes/PCSharpRuntime/Exceptions/PrtInhabitsTypeException.cs renamed to Src/PChecker/CheckerCore/PRuntime/Exceptions/PrtInhabitsTypeException.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2-
using System.Runtime.Serialization;
32

4-
namespace Plang.CSharpRuntime.Exceptions
3+
namespace PChecker.PRuntime.Exceptions
54
{
65
public class PrtInhabitsTypeException : Exception
76
{

Src/PRuntimes/PCSharpRuntime/Exceptions/UnknownNamedTupleFieldAccess.cs renamed to Src/PChecker/CheckerCore/PRuntime/Exceptions/UnknownNamedTupleFieldAccess.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33

4-
namespace Plang.CSharpRuntime.Exceptions
4+
namespace PChecker.PRuntime.Exceptions
55
{
66
public class UnknownNamedTupleFieldAccess : Exception
77
{

Src/PRuntimes/PCSharpRuntime/GodMachine.cs renamed to Src/PChecker/CheckerCore/PRuntime/GodMachine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using PChecker.Actors;
33
using PChecker.Actors.Events;
44

5-
namespace Plang.CSharpRuntime
5+
namespace PChecker.PRuntime
66
{
77
public class _GodMachine : StateMachine
88
{

Src/PRuntimes/PCSharpRuntime/PEvent.cs renamed to Src/PChecker/CheckerCore/PRuntime/PEvent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using PChecker.Actors.Events;
3-
using Plang.CSharpRuntime.Values;
3+
using PChecker.PRuntime.Values;
44

5-
namespace Plang.CSharpRuntime
5+
namespace PChecker.PRuntime
66
{
77
public class PEvent : Event, IPrtValue
88
{

0 commit comments

Comments
 (0)