forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #55 from sharwell/client-profile 

Client profile
This commit is contained in:
Sam Harwell 2014-06-30 23:36:18 -05:00
parent 0c70c2b24e 90d2fee8ae
commit 491078e327
65 changed files with 243 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
build/Antlr4.Runtime.nuspec
View File

@ -20,29 +20,29 @@
<files>
<!-- Runtime Libraries -->
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v2.0\$Configuration$\Antlr4.Runtime.v2.0.dll" target="lib\net20"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v2.0\$Configuration$\Antlr4.Runtime.v2.0.pdb" target="lib\net20"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v2.0\$Configuration$\Antlr4.Runtime.v2.0.xml" target="lib\net20"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net20\$Configuration$\Antlr4.Runtime.net20.dll" target="lib\net20"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net20\$Configuration$\Antlr4.Runtime.net20.pdb" target="lib\net20"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net20\$Configuration$\Antlr4.Runtime.net20.xml" target="lib\net20"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v3.0\$Configuration$\Antlr4.Runtime.v3.0.dll" target="lib\net30"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v3.0\$Configuration$\Antlr4.Runtime.v3.0.pdb" target="lib\net30"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v3.0\$Configuration$\Antlr4.Runtime.v3.0.xml" target="lib\net30"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net30\$Configuration$\Antlr4.Runtime.net30.dll" target="lib\net30"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net30\$Configuration$\Antlr4.Runtime.net30.pdb" target="lib\net30"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net30\$Configuration$\Antlr4.Runtime.net30.xml" target="lib\net30"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v3.5\$Configuration$\Antlr4.Runtime.v3.5.dll" target="lib\net35"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v3.5\$Configuration$\Antlr4.Runtime.v3.5.pdb" target="lib\net35"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v3.5\$Configuration$\Antlr4.Runtime.v3.5.xml" target="lib\net35"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-client\$Configuration$\Antlr4.Runtime.net35.dll" target="lib\net35-client"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-client\$Configuration$\Antlr4.Runtime.net35.pdb" target="lib\net35-client"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-client\$Configuration$\Antlr4.Runtime.net35.xml" target="lib\net35-client"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v4.0\$Configuration$\Antlr4.Runtime.v4.0.dll" target="lib\net40"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v4.0\$Configuration$\Antlr4.Runtime.v4.0.pdb" target="lib\net40"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v4.0\$Configuration$\Antlr4.Runtime.v4.0.xml" target="lib\net40"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net40-client\$Configuration$\Antlr4.Runtime.net40.dll" target="lib\net40-client"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net40-client\$Configuration$\Antlr4.Runtime.net40.pdb" target="lib\net40-client"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net40-client\$Configuration$\Antlr4.Runtime.net40.xml" target="lib\net40-client"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v4.5\$Configuration$\Antlr4.Runtime.v4.5.dll" target="lib\net45"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v4.5\$Configuration$\Antlr4.Runtime.v4.5.pdb" target="lib\net45"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\v4.5\$Configuration$\Antlr4.Runtime.v4.5.xml" target="lib\net45"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net45\$Configuration$\Antlr4.Runtime.net45.dll" target="lib\net45"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net45\$Configuration$\Antlr4.Runtime.net45.pdb" target="lib\net45"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net45\$Configuration$\Antlr4.Runtime.net45.xml" target="lib\net45"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\CF3.5\$Configuration$\Antlr4.Runtime.CF3.5.dll" target="lib\net35-cf"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\CF3.5\$Configuration$\Antlr4.Runtime.CF3.5.pdb" target="lib\net35-cf"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\CF3.5\$Configuration$\Antlr4.Runtime.CF3.5.xml" target="lib\net35-cf"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-cf\$Configuration$\Antlr4.Runtime.net35-cf.dll" target="lib\net35-cf"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-cf\$Configuration$\Antlr4.Runtime.net35-cf.pdb" target="lib\net35-cf"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-cf\$Configuration$\Antlr4.Runtime.net35-cf.xml" target="lib\net35-cf"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\Portable\$Configuration$\Antlr4.Runtime.Portable.dll" target="lib\portable-net40"/>
<file src="..\runtime\CSharp\Antlr4.Runtime\bin\Portable\$Configuration$\Antlr4.Runtime.Portable.pdb" target="lib\portable-net40"/>

6
build/Antlr4.VS2008.nuspec
View File

@ -27,8 +27,8 @@
<!-- Build Configuration -->
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\v3.5\$Configuration$\Antlr4.v3.5.props" target="build\Antlr4.props"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\v3.5\$Configuration$\Antlr4.v3.5.targets" target="build\Antlr4.targets"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\v3.5\$Configuration$\Antlr4BuildTasks.v3.5.dll" target="build"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\net35\$Configuration$\Antlr4.net35.props" target="build\Antlr4.props"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\net35\$Configuration$\Antlr4.net35.targets" target="build\Antlr4.targets"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\net35\$Configuration$\Antlr4BuildTasks.net35.dll" target="build"/>
</files>
</package>

6
build/Antlr4.nuspec
View File

@ -27,8 +27,8 @@
<!-- Build Configuration -->
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\v4.0\$Configuration$\Antlr4.v4.0.props" target="build\Antlr4.props"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\v4.0\$Configuration$\Antlr4.v4.0.targets" target="build\Antlr4.targets"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\v4.0\$Configuration$\Antlr4BuildTasks.v4.0.dll" target="build"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\net40\$Configuration$\Antlr4.net40.props" target="build\Antlr4.props"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\net40\$Configuration$\Antlr4.net40.targets" target="build\Antlr4.targets"/>
<file src="..\runtime\CSharp\Antlr4BuildTasks\bin\net40\$Configuration$\Antlr4BuildTasks.net40.dll" target="build"/>
</files>
</package>

16
runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj → runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net20.csproj
View File

@ -17,7 +17,7 @@
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<BaseIntermediateOutputPath>obj\v2.0\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net20\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -25,8 +25,8 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v2.0\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<OutputPath>bin\net20\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET20;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -34,8 +34,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v2.0\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<OutputPath>bin\net20\Release\</OutputPath>
<DefineConstants>TRACE;NET20;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -66,9 +66,9 @@
<Compile Include="TestPerformance.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.v2.0.csproj">
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.net20.csproj">
<Project>{e1a46d9d-66cb-46e8-93b0-7fc87299abef}</Project>
<Name>Antlr4.Runtime.v2.0</Name>
<Name>Antlr4.Runtime.net20</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@ -77,7 +77,7 @@
<Antlr4 Include="Java.g4" />
</ItemGroup>
<ItemGroup>
<None Include="packages.Antlr4.Runtime.Test.v2.0.config" />
<None Include="packages.Antlr4.Runtime.Test.net20.config" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

16
runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj → runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net30.csproj
View File

@ -17,7 +17,7 @@
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<BaseIntermediateOutputPath>obj\v3.0\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net30\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -25,8 +25,8 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v3.0\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<OutputPath>bin\net30\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET30;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -34,8 +34,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v3.0\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<OutputPath>bin\net30\Release\</OutputPath>
<DefineConstants>TRACE;NET30;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -66,9 +66,9 @@
<Compile Include="TestPerformance.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.v3.0.csproj">
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.net30.csproj">
<Project>{ebbdcc35-43cc-416c-860b-9fc115f1eb42}</Project>
<Name>Antlr4.Runtime.v3.0</Name>
<Name>Antlr4.Runtime.net30</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@ -77,7 +77,7 @@
<Antlr4 Include="Java.g4" />
</ItemGroup>
<ItemGroup>
<None Include="packages.Antlr4.Runtime.Test.v3.0.config" />
<None Include="packages.Antlr4.Runtime.Test.net30.config" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

16
runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj → runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net35-client.csproj
View File

@ -17,7 +17,7 @@
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<BaseIntermediateOutputPath>obj\v3.5\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net35\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -25,8 +25,8 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v3.5\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET_3_5</DefineConstants>
<OutputPath>bin\net35\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -34,8 +34,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v3.5\Release\</OutputPath>
<DefineConstants>TRACE;NET_3_5</DefineConstants>
<OutputPath>bin\net35\Release\</OutputPath>
<DefineConstants>TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -66,9 +66,9 @@
<Compile Include="TestPerformance.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.v3.5.csproj">
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.net35-client.csproj">
<Project>{e186fda3-1411-47ee-94c7-9f3745f0474b}</Project>
<Name>Antlr4.Runtime.v3.5</Name>
<Name>Antlr4.Runtime.net35-client</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@ -77,7 +77,7 @@
<Antlr4 Include="Java.g4" />
</ItemGroup>
<ItemGroup>
<None Include="packages.Antlr4.Runtime.Test.v3.5.config" />
<None Include="packages.Antlr4.Runtime.Test.net35-client.config" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

16
runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj → runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net40-client.csproj
View File

@ -17,7 +17,7 @@
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<BaseIntermediateOutputPath>obj\v4.0\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net40\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -25,8 +25,8 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v4.0\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET_3_5;NET_4_0</DefineConstants>
<OutputPath>bin\net40\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -34,8 +34,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v4.0\Release\</OutputPath>
<DefineConstants>TRACE;NET_3_5;NET_4_0</DefineConstants>
<OutputPath>bin\net40\Release\</OutputPath>
<DefineConstants>TRACE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -67,9 +67,9 @@
<Compile Include="TestPerformance.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.v4.0.csproj">
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.net40-client.csproj">
<Project>{423978df-85a4-409e-a16c-453683fe3969}</Project>
<Name>Antlr4.Runtime.v4.0</Name>
<Name>Antlr4.Runtime.net40-client</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@ -78,7 +78,7 @@
<Antlr4 Include="Java.g4" />
</ItemGroup>
<ItemGroup>
<None Include="packages.Antlr4.Runtime.Test.v4.0.config" />
<None Include="packages.Antlr4.Runtime.Test.net40-client.config" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

16
runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj → runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net45.csproj
View File

@ -17,7 +17,7 @@
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<BaseIntermediateOutputPath>obj\v4.5\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net45\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -25,8 +25,8 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v4.5\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
<OutputPath>bin\net45\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -34,8 +34,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v4.5\Release\</OutputPath>
<DefineConstants>TRACE;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
<OutputPath>bin\net45\Release\</OutputPath>
<DefineConstants>TRACE;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -67,9 +67,9 @@
<Compile Include="TestPerformance.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.v4.5.csproj">
<ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.net45.csproj">
<Project>{e1d192de-5347-48c4-a9f4-a8cba2af3869}</Project>
<Name>Antlr4.Runtime.v4.5</Name>
<Name>Antlr4.Runtime.net45</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@ -78,7 +78,7 @@
<Antlr4 Include="Java.g4" />
</ItemGroup>
<ItemGroup>
<None Include="packages.Antlr4.Runtime.Test.v4.5.config" />
<None Include="packages.Antlr4.Runtime.Test.net45.config" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

8
runtime/CSharp/Antlr4.Runtime.Test/BaseTest.cs
View File

@ -71,7 +71,7 @@
{
get
{
#if NET_4_0
#if NET40PLUS
return Environment.GetFolderPath(Environment.SpecialFolder.Windows);
#else
string systemFolder = Environment.GetFolderPath(Environment.SpecialFolder.System);
@ -84,7 +84,7 @@
{
get
{
#if NET_4_0
#if NET40PLUS
return Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
#else
string documentsFolder = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
@ -95,7 +95,7 @@
protected static string PathCombine(params string[] paths)
{
#if NET_4_0
#if NET40PLUS
return Path.Combine(paths);
#else
string result = paths[0];
@ -225,7 +225,7 @@
get
{
string javaKey = "SOFTWARE\\JavaSoft\\Java Runtime Environment";
#if NET_4_0
#if NET40PLUS
using (var baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Default).OpenSubKey(javaKey))
#else
using (var baseKey = Registry.LocalMachine.OpenSubKey(javaKey))

20
runtime/CSharp/Antlr4.Runtime.Test/TestPerformance.cs
View File

@ -24,7 +24,7 @@
using StreamReader = System.IO.StreamReader;
using Thread = System.Threading.Thread;
#if NET_4_0
#if NET40PLUS
using System.Collections.Concurrent;
using System.Threading.Tasks;
using System.Threading.Tasks.Schedulers;
@ -386,7 +386,7 @@
int sourceCount = 0;
int inputSize = 0;
#if NET_4_0
#if NET40PLUS
BlockingCollection<int> threadIdentifiers = new BlockingCollection<int>();
for (int i = 0; i < NUMBER_OF_THREADS; i++)
threadIdentifiers.Add(i);
@ -402,7 +402,7 @@
sourceCount++;
input.Seek(0);
inputSize += input.Size;
#if NET_4_0
#if NET40PLUS
Task<int> futureChecksum = Task.Factory.StartNew<int>(new Callable_1(input, factory, threadIdentifiers).call, CancellationToken.None, TaskCreationOptions.None, executorService);
#else
Func<int> futureChecksum = new Callable_1(input, factory).call;
@ -413,7 +413,7 @@
Checksum checksum = new CRC32();
foreach (var future in results)
{
#if NET_4_0
#if NET40PLUS
int value = future.Result;
#else
int value = future();
@ -424,7 +424,7 @@
}
}
#if NET_4_0
#if NET40PLUS
executorServiceHost.Dispose();
#endif
@ -592,11 +592,11 @@
{
private readonly ICharStream input;
private readonly ParserFactory factory;
#if NET_4_0
#if NET40PLUS
private readonly BlockingCollection<int> threadNumbers;
#endif
#if NET_4_0
#if NET40PLUS
public Callable_1(ICharStream input, ParserFactory factory, BlockingCollection<int> threadNumbers)
#else
public Callable_1(ICharStream input, ParserFactory factory)
@ -604,7 +604,7 @@
{
this.input = input;
this.factory = factory;
#if NET_4_0
#if NET40PLUS
this.threadNumbers = threadNumbers;
#endif
}
@ -613,7 +613,7 @@
{
// this incurred a great deal of overhead and was causing significant variations in performance results.
//Console.Out.WriteLine("Parsing file {0}", input.getSourceName());
#if NET_4_0
#if NET40PLUS
int threadNumber = threadNumbers.Take();
#else
int threadNumber = 0;
@ -624,7 +624,7 @@
}
finally
{
#if NET_4_0
#if NET40PLUS
threadNumbers.Add(threadNumber);
#endif
}

0
runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v2.0.config → runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net20.config
View File

0
runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.0.config → runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net30.config
View File

4
runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.5.config → runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net35-client.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net35" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net35" />
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net35-client" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net35-client" />
</packages>

4
runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.0.config → runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net40-client.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net40" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net40" />
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net40-client" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net40-client" />
</packages>

0
runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.5.config → runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net45.config
View File

14
runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v2.0.csproj → runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net20.csproj
View File

@ -9,10 +9,10 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Runtime</RootNamespace>
<AssemblyName>Antlr4.Runtime.v2.0</AssemblyName>
<AssemblyName>Antlr4.Runtime.net20</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\v2.0\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net20\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -20,9 +20,9 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v2.0\Debug\</OutputPath>
<OutputPath>bin\net20\Debug\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>DEBUG;TRACE;NET_2_0</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET20;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -30,9 +30,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v2.0\Release\</OutputPath>
<OutputPath>bin\net20\Release\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;NET_2_0</DefineConstants>
<DefineConstants>TRACE;NET20;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -243,7 +243,7 @@
<Compile Include="Tree\Xpath\XPathWildcardElement.cs" />
<Compile Include="UnbufferedCharStream.cs" />
<Compile Include="UnbufferedTokenStream.cs" />
<None Include="packages.Antlr4.Runtime.v2.0.config" />
<None Include="packages.Antlr4.Runtime.net20.config" />
<Antlr4 Include="Tree\Xpath\XPathLexer.g4">
<Generator>MSBuild:Compile</Generator>
<CustomToolNamespace>Antlr4.Runtime.Tree.Xpath</CustomToolNamespace>

14
runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.0.csproj → runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net30.csproj
View File

@ -9,10 +9,10 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Runtime</RootNamespace>
<AssemblyName>Antlr4.Runtime.v3.0</AssemblyName>
<AssemblyName>Antlr4.Runtime.net30</AssemblyName>
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\v3.0\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net30\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -20,9 +20,9 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v3.0\Debug\</OutputPath>
<OutputPath>bin\net30\Debug\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>DEBUG;TRACE;NET_2_0;NET_3_0</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET30;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -30,9 +30,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v3.0\Release\</OutputPath>
<OutputPath>bin\net30\Release\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;NET_2_0;NET_3_0</DefineConstants>
<DefineConstants>TRACE;NET30;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -243,7 +243,7 @@
<Compile Include="Tree\Xpath\XPathWildcardElement.cs" />
<Compile Include="UnbufferedCharStream.cs" />
<Compile Include="UnbufferedTokenStream.cs" />
<None Include="packages.Antlr4.Runtime.v3.0.config" />
<None Include="packages.Antlr4.Runtime.net30.config" />
<Antlr4 Include="Tree\Xpath\XPathLexer.g4">
<Generator>MSBuild:Compile</Generator>
<CustomToolNamespace>Antlr4.Runtime.Tree.Xpath</CustomToolNamespace>

16
runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.CF3.5.csproj → runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-cf.csproj
View File

@ -10,18 +10,18 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Runtime</RootNamespace>
<AssemblyName>Antlr4.Runtime.CF3.5</AssemblyName>
<AssemblyName>Antlr4.Runtime.net35-cf</AssemblyName>
<ProjectTypeGuids>{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PlatformFamilyName>WindowsCE</PlatformFamilyName>
<PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
<OSVersion>5.0</OSVersion>
<DeployDirSuffix>Antlr4.Runtime.CF3.5</DeployDirSuffix>
<DeployDirSuffix>Antlr4.Runtime.net35-cf</DeployDirSuffix>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<NativePlatformName>Windows CE</NativePlatformName>
<FormFactorID>
</FormFactorID>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\CF3.5\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net35-cf\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -29,9 +29,9 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\CF3.5\Debug\</OutputPath>
<OutputPath>bin\net35-cf\Debug\</OutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<DefineConstants>DEBUG;TRACE;$(PlatformFamilyName);NET_CF;NET_2_0;NET_3_0;NET_3_5</DefineConstants>
<DefineConstants>DEBUG;TRACE;$(PlatformFamilyName);COMPACT;NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
@ -43,9 +43,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\CF3.5\Release\</OutputPath>
<OutputPath>bin\net35-cf\Release\</OutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;$(PlatformFamilyName);NET_CF;NET_2_0;NET_3_0;NET_3_5</DefineConstants>
<DefineConstants>TRACE;$(PlatformFamilyName);COMPACT;NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
@ -262,7 +262,7 @@
<Compile Include="Tree\Xpath\XPathWildcardElement.cs" />
<Compile Include="UnbufferedCharStream.cs" />
<Compile Include="UnbufferedTokenStream.cs" />
<None Include="packages.Antlr4.Runtime.CF3.5.config" />
<None Include="packages.Antlr4.Runtime.net35-cf.config" />
<Antlr4 Include="Tree\Xpath\XPathLexer.g4">
<Generator>MSBuild:Compile</Generator>
<CustomToolNamespace>Antlr4.Runtime.Tree.Xpath</CustomToolNamespace>

15
runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.5.csproj → runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-client.csproj
View File

@ -9,10 +9,11 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Runtime</RootNamespace>
<AssemblyName>Antlr4.Runtime.v3.5</AssemblyName>
<AssemblyName>Antlr4.Runtime.net35</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\v3.5\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net35-client\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -20,9 +21,9 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v3.5\Debug\</OutputPath>
<OutputPath>bin\net35-client\Debug\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>DEBUG;TRACE;NET_2_0;NET_3_0;NET_3_5</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -30,9 +31,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v3.5\Release\</OutputPath>
<OutputPath>bin\net35-client\Release\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;NET_2_0;NET_3_0;NET_3_5</DefineConstants>
<DefineConstants>TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -242,7 +243,7 @@
<Compile Include="Tree\Xpath\XPathWildcardElement.cs" />
<Compile Include="UnbufferedCharStream.cs" />
<Compile Include="UnbufferedTokenStream.cs" />
<None Include="packages.Antlr4.Runtime.v3.5.config" />
<None Include="packages.Antlr4.Runtime.net35-client.config" />
<Antlr4 Include="Tree\Xpath\XPathLexer.g4">
<Generator>MSBuild:Compile</Generator>
<CustomToolNamespace>Antlr4.Runtime.Tree.Xpath</CustomToolNamespace>

15
runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.0.csproj → runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net40-client.csproj
View File

@ -9,10 +9,11 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Runtime</RootNamespace>
<AssemblyName>Antlr4.Runtime.v4.0</AssemblyName>
<AssemblyName>Antlr4.Runtime.net40</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\v4.0\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net40-client\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -20,9 +21,9 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v4.0\Debug\</OutputPath>
<OutputPath>bin\net40-client\Debug\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<DefineConstants>TRACE;DEBUG;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -30,9 +31,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v4.0\Release\</OutputPath>
<OutputPath>bin\net40-client\Release\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>
<DefineConstants>TRACE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -236,7 +237,7 @@
<Compile Include="Tree\Xpath\XPathWildcardElement.cs" />
<Compile Include="UnbufferedCharStream.cs" />
<Compile Include="UnbufferedTokenStream.cs" />
<None Include="packages.Antlr4.Runtime.v4.0.config" />
<None Include="packages.Antlr4.Runtime.net40-client.config" />
<Antlr4 Include="Tree\Xpath\XPathLexer.g4">
<Generator>MSBuild:Compile</Generator>
<CustomToolNamespace>Antlr4.Runtime.Tree.Xpath</CustomToolNamespace>

14
runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.5.csproj → runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net45.csproj
View File

@ -9,10 +9,10 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Runtime</RootNamespace>
<AssemblyName>Antlr4.Runtime.v4.5</AssemblyName>
<AssemblyName>Antlr4.Runtime.net45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\v4.5\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net45\</BaseIntermediateOutputPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -20,9 +20,9 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v4.5\Debug\</OutputPath>
<OutputPath>bin\net45\Debug\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
<DefineConstants>TRACE;DEBUG;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -30,9 +30,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v4.5\Release\</OutputPath>
<OutputPath>bin\net45\Release\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<DefineConstants>TRACE;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
<DefineConstants>TRACE;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1591</NoWarn>
@ -236,7 +236,7 @@
<Compile Include="Tree\Xpath\XPathWildcardElement.cs" />
<Compile Include="UnbufferedCharStream.cs" />
<Compile Include="UnbufferedTokenStream.cs" />
<None Include="packages.Antlr4.Runtime.v4.5.config" />
<None Include="packages.Antlr4.Runtime.net45.config" />
<Antlr4 Include="Tree\Xpath\XPathLexer.g4">
<Generator>MSBuild:Compile</Generator>
<CustomToolNamespace>Antlr4.Runtime.Tree.Xpath</CustomToolNamespace>

6
runtime/CSharp/Antlr4.Runtime/AntlrFileStream.cs
View File

@ -36,7 +36,7 @@ using File = System.IO.File;
namespace Antlr4.Runtime
{
#if NET_CF
#if COMPACT
using StreamReader = System.IO.StreamReader;
#endif
@ -72,7 +72,7 @@ namespace Antlr4.Runtime
}
string text;
#if !NET_CF
#if !COMPACT
if (encoding != null)
text = File.ReadAllText(fileName, encoding);
else
@ -96,7 +96,7 @@ namespace Antlr4.Runtime
}
}
#if NET_CF
#if COMPACT
private static string ReadAllText(string path)
{
using (var reader = new StreamReader(path))

2
runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs
View File

@ -394,7 +394,7 @@ namespace Antlr4.Runtime.Atn
public virtual string ToDotString()
{
#if NET_CF
#if COMPACT
throw new NotImplementedException("The current platform does not provide RuntimeHelpers.GetHashCode(object).");
#else
StringBuilder builder = new StringBuilder();

2
runtime/CSharp/Antlr4.Runtime/Atn/SemanticContext.cs
View File

@ -580,7 +580,7 @@ namespace Antlr4.Runtime.Atn
Collections.EmptyList<PrecedencePredicate>();
List<PrecedencePredicate> result = collection.OfType<PrecedencePredicate>().ToList();
#if NET_4_0
#if NET40PLUS
collection.ExceptWith(result);
#else
collection.ExceptWith(result.Cast<SemanticContext>());

2
runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs
View File

@ -103,7 +103,7 @@ namespace Antlr4.Runtime.Dfa
get;
}
#if NET_4_5
#if NET45PLUS
public abstract IReadOnlyDictionary<int, T> ToMap();
#else
public abstract IDictionary<int, T> ToMap();

6
runtime/CSharp/Antlr4.Runtime/Dfa/ArrayEdgeMap`1.cs
View File

@ -167,7 +167,7 @@ namespace Antlr4.Runtime.Dfa
return this;
}
#if NET_4_5
#if NET45PLUS
public override IReadOnlyDictionary<int, T> ToMap()
#else
public override IDictionary<int, T> ToMap()
@ -178,7 +178,7 @@ namespace Antlr4.Runtime.Dfa
return Sharpen.Collections.EmptyMap<int, T>();
}
#if NET_CF
#if COMPACT
IDictionary<int, T> result = new SortedList<int, T>();
#else
IDictionary<int, T> result = new SortedDictionary<int, T>();
@ -191,7 +191,7 @@ namespace Antlr4.Runtime.Dfa
}
result[i + minIndex] = arrayData[i];
}
#if NET_4_5
#if NET45PLUS
return new ReadOnlyDictionary<int, T>(result);
#else
return result;

10
runtime/CSharp/Antlr4.Runtime/Dfa/DFAState.cs
View File

@ -208,7 +208,7 @@ namespace Antlr4.Runtime.Dfa
}
}
#if NET_4_5
#if NET45PLUS
public virtual IReadOnlyDictionary<int, DFAState> EdgeMap
#else
public virtual IDictionary<int, DFAState> EdgeMap
@ -256,7 +256,7 @@ namespace Antlr4.Runtime.Dfa
}
}
#if NET_4_5
#if NET45PLUS
public virtual IReadOnlyDictionary<int, DFAState> ContextEdgeMap
#else
public virtual IDictionary<int, DFAState> ContextEdgeMap
@ -277,16 +277,16 @@ namespace Antlr4.Runtime.Dfa
}
else
{
#if NET_4_5
#if NET45PLUS
Dictionary<int, DFAState> result = map.ToDictionary(i => i.Key, i => i.Value);
#else
Dictionary<int, DFAState> result = new Dictionary<int, DFAState>(map);
#endif
result.Add(PredictionContext.EmptyFullStateKey, result[-1]);
result.Remove(-1);
#if NET_4_5
#if NET45PLUS
map = new ReadOnlyDictionary<int, DFAState>(new SortedDictionary<int, DFAState>(result));
#elif NET_CF
#elif COMPACT
map = new SortedList<int, DFAState>(result);
#else
map = new SortedDictionary<int, DFAState>(result);

2
runtime/CSharp/Antlr4.Runtime/Dfa/IEdgeMap`1.cs
View File

@ -66,7 +66,7 @@ namespace Antlr4.Runtime.Dfa
[return: NotNull]
IEdgeMap<T> Clear();
#if NET_4_5
#if NET45PLUS
[return: NotNull]
IReadOnlyDictionary<int, T> ToMap();
#else

2
runtime/CSharp/Antlr4.Runtime/Dfa/SingletonEdgeMap`1.cs
View File

@ -150,7 +150,7 @@ namespace Antlr4.Runtime.Dfa
return this;
}
#if NET_4_5
#if NET45PLUS
public override IReadOnlyDictionary<int, T> ToMap()
#else
public override IDictionary<int, T> ToMap()

6
runtime/CSharp/Antlr4.Runtime/Dfa/SparseEdgeMap`1.cs
View File

@ -196,7 +196,7 @@ namespace Antlr4.Runtime.Dfa
return result;
}
#if NET_4_5
#if NET45PLUS
public override IReadOnlyDictionary<int, T> ToMap()
#else
public override IDictionary<int, T> ToMap()
@ -207,7 +207,7 @@ namespace Antlr4.Runtime.Dfa
return Sharpen.Collections.EmptyMap<int, T>();
}
#if NET_CF
#if COMPACT
IDictionary<int, T> result = new SortedList<int, T>();
#else
IDictionary<int, T> result = new SortedDictionary<int, T>();
@ -216,7 +216,7 @@ namespace Antlr4.Runtime.Dfa
{
result[keys[i]] = values[i];
}
#if NET_4_5
#if NET45PLUS
return new ReadOnlyDictionary<int, T>(result);
#else
return result;

2
runtime/CSharp/Antlr4.Runtime/IAntlrErrorListener`1.cs
View File

@ -34,7 +34,7 @@ namespace Antlr4.Runtime
{
/// <summary>How to emit recognition errors.</summary>
/// <remarks>How to emit recognition errors.</remarks>
#if NET_CF
#if COMPACT
public interface IAntlrErrorListener<TSymbol>
#else
public interface IAntlrErrorListener<in TSymbol>

2
runtime/CSharp/Antlr4.Runtime/Misc/ParseCanceledException.cs
View File

@ -48,7 +48,7 @@ namespace Antlr4.Runtime.Misc
[System.Serializable]
#endif
public class ParseCanceledException
#if NET_CF
#if COMPACT
: Exception
#else
: OperationCanceledException

2
runtime/CSharp/Antlr4.Runtime/Misc/RuleDependencyChecker.cs
View File

@ -341,7 +341,7 @@ namespace Antlr4.Runtime.Misc
foreach (MethodInfo method in clazz.GetMethods(AllDeclaredMembers))
{
GetElementDependencies(AsCustomAttributeProvider(method), result);
#if NET_CF
#if COMPACT
if (method.ReturnTypeCustomAttributes != null)
GetElementDependencies(AsCustomAttributeProvider(method.ReturnTypeCustomAttributes), result);
#else

2
runtime/CSharp/Antlr4.Runtime/Misc/Utils.cs
View File

@ -39,7 +39,7 @@ namespace Antlr4.Runtime.Misc
{
public static string Join<T>(string separator, IEnumerable<T> items)
{
#if NET_4_0
#if NET40PLUS
return string.Join(separator, items);
#else
List<string> elements = new List<string>();

8
runtime/CSharp/Antlr4.Runtime/ParserRuleContext.cs
View File

@ -284,7 +284,7 @@ namespace Antlr4.Runtime
return null;
}
#if NET_4_5
#if NET45PLUS
public virtual IReadOnlyList<ITerminalNode> GetTokens(int ttype)
#else
public virtual ITerminalNode[] GetTokens(int ttype)
@ -315,7 +315,7 @@ namespace Antlr4.Runtime
{
return Collections.EmptyList<ITerminalNode>();
}
#if NET_4_5
#if NET45PLUS
return tokens;
#else
return tokens.ToArray();
@ -328,7 +328,7 @@ namespace Antlr4.Runtime
return GetChild<T>(i);
}
#if NET_4_5
#if NET45PLUS
public virtual IReadOnlyList<T> GetRuleContexts<T>()
where T : Antlr4.Runtime.ParserRuleContext
#else
@ -356,7 +356,7 @@ namespace Antlr4.Runtime
{
return Collections.EmptyList<T>();
}
#if NET_4_5
#if NET45PLUS
return contexts;
#else
return contexts.ToArray();

22
runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs
View File

@ -37,16 +37,16 @@ using System.Runtime.InteropServices;
// associated with an assembly.
#if PORTABLE
[assembly: AssemblyTitle("Antlr4.Runtime.Portable")]
#elif NET_4_5
[assembly: AssemblyTitle("Antlr4.Runtime.v4.5")]
#elif NET_4_0
[assembly: AssemblyTitle("Antlr4.Runtime.v4.0")]
#elif NET_3_5
[assembly: AssemblyTitle("Antlr4.Runtime.v3.5")]
#elif NET_3_0
[assembly: AssemblyTitle("Antlr4.Runtime.v3.0")]
#elif NET_2_0
[assembly: AssemblyTitle("Antlr4.Runtime.v2.0")]
#elif NET45
[assembly: AssemblyTitle("Antlr4.Runtime.net45")]
#elif NET40
[assembly: AssemblyTitle("Antlr4.Runtime.net40")]
#elif NET35
[assembly: AssemblyTitle("Antlr4.Runtime.net35")]
#elif NET30
[assembly: AssemblyTitle("Antlr4.Runtime.net30")]
#elif NET20
[assembly: AssemblyTitle("Antlr4.Runtime.net20")]
#else
#error Unknown assembly.
#endif
@ -78,7 +78,7 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.2.0.0")]
#if !NET_CF
#if !COMPACT
[assembly: AssemblyFileVersion("4.2.2.0")]
[assembly: AssemblyInformationalVersion("4.2.2-dev")]
#endif

8
runtime/CSharp/Antlr4.Runtime/Sharpen/Collections.cs
View File

@ -39,7 +39,7 @@ namespace Antlr4.Runtime.Sharpen
return EmptyListImpl<T>.Instance;
}
#if NET_4_5
#if NET45PLUS
public static ReadOnlyDictionary<TKey, TValue> EmptyMap<TKey, TValue>()
#else
public static IDictionary<TKey, TValue> EmptyMap<TKey, TValue>()
@ -53,13 +53,13 @@ namespace Antlr4.Runtime.Sharpen
return new ReadOnlyCollection<T>(new T[] { item });
}
#if NET_4_5
#if NET45PLUS
public static ReadOnlyDictionary<TKey, TValue> SingletonMap<TKey, TValue>(TKey key, TValue value)
#else
public static IDictionary<TKey, TValue> SingletonMap<TKey, TValue>(TKey key, TValue value)
#endif
{
#if NET_4_5
#if NET45PLUS
return new ReadOnlyDictionary<TKey,TValue>(new Dictionary<TKey, TValue> { { key, value } });
#else
return new Dictionary<TKey, TValue> { { key, value } };
@ -73,7 +73,7 @@ namespace Antlr4.Runtime.Sharpen
private static class EmptyMapImpl<TKey, TValue>
{
#if NET_4_5
#if NET45PLUS
public static readonly ReadOnlyDictionary<TKey, TValue> Instance =
new ReadOnlyDictionary<TKey, TValue>(new Dictionary<TKey, TValue>());
#else

6
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/CollectionDebuggerView`2.cs
View File

@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_4_0
#if !NET40PLUS
using System;
using System.Collections.Generic;
@ -46,7 +46,7 @@ namespace Antlr4.Runtime.Sharpen
this.c = col;
}
#if !NET_CF
#if !COMPACT
[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
#endif
public T[] Items {
@ -67,7 +67,7 @@ namespace Antlr4.Runtime.Sharpen
this.c = col;
}
#if !NET_CF
#if !COMPACT
[DebuggerBrowsable (DebuggerBrowsableState.RootHidden)]
#endif
public KeyValuePair<T, U>[] Items {

4
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ConcurrentDictionary`2.cs
View File

@ -22,7 +22,7 @@
//
//
#if !NET_4_0
#if !NET40PLUS
using System;
using System.Threading;
@ -38,7 +38,7 @@ namespace System.Collections.Concurrent
namespace Antlr4.Runtime.Sharpen
{
#if !NET_CF
#if !COMPACT
[DebuggerDisplay ("Count={Count}")]
[DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))]
#endif

2
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Enumerable.cs
View File

@ -1,4 +1,4 @@
#if !NET_3_5
#if !NET35PLUS
namespace System.Linq
{

2
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ExtensionAttribute.cs
View File

@ -1,4 +1,4 @@
#if !NET_3_5
#if !NET35PLUS
namespace System.Runtime.CompilerServices
{

2
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Funcs.cs
View File

@ -25,7 +25,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
//
#if !NET_3_5
#if !NET35PLUS
using System.Runtime.CompilerServices;

12
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/HashSet`1.cs
View File

@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_3_5 || NET_CF
#if !NET35PLUS || COMPACT
using System;
using System.Collections;
@ -42,12 +42,12 @@ using System.Diagnostics;
namespace Antlr4.Runtime.Sharpen {
[Serializable]
#if !NET_CF
#if !COMPACT
[DebuggerDisplay ("Count={Count}")]
[DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))]
#endif
public class HashSet<T> : ICollection<T>
#if !NET_CF
#if !COMPACT
, ISerializable, IDeserializationCallback
#endif
{
@ -86,7 +86,7 @@ namespace Antlr4.Runtime.Sharpen {
int threshold;
IEqualityComparer<T> comparer;
#if !NET_CF
#if !COMPACT
SerializationInfo si;
#endif
@ -127,7 +127,7 @@ namespace Antlr4.Runtime.Sharpen {
Add (item);
}
#if !NET_CF
#if !COMPACT
protected HashSet (SerializationInfo info, StreamingContext context)
{
si = info;
@ -579,7 +579,7 @@ namespace Antlr4.Runtime.Sharpen {
return setComparer;
}
#if !NET_CF
#if !COMPACT
[SecurityPermission (SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
{

2
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralComparable.cs
View File

@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_4_0
#if !NET40PLUS
using System;
using System.Collections;

2
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralEquatable.cs
View File

@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_4_0
#if !NET40PLUS
using System;
using System.Collections;

14
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/SplitOrderedList`2.cs
View File

@ -22,7 +22,7 @@
//
//
#if !NET_4_0
#if !NET40PLUS
using System;
using System.Threading;
@ -438,7 +438,7 @@ namespace Antlr4.Runtime.Sharpen
while ((rwlock & (RwWrite | RwWait)) > 0)
sw.SpinOnce ();
#if NET_CF
#if COMPACT
if ((InterlockedAdd (ref rwlock, RwRead) & (RwWait | RwWait)) == 0)
return;
@ -454,7 +454,7 @@ namespace Antlr4.Runtime.Sharpen
public void ExitReadLock ()
{
#if NET_CF
#if COMPACT
InterlockedAdd (ref rwlock, -RwRead);
#else
Interlocked.Add (ref rwlock, -RwRead);
@ -482,14 +482,14 @@ namespace Antlr4.Runtime.Sharpen
public void ExitWriteLock ()
{
#if NET_CF
#if COMPACT
InterlockedAdd (ref rwlock, -RwWrite);
#else
Interlocked.Add (ref rwlock, -RwWrite);
#endif
}
#if NET_CF
#if COMPACT
/// <summary>
/// Adds two 32-bit integers and replaces the first integer with the sum, as an atomic operation.
/// </summary>
@ -521,7 +521,7 @@ namespace Antlr4.Runtime.Sharpen
// The number of step until SpinOnce yield on multicore machine
const int step = 10;
const int maxTime = 200;
#if !NET_CF
#if !COMPACT
static readonly bool isSingleCpu = (Environment.ProcessorCount == 1);
#endif
@ -530,7 +530,7 @@ namespace Antlr4.Runtime.Sharpen
public void SpinOnce ()
{
ntime += 1;
#if NET_CF
#if COMPACT
Thread.Sleep(0);
#else
if (isSingleCpu) {

2
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuple.cs
View File

@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_4_0
#if !NET40PLUS
using System;

2
runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuples.cs
View File

@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NET_4_0
#if !NET40PLUS
using System;
using System.Collections;

2
runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeVisitor`1.cs
View File

@ -43,7 +43,7 @@ namespace Antlr4.Runtime.Tree
/// .
/// </remarks>
/// <author>Sam Harwell</author>
#if NET_CF
#if COMPACT
public interface IParseTreeVisitor<Result>
#else
public interface IParseTreeVisitor<out Result>

0
runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v2.0.config → runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net20.config
View File

0
runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v3.0.config → runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net30.config
View File

0
runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.CF3.5.config → runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net35-cf.config
View File

4
runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v3.5.config → runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net35-client.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net35" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net35" />
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net35-client" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net35-client" />
</packages>

4
runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v4.0.config → runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net40-client.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net40" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net40" />
<package id="Antlr4" version="4.2.1-alpha001" targetFramework="net40-client" />
<package id="Antlr4.Runtime" version="4.2.1-alpha001" targetFramework="net40-client" />
</packages>

0
runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v4.5.config → runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net45.config
View File

2
runtime/CSharp/Antlr4.VS2008.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.CF3.5", "Antlr4.Runtime\Antlr4.Runtime.CF3.5.csproj", "{C5F9C476-200F-4440-9524-C5C3F9BE16D7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net35-cf", "Antlr4.Runtime\Antlr4.Runtime.net35-cf.csproj", "{C5F9C476-200F-4440-9524-C5C3F9BE16D7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

24
runtime/CSharp/Antlr4.sln
View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v4.5", "Antlr4.Runtime\Antlr4.Runtime.v4.5.csproj", "{E1D192DE-5347-48C4-A9F4-A8CBA2AF3869}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net45", "Antlr4.Runtime\Antlr4.Runtime.net45.csproj", "{E1D192DE-5347-48C4-A9F4-A8CBA2AF3869}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47C0086D-577C-43DA-ADC7-544F27656E45}"
ProjectSection(SolutionItems) = preProject
@ -16,31 +16,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\..\reference\sharpen.md = ..\..\reference\sharpen.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v4.5", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v4.5.csproj", "{9D8C43DF-71F9-4CC9-83AD-A39FAEBCECA0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net45", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net45.csproj", "{9D8C43DF-71F9-4CC9-83AD-A39FAEBCECA0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.v4.0", "Antlr4BuildTasks\Antlr4BuildTasks.v4.0.csproj", "{F63DFE80-AE1F-47A6-A31A-E39DA4C837BA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.net40", "Antlr4BuildTasks\Antlr4BuildTasks.net40.csproj", "{F63DFE80-AE1F-47A6-A31A-E39DA4C837BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v4.0", "Antlr4.Runtime\Antlr4.Runtime.v4.0.csproj", "{423978DF-85A4-409E-A16C-453683FE3969}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net40-client", "Antlr4.Runtime\Antlr4.Runtime.net40-client.csproj", "{423978DF-85A4-409E-A16C-453683FE3969}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v3.5", "Antlr4.Runtime\Antlr4.Runtime.v3.5.csproj", "{E186FDA3-1411-47EE-94C7-9F3745F0474B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net35-client", "Antlr4.Runtime\Antlr4.Runtime.net35-client.csproj", "{E186FDA3-1411-47EE-94C7-9F3745F0474B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v3.0", "Antlr4.Runtime\Antlr4.Runtime.v3.0.csproj", "{EBBDCC35-43CC-416C-860B-9FC115F1EB42}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net30", "Antlr4.Runtime\Antlr4.Runtime.net30.csproj", "{EBBDCC35-43CC-416C-860B-9FC115F1EB42}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v2.0", "Antlr4.Runtime\Antlr4.Runtime.v2.0.csproj", "{E1A46D9D-66CB-46E8-93B0-7FC87299ABEF}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net20", "Antlr4.Runtime\Antlr4.Runtime.net20.csproj", "{E1A46D9D-66CB-46E8-93B0-7FC87299ABEF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v4.0", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v4.0.csproj", "{706D364A-CD4E-4720-B94C-0DB82AF7B433}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net40-client", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net40-client.csproj", "{706D364A-CD4E-4720-B94C-0DB82AF7B433}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v3.5", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v3.5.csproj", "{C4A38390-8AA3-45AE-9A70-C392146B37D0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net35-client", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net35-client.csproj", "{C4A38390-8AA3-45AE-9A70-C392146B37D0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v3.0", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v3.0.csproj", "{8A2F2331-A4A5-4C7F-8D5D-DEECEF54AEA7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net30", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net30.csproj", "{8A2F2331-A4A5-4C7F-8D5D-DEECEF54AEA7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v2.0", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v2.0.csproj", "{0A4681C4-1248-4ACD-B59F-D6CC17CC2B4C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net20", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net20.csproj", "{0A4681C4-1248-4ACD-B59F-D6CC17CC2B4C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Portable", "Antlr4.Runtime\Antlr4.Runtime.Portable.csproj", "{06C182C5-095C-4D43-9C33-C87E305C6BC2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.Portable", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.Portable.csproj", "{97C32E42-51B2-4A29-B005-769B63CFEFCA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.v3.5", "Antlr4BuildTasks\Antlr4BuildTasks.v3.5.csproj", "{0D3D20E9-3341-4449-80E7-76A4534F0E55}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.net35", "Antlr4BuildTasks\Antlr4BuildTasks.net35.csproj", "{0D3D20E9-3341-4449-80E7-76A4534F0E55}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4CE79A54-058D-4940-875E-7F6AA9922A7D}"
ProjectSection(SolutionItems) = preProject

2
runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.props → runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.props
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Folder containing Antlr4BuildTasks.v3.5.dll -->
<!-- Folder containing Antlr4BuildTasks.net35.dll -->
<Antlr4BuildTaskPath>.</Antlr4BuildTaskPath>
<!-- Path to the ANTLR tool itself -->
<Antlr4ToolPath>..\tools\antlr4-csharp-4.2.2-SNAPSHOT-complete.jar</Antlr4ToolPath>

4
runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.targets → runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.targets
View File

@ -30,7 +30,7 @@
<BuildSystem>MSBuild</BuildSystem>
<TaskVersion>4.0.0.0</TaskVersion>
<TaskKeyToken>eb42632606e9261f</TaskKeyToken>
<Antlr4BuildTaskAssemblyName Condition="'$(Antlr4BuildTaskAssemblyName)'==''">Antlr4BuildTasks.v3.5, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken)</Antlr4BuildTaskAssemblyName>
<Antlr4BuildTaskAssemblyName Condition="'$(Antlr4BuildTaskAssemblyName)'==''">Antlr4BuildTasks.net35, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken)</Antlr4BuildTaskAssemblyName>
</PropertyGroup>
<PropertyGroup>
@ -61,7 +61,7 @@
</PropertyGroup>
<UsingTask Condition="'$(Antlr4BuildTaskPath)'==''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyName="$(Antlr4BuildTaskAssemblyName)" />
<UsingTask Condition="'$(Antlr4BuildTaskPath)'!=''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyFile="$(Antlr4BuildTaskPath)\Antlr4BuildTasks.v3.5.dll" />
<UsingTask Condition="'$(Antlr4BuildTaskPath)'!=''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyFile="$(Antlr4BuildTaskPath)\Antlr4BuildTasks.net35.dll" />
<PropertyGroup>
<PrepareResourcesDependsOn>

2
runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.props → runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.props
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Folder containing Antlr4BuildTasks.v4.0.dll -->
<!-- Folder containing Antlr4BuildTasks.net40.dll -->
<Antlr4BuildTaskPath>.</Antlr4BuildTaskPath>
<!-- Path to the ANTLR tool itself -->
<Antlr4ToolPath>..\tools\antlr4-csharp-4.2.2-SNAPSHOT-complete.jar</Antlr4ToolPath>

4
runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.targets → runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets
View File

@ -30,7 +30,7 @@
<BuildSystem>MSBuild</BuildSystem>
<TaskVersion>4.0.0.0</TaskVersion>
<TaskKeyToken>eb42632606e9261f</TaskKeyToken>
<Antlr4BuildTaskAssemblyName Condition="'$(Antlr4BuildTaskAssemblyName)'==''">Antlr4BuildTasks.v4.0, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken)</Antlr4BuildTaskAssemblyName>
<Antlr4BuildTaskAssemblyName Condition="'$(Antlr4BuildTaskAssemblyName)'==''">Antlr4BuildTasks.net40, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken)</Antlr4BuildTaskAssemblyName>
</PropertyGroup>
<PropertyGroup>
@ -59,7 +59,7 @@
</PropertyGroup>
<UsingTask Condition="'$(Antlr4BuildTaskPath)'==''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyName="$(Antlr4BuildTaskAssemblyName)" />
<UsingTask Condition="'$(Antlr4BuildTaskPath)'!=''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyFile="$(Antlr4BuildTaskPath)\Antlr4BuildTasks.v4.0.dll" />
<UsingTask Condition="'$(Antlr4BuildTaskPath)'!=''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyFile="$(Antlr4BuildTaskPath)\Antlr4BuildTasks.net40.dll" />
<PropertyGroup>
<PrepareResourcesDependsOn>

16
runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v3.5.csproj → runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net35.csproj
View File

@ -8,17 +8,17 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Build.Tasks</RootNamespace>
<AssemblyName>Antlr4BuildTasks.v3.5</AssemblyName>
<AssemblyName>Antlr4BuildTasks.net35</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\v3.5\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net35\</BaseIntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v3.5\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<OutputPath>bin\net35\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET35;NET35PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>ExtendedDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
@ -26,8 +26,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v3.5\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<OutputPath>bin\net35\Release\</OutputPath>
<DefineConstants>TRACE;NET35;NET35PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@ -56,10 +56,10 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Antlr4.v3.5.props">
<None Include="Antlr4.net35.props">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Antlr4.v3.5.targets">
<None Include="Antlr4.net35.targets">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>

16
runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v4.0.csproj → runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net40.csproj
View File

@ -8,17 +8,17 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Antlr4.Build.Tasks</RootNamespace>
<AssemblyName>Antlr4BuildTasks.v4.0</AssemblyName>
<AssemblyName>Antlr4BuildTasks.net40</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseIntermediateOutputPath>obj\v4.0\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>obj\net40\</BaseIntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\v4.0\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET_4_0</DefineConstants>
<OutputPath>bin\net40\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NET40;NET40PLUS;NET35PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>ExtendedDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
@ -26,8 +26,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\v4.0\Release\</OutputPath>
<DefineConstants>TRACE;NET_4_0</DefineConstants>
<OutputPath>bin\net40\Release\</OutputPath>
<DefineConstants>TRACE;NET40;NET40PLUS;NET35PLUS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@ -57,10 +57,10 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Antlr4.v4.0.props">
<None Include="Antlr4.net40.props">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Antlr4.v4.0.targets">
<None Include="Antlr4.net40.targets">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>

4
runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs
View File

@ -37,7 +37,7 @@ namespace Antlr4.Build.Tasks
using System.Text.RegularExpressions;
using RegistryHive = Microsoft.Win32.RegistryHive;
using RegistryKey = Microsoft.Win32.RegistryKey;
#if NET_4_0
#if NET40PLUS
using RegistryView = Microsoft.Win32.RegistryView;
#else
using Registry = Microsoft.Win32.Registry;
@ -156,7 +156,7 @@ namespace Antlr4.Build.Tasks
}
}
#if NET_4_0
#if NET40PLUS
private string JavaHome
{
get

12
runtime/CSharp/Antlr4BuildTasks/Properties/AssemblyInfo.cs
View File

@ -35,12 +35,14 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
#if NET_4_0
[assembly: AssemblyTitle("Antlr4BuildTasks.v4.0")]
[assembly: AssemblyProduct("Antlr4BuildTasks.v4.0")]
#if NET40
[assembly: AssemblyTitle("Antlr4BuildTasks.net40")]
[assembly: AssemblyProduct("Antlr4BuildTasks.net40")]
#elif NET35
[assembly: AssemblyTitle("Antlr4BuildTasks.net35")]
[assembly: AssemblyProduct("Antlr4BuildTasks.net35")]
#else
[assembly: AssemblyTitle("Antlr4BuildTasks.v3.5")]
[assembly: AssemblyProduct("Antlr4BuildTasks.v3.5")]
#error Unknown assembly.
#endif
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]