Skip to content

Commit a99f7b8

Browse files
gsscodergsscoder
committed
Moving Helpers to Infrastructure; creating Parsing.
1 parent e8e3666 commit a99f7b8

39 files changed

Lines changed: 282 additions & 206 deletions

‎CommandLine.sln.DotSettings.user‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/libcmdline/Attributes/HelpOptionAttribute.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#region Using Directives
2525
using System;
2626
using System.Reflection;
27-
using CommandLine.Helpers;
27+
28+
using CommandLine.Infrastructure;
29+
2830
#endregion
2931

3032
namespace CommandLine

‎src/libcmdline/Attributes/HelpVerbOptionAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
using System;
2626
using System.Reflection;
2727
using CommandLine.Extensions;
28-
using CommandLine.Helpers;
28+
2929
using CommandLine.Infrastructure;
3030
#endregion
3131

‎src/libcmdline/Attributes/MultiLineTextAttribute.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
#region Using Directives
2525
using System;
2626
using System.Text;
27-
using CommandLine.Helpers;
27+
28+
using CommandLine.Infrastructure;
2829
using CommandLine.Text;
2930
#endregion
3031

‎src/libcmdline/Attributes/OptionAttribute.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#region Using Directives
2525
using System;
2626
using CommandLine.Infrastructure;
27+
using CommandLine.Parsing;
2728
#endregion
2829

2930
namespace CommandLine

‎src/libcmdline/Attributes/ValueListAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
using System;
2626
using System.Collections.Generic;
2727
using System.Reflection;
28-
using CommandLine.Helpers;
28+
2929
using CommandLine.Infrastructure;
3030
#endregion
3131

‎src/libcmdline/Attributes/VerbOptionAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#endregion
2424
#region Using Directives
2525
using System;
26-
using CommandLine.Helpers;
26+
2727
using CommandLine.Infrastructure;
2828
#endregion
2929

‎src/libcmdline/CommandLine.csproj‎

Lines changed: 139 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,146 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>CommandLine</RootNamespace>
12-
<AssemblyName>CommandLine</AssemblyName>
13-
<FileUpgradeFlags>
14-
</FileUpgradeFlags>
15-
<OldToolsVersion>3.5</OldToolsVersion>
16-
<UpgradeBackupLocation>
17-
</UpgradeBackupLocation>
18-
<IsWebBootstrapper>false</IsWebBootstrapper>
19-
<PublishUrl>publish\</PublishUrl>
20-
<Install>true</Install>
21-
<InstallFrom>Disk</InstallFrom>
22-
<UpdateEnabled>false</UpdateEnabled>
23-
<UpdateMode>Foreground</UpdateMode>
24-
<UpdateInterval>7</UpdateInterval>
25-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
26-
<UpdatePeriodically>false</UpdatePeriodically>
27-
<UpdateRequired>false</UpdateRequired>
28-
<MapFileExtensions>true</MapFileExtensions>
29-
<ApplicationRevision>0</ApplicationRevision>
30-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31-
<UseApplicationTrust>false</UseApplicationTrust>
32-
<BootstrapperEnabled>true</BootstrapperEnabled>
33-
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
35-
<DebugSymbols>true</DebugSymbols>
36-
<DebugType>full</DebugType>
37-
<Optimize>false</Optimize>
38-
<OutputPath>bin\Debug\</OutputPath>
39-
<DefineConstants>TRACE;DEBUG</DefineConstants>
40-
<ErrorReport>prompt</ErrorReport>
41-
<WarningLevel>4</WarningLevel>
42-
<DocumentationFile>bin\Debug\CommandLine.XML</DocumentationFile>
43-
</PropertyGroup>
44-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
45-
<DebugType>pdbonly</DebugType>
46-
<Optimize>true</Optimize>
47-
<OutputPath>bin\Release\</OutputPath>
48-
<DefineConstants>
49-
</DefineConstants>
50-
<ErrorReport>prompt</ErrorReport>
51-
<WarningLevel>4</WarningLevel>
52-
<DocumentationFile>bin\Release\CommandLine.XML</DocumentationFile>
53-
<GenerateDocumentation>true</GenerateDocumentation>
54-
</PropertyGroup>
55-
<PropertyGroup>
56-
<SignAssembly>true</SignAssembly>
57-
</PropertyGroup>
58-
<PropertyGroup>
59-
<AssemblyOriginatorKeyFile>CommandLine.snk</AssemblyOriginatorKeyFile>
60-
</PropertyGroup>
61-
<ItemGroup>
62-
<Reference Include="System" />
63-
</ItemGroup>
64-
<ItemGroup>
65-
<Compile Include="..\SharedAssemblyInfo.cs">
66-
<Link>Properties\SharedAssemblyInfo.cs</Link>
67-
</Compile>
68-
<Compile Include="Attributes\BaseOptionAttribute.cs" />
69-
<Compile Include="Attributes\OptionAttribute.cs" />
70-
<Compile Include="Attributes\OptionArrayAttribute.cs" />
71-
<Compile Include="Attributes\HelpOptionAttribute.cs" />
72-
<Compile Include="Attributes\OptionListAttribute.cs" />
73-
<Compile Include="Attributes\ParserStateAttribute.cs" />
74-
<Compile Include="Attributes\ValueListAttribute.cs" />
75-
<Compile Include="Attributes\ValueOptionAttribute.cs" />
76-
<Compile Include="Extensions\CharExtensions.cs" />
77-
<Compile Include="GlobalSuppressions.cs" />
78-
<Compile Include="Helpers\PopsicleSetter.cs" />
79-
<Compile Include="Infrastructure\PropertyWriter.cs" />
80-
<Compile Include="Infrastructure\SR.strings.cs">
81-
<AutoGen>True</AutoGen>
82-
<DesignTime>True</DesignTime>
83-
<DependentUpon>SR.tt</DependentUpon>
84-
</Compile>
85-
<Compile Include="Helpers\Assumes.cs" />
86-
<Compile Include="Helpers\ReflectionCache.cs" />
87-
<Compile Include="Extensions\StringExtensions.cs" />
88-
<Compile Include="Helpers\ReflectionUtil.cs" />
89-
<Compile Include="Helpers\Pair.cs" />
90-
<Compile Include="Infrastructure\ValueMapper.cs" />
91-
<Compile Include="Infrastructure\LongOptionParser.cs" />
92-
<Compile Include="Infrastructure\OptionGroupParser.cs" />
93-
<Compile Include="Infrastructure\OptionInfo.cs" />
94-
<Compile Include="Infrastructure\OptionMap.cs" />
95-
<Compile Include="Infrastructure\OneCharStringEnumerator.cs" />
96-
<Compile Include="Infrastructure\StringArrayEnumerator.cs" />
97-
<Compile Include="Infrastructure\ArgumentParser.cs" />
98-
<Compile Include="Infrastructure\IArgumentEnumerator.cs" />
99-
<Compile Include="Infrastructure\PresentParserState.cs" />
100-
<Compile Include="Properties\AssemblyInfo.cs" />
101-
<Compile Include="Text\HelpText.cs" />
102-
<Compile Include="Text\BaseSentenceBuilder.cs" />
103-
<Compile Include="Text\EnglishSentenceBuilder.cs" />
104-
<Compile Include="Text\CopyrightInfo.cs" />
105-
<Compile Include="Text\HeadingInfo.cs" />
106-
<Compile Include="Attributes\MultiLineTextAttribute.cs" />
107-
<Compile Include="Attributes\AssemblyLicenseAttribute.cs" />
108-
<Compile Include="Attributes\AssemblyUsageAttribute.cs" />
109-
<Compile Include="Text\FormatOptionHelpTextEventArgs.cs" />
110-
<Compile Include="Attributes\HelpVerbOptionAttribute.cs" />
111-
<Compile Include="Attributes\VerbOptionAttribute.cs" />
112-
<Compile Include="BadOptionInfo.cs" />
113-
<Compile Include="Parser.cs" />
114-
<Compile Include="ParserException.cs" />
115-
<Compile Include="ParserSettings.cs" />
116-
<Compile Include="IParserState.cs" />
117-
<Compile Include="ParserState.cs" />
118-
<Compile Include="ParsingError.cs" />
119-
<Compile Include="Extensions\ObjectExtensions.cs" />
120-
</ItemGroup>
121-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>9.0.30729</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{5DEA2811-2FFA-4959-830B-CAD3ACACABEB}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>CommandLine</RootNamespace>
12+
<AssemblyName>CommandLine</AssemblyName>
13+
<FileUpgradeFlags>
14+
</FileUpgradeFlags>
15+
<OldToolsVersion>3.5</OldToolsVersion>
16+
<UpgradeBackupLocation>
17+
</UpgradeBackupLocation>
18+
<IsWebBootstrapper>false</IsWebBootstrapper>
19+
<PublishUrl>publish\</PublishUrl>
20+
<Install>true</Install>
21+
<InstallFrom>Disk</InstallFrom>
22+
<UpdateEnabled>false</UpdateEnabled>
23+
<UpdateMode>Foreground</UpdateMode>
24+
<UpdateInterval>7</UpdateInterval>
25+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
26+
<UpdatePeriodically>false</UpdatePeriodically>
27+
<UpdateRequired>false</UpdateRequired>
28+
<MapFileExtensions>true</MapFileExtensions>
29+
<ApplicationRevision>0</ApplicationRevision>
30+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31+
<UseApplicationTrust>false</UseApplicationTrust>
32+
<BootstrapperEnabled>true</BootstrapperEnabled>
33+
</PropertyGroup>
34+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
35+
<DebugSymbols>true</DebugSymbols>
36+
<DebugType>full</DebugType>
37+
<Optimize>false</Optimize>
38+
<OutputPath>bin\Debug\</OutputPath>
39+
<DefineConstants>TRACE;DEBUG</DefineConstants>
40+
<ErrorReport>prompt</ErrorReport>
41+
<WarningLevel>4</WarningLevel>
42+
<DocumentationFile>bin\Debug\CommandLine.XML</DocumentationFile>
43+
</PropertyGroup>
44+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
45+
<DebugType>pdbonly</DebugType>
46+
<Optimize>true</Optimize>
47+
<OutputPath>bin\Release\</OutputPath>
48+
<DefineConstants>
49+
</DefineConstants>
50+
<ErrorReport>prompt</ErrorReport>
51+
<WarningLevel>4</WarningLevel>
52+
<DocumentationFile>bin\Release\CommandLine.XML</DocumentationFile>
53+
<GenerateDocumentation>true</GenerateDocumentation>
54+
</PropertyGroup>
55+
<PropertyGroup>
56+
<SignAssembly>true</SignAssembly>
57+
</PropertyGroup>
58+
<PropertyGroup>
59+
<AssemblyOriginatorKeyFile>CommandLine.snk</AssemblyOriginatorKeyFile>
60+
</PropertyGroup>
61+
<ItemGroup>
62+
<Reference Include="System" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<Compile Include="..\SharedAssemblyInfo.cs">
66+
<Link>Properties\SharedAssemblyInfo.cs</Link>
67+
</Compile>
68+
<Compile Include="Attributes\BaseOptionAttribute.cs" />
69+
<Compile Include="Attributes\OptionAttribute.cs" />
70+
<Compile Include="Attributes\OptionArrayAttribute.cs" />
71+
<Compile Include="Attributes\HelpOptionAttribute.cs" />
72+
<Compile Include="Attributes\OptionListAttribute.cs" />
73+
<Compile Include="Attributes\ParserStateAttribute.cs" />
74+
<Compile Include="Attributes\ValueListAttribute.cs" />
75+
<Compile Include="Attributes\ValueOptionAttribute.cs" />
76+
<Compile Include="Extensions\CharExtensions.cs" />
77+
<Compile Include="GlobalSuppressions.cs" />
78+
<Compile Include="Infrastructure\PopsicleSetter.cs" />
79+
<Compile Include="Parsing\PropertyWriter.cs" />
80+
<Compile Include="Infrastructure\SR.strings.cs">
81+
<AutoGen>True</AutoGen>
82+
<DesignTime>True</DesignTime>
83+
<DependentUpon>SR.tt</DependentUpon>
84+
</Compile>
85+
<Compile Include="Infrastructure\Assumes.cs" />
86+
<Compile Include="Infrastructure\ReflectionCache.cs" />
87+
<Compile Include="Extensions\StringExtensions.cs" />
88+
<Compile Include="Infrastructure\ReflectionUtil.cs" />
89+
<Compile Include="Infrastructure\Pair.cs" />
90+
<Compile Include="Parsing\ValueMapper.cs" />
91+
<Compile Include="Parsing\LongOptionParser.cs" />
92+
<Compile Include="Parsing\OptionGroupParser.cs" />
93+
<Compile Include="Parsing\OptionInfo.cs" />
94+
<Compile Include="Parsing\OptionMap.cs" />
95+
<Compile Include="Parsing\OneCharStringEnumerator.cs" />
96+
<Compile Include="Parsing\StringArrayEnumerator.cs" />
97+
<Compile Include="Parsing\ArgumentParser.cs" />
98+
<Compile Include="Parsing\IArgumentEnumerator.cs" />
99+
<Compile Include="Parsing\PresentParserState.cs" />
100+
<Compile Include="Properties\AssemblyInfo.cs" />
101+
<Compile Include="Text\HelpText.cs" />
102+
<Compile Include="Text\BaseSentenceBuilder.cs" />
103+
<Compile Include="Text\EnglishSentenceBuilder.cs" />
104+
<Compile Include="Text\CopyrightInfo.cs" />
105+
<Compile Include="Text\HeadingInfo.cs" />
106+
<Compile Include="Attributes\MultiLineTextAttribute.cs" />
107+
<Compile Include="Attributes\AssemblyLicenseAttribute.cs" />
108+
<Compile Include="Attributes\AssemblyUsageAttribute.cs" />
109+
<Compile Include="Text\FormatOptionHelpTextEventArgs.cs" />
110+
<Compile Include="Attributes\HelpVerbOptionAttribute.cs" />
111+
<Compile Include="Attributes\VerbOptionAttribute.cs" />
112+
<Compile Include="BadOptionInfo.cs" />
113+
<Compile Include="Parser.cs" />
114+
<Compile Include="ParserException.cs" />
115+
<Compile Include="ParserSettings.cs" />
116+
<Compile Include="IParserState.cs" />
117+
<Compile Include="ParserState.cs" />
118+
<Compile Include="ParsingError.cs" />
119+
<Compile Include="Extensions\ObjectExtensions.cs" />
120+
</ItemGroup>
121+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
122122
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
123123
Other similar extension points exist, see Microsoft.Common.targets.
124124
<Target Name="BeforeBuild">
125125
</Target>
126126
<Target Name="AfterBuild">
127127
</Target>
128-
-->
129-
<ItemGroup>
130-
<None Include="CommandLine.snk" />
131-
<None Include="Infrastructure\SR.tt">
132-
<Generator>TextTemplatingFileGenerator</Generator>
133-
<LastGenOutput>SR.strings.cs</LastGenOutput>
134-
</None>
135-
</ItemGroup>
136-
<ItemGroup>
137-
<CodeAnalysisDictionary Include="CustomDictionary.xml" />
138-
</ItemGroup>
139-
<ItemGroup>
140-
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
141-
</ItemGroup>
142-
<PropertyGroup>
143-
<PreBuildEvent>
144-
</PreBuildEvent>
145-
</PropertyGroup>
128+
-->
129+
<ItemGroup>
130+
<None Include="CommandLine.snk" />
131+
<None Include="Infrastructure\SR.tt">
132+
<Generator>TextTemplatingFileGenerator</Generator>
133+
<LastGenOutput>SR.strings.cs</LastGenOutput>
134+
</None>
135+
</ItemGroup>
136+
<ItemGroup>
137+
<CodeAnalysisDictionary Include="CustomDictionary.xml" />
138+
</ItemGroup>
139+
<ItemGroup>
140+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
141+
</ItemGroup>
142+
<PropertyGroup>
143+
<PreBuildEvent>
144+
</PreBuildEvent>
145+
</PropertyGroup>
146146
</Project>

‎src/libcmdline/Extensions/CharExtensions.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
// THE SOFTWARE.
2323
#endregion
24-
#region Using Directives
25-
using System;
26-
using System.Globalization;
27-
#endregion
2824

2925
namespace CommandLine.Extensions
3026
{

‎src/libcmdline/Extensions/ObjectExtensions.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222
// THE SOFTWARE.
2323
#endregion
2424
#region Using Directives
25-
using CommandLine.Helpers;
25+
2626
#endregion
2727

28+
using CommandLine.Infrastructure;
29+
2830
namespace CommandLine.Extensions
2931
{
3032
/// <summary>

0 commit comments

Comments
 (0)