SharpDiff.Tests/Numstat/FileStatsTests.cs SharpDiff/FileStructure/Numstat/FileStats.cs SharpDiff/Parsers/GitDiffParser.cs SharpDiff/Parsers/GitDiffParser.ometacs SharpDiff/Parsers/GitNumstatParser.cs SharpDiff/Parsers/GitNumstatParser.ometacs @@ -8,7 +8,7 @@ namespace SharpDiff.Utils.RebuildParser { public void RebuildGitParser() { - var contents = File.ReadAllText(@"..\..\..\SharpDiff\Parser\GitDiffParser.ometacs"); + var contents = File.ReadAllText(@"..\..\..\SharpDiff\Parsers\GitDiffParser.ometacs"); var result = Grammars.ParseGrammarThenOptimizeThenTranslate <OMetaParser, OMetaOptimizer, OMetaTranslator> (contents, @@ -16,7 +16,20 @@ namespace SharpDiff.Utils.RebuildParser o => o.OptimizeGrammar, t => t.Trans); - File.WriteAllText(@"..\..\..\SharpDiff\Parser\GitDiffParser.cs", result); + File.WriteAllText(@"..\..\..\SharpDiff\Parsers\GitDiffParser.cs", result); + } + + public void RebuildGitNumstatParser() + { + var contents = File.ReadAllText(@"..\..\..\SharpDiff\Parsers\GitNumstatParser.ometacs"); + var result = Grammars.ParseGrammarThenOptimizeThenTranslate + <OMetaParser, OMetaOptimizer, OMetaTranslator> + (contents, + p => p.Grammar, + o => o.OptimizeGrammar, + t => t.Trans); + + File.WriteAllText(@"..\..\..\SharpDiff\Parsers\GitNumstatParser.cs", result); } } } \ No newline at end of file RebuildParser/OMetaCodeGenerator.cs @@ -6,7 +6,10 @@ namespace SharpDiff.Utils.RebuildParser { static void Main() { - new OMetaCodeGenerator().RebuildGitParser(); + var generator = new OMetaCodeGenerator(); + + generator.RebuildGitParser(); + generator.RebuildGitNumstatParser(); } } } \ No newline at end of file RebuildParser/Program.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using OMetaSharp; +using SharpDiff.Parsers; namespace SharpDiff.Tests { SharpDiff.Tests/AbstractParserTestFixture.cs @@ -68,6 +68,7 @@ <Compile Include="IndexExtendedHeaderTests.cs" /> <Compile Include="LineTests.cs" /> <Compile Include="DiffTests.cs" /> + <Compile Include="Numstat\FileStatsTests.cs" /> <Compile Include="PatchTests.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> SharpDiff.Tests/SharpDiff.Tests.csproj @@ -1,6 +1,7 @@ using System.Collections.Generic; using OMetaSharp; using SharpDiff.FileStructure; +using SharpDiff.Parsers; namespace SharpDiff.FileStructure { SharpDiff/FileStructure/Diff.cs @@ -68,17 +68,22 @@ <Compile Include="FileStructure\ILine.cs" /> <Compile Include="FileStructure\NoNewLineAtEOFLine.cs" /> <Compile Include="FileStructure\NullFile.cs" /> - <Compile Include="Parser\GitDiffParser.cs" /> + <Compile Include="FileStructure\Numstat\FileStats.cs" /> + <Compile Include="Parsers\GitDiffParser.cs" /> <Compile Include="FileStructure\HashRange.cs" /> <Compile Include="FileStructure\Header.cs" /> <Compile Include="FileStructure\IndexHeader.cs" /> <Compile Include="InvalidDiffFormatException.cs" /> + <Compile Include="Parsers\GitNumstatParser.cs" /> <Compile Include="Patch.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="FileStructure\SubtractionLine.cs" /> </ItemGroup> <ItemGroup> - <None Include="Parser\GitDiffParser.ometacs"> + <None Include="Parsers\GitNumstatParser.ometacs"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="Parsers\GitDiffParser.ometacs"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> </ItemGroup> SharpDiff/SharpDiff.csproj SharpDiff/Parser/GitDiffParser.cs SharpDiff/Parser/GitDiffParser.ometacs 583f2c11d7bce58e4d76a83e73ed247a337213d9 James Gregory james@jagregory.com http://github.com/jagregory/sharpdiff/commit/e96202f25a7393f5e3181d70d26de403790a4d2f e96202f25a7393f5e3181d70d26de403790a4d2f 2008-10-21T14:40:51-07:00 2008-10-21T14:38:57-07:00 Added beginnings of Numstat parsing c3d35c43a333f34b30ae5e7a5a145bdb0b6e220c James Gregory james@jagregory.com