Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Update C# generation for access modifier changes in Q# compiler #481

Merged
bamarsha merged 7 commits into from
Feb 13, 2021
Merged

Update C# generation for access modifier changes in Q# compiler #481

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
e0b98e4
Use new Visibility compiler API
Jan 26, 2021
7720d04
Merge branch 'main' into samarsha/public
Feb 3, 2021
0b6372e
Update C# gen and fix package versions
Feb 3, 2021
bdc6a60
Update naming
Feb 3, 2021
d6f5abe
Merge branch 'main' into samarsha/public
bamarsha Feb 11, 2021
7aeca90
Merge branch 'main' into samarsha/public
bamarsha Feb 12, 2021
e810ae4
Merge branch 'main' into samarsha/public
bamarsha Feb 12, 2021
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
4 changes: 2 additions & 2 deletions src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />

Expand All @@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.7.0" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.15.2101126940" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.15.210222819-alpha" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions src/Simulation/CSharpGeneration/SimulationCode.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,16 +946,16 @@ module SimulationCode =
/// a Property that returns an instance of the operation by calling the
/// IOperationFactory
let buildOpsProperties context (operations : QsQualifiedName list): MemberDeclarationSyntax list =
let getCallableAccessModifier qualifiedName =
let getCallableAccess qualifiedName =
match context.allCallables.TryGetValue qualifiedName with
| true, callable -> Some callable.Modifiers.Access
| true, callable -> Some callable.Access
| false, _ -> None

let getPropertyModifiers qualifiedName =
// Use the right accessibility for the property depending on the accessibility of the callable.
// Note: In C#, "private protected" is the intersection of protected and internal.
match getCallableAccessModifier qualifiedName |> Option.defaultValue DefaultAccess with
| DefaultAccess -> [ ``protected`` ]
match getCallableAccess qualifiedName |> Option.defaultValue Public with
| Public -> [ ``protected`` ]
| Internal -> [ ``private``; ``protected`` ]

let buildOne qualifiedName =
Expand Down Expand Up @@ -1439,8 +1439,8 @@ module SimulationCode =
(constructors @ properties @ methods)
``}``

let private classAccessModifier = function
| DefaultAccess -> ``public``
let private classAccess = function
| Public -> ``public``
| Internal -> ``internal``

// Builds the .NET class for the given operation.
Expand Down Expand Up @@ -1509,7 +1509,7 @@ module SimulationCode =
let methods = [ opNames |> buildInit context; inData |> fst; outData |> fst; buildRun context nonGenericName op.ArgumentTuple op.Signature.ArgumentType op.Signature.ReturnType ]

let modifiers =
let access = classAccessModifier op.Modifiers.Access
let access = classAccess op.Access
if opIsIntrinsic && not isConcreteIntrinsic then
[ access; ``abstract``; ``partial`` ]
else
Expand Down Expand Up @@ -1604,7 +1604,7 @@ module SimulationCode =

let baseClassName = udtBaseClassName context qsharpType
let baseClass = ``simpleBase`` baseClassName
let modifiers = [ classAccessModifier udt.Modifiers.Access ]
let modifiers = [ classAccess udt.Access ]
let interfaces = [ ``simpleBase`` "IApplyData" ]
let constructors = [ buildEmptyConstructor; buildBaseTupleConstructor ]
let qubitsField = buildQubitsField context qsharpType
Expand Down
2 changes: 1 addition & 1 deletion .../QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\Simulators.Dev.props" />
Expand Down
3 changes: 1 addition & 2 deletions src/Simulation/QSharpCore/Microsoft.Quantum.QSharp.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">

<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">
<Import Project="..\TargetDefinitions\TargetPackages\QSharpCore.Package.props" />

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/QSharpFoundation/Microsoft.Quantum.QSharp.Foundation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library with Spaces/Library with Spaces.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<CSharpGeneration>false</CSharpGeneration>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library1/Library1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library2/Library2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<Import Project="..\Common\Simulators.Test.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Type1.Tests/Tests.Microsoft.Quantum.Simulators.Type1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<Import Project="..\Common\Simulators.Test.props" />

Expand Down
4 changes: 1 addition & 3 deletions src/Simulation/Simulators.Type2.Tests/Tests.Microsoft.Quantum.Simulators.Type2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222819-alpha">

<Import Project="..\Common\Simulators.Test.props" />

Expand All @@ -19,5 +19,3 @@
</ItemGroup>

</Project>


3 changes: 2 additions & 1 deletion src/Simulation/Simulators/Microsoft.Quantum.Simulators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />
<Import Project="..\Common\Simulators.Dev.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Type1Core/Microsoft.Quantum.Type1.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<Import Project="..\TargetDefinitions\TargetPackages\Type1.Package.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Type2Core/Microsoft.Quantum.Type2.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.210222838-alpha">

<Import Project="..\TargetDefinitions\TargetPackages\Type2.Package.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Xunit/Microsoft.Quantum.Xunit.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependencies>
<dependency id="xunit" version="2.3.1" />
<dependency id="Microsoft.NET.Test.Sdk" version="15.3.0" />
<dependency id="Microsoft.Quantum.Runtime.Core" version="0.15.2101126940" />
<dependency id="Microsoft.Quantum.Runtime.Core" version="0.15.210222838-alpha" />
</dependencies>
</metadata>

Expand Down