Move files to match new namespace structure.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1610 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
19 years ago · f27917180e
42 changed files with 69 additions and 56 deletions
--- a/src/Libraries/NRefactory/NRefactory.sln
+++ b/src/Libraries/NRefactory/NRefactory.sln
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.1073
+# SharpDevelop 2.1.0.1602
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
--- a/src/Libraries/NRefactory/NRefactoryASTGenerator/Main.cs
+++ b/src/Libraries/NRefactory/NRefactoryASTGenerator/Main.cs
@ -21,8 +21,8 @@ namespace NRefactoryASTGenerator
				@@ -21,8 +21,8 @@ namespace NRefactoryASTGenerator
 		
 		public static void Main(string[] args)
 		{
-			string directory = "../../../Project/Src/Parser/AST/";
-			string visitorsDir = "../../../Project/Src/Parser/Visitors/";
+			string directory = "../../../Project/Src/Ast/";
+			string visitorsDir = "../../../Project/Src/Visitors/";
 			Debug.WriteLine("AST Generator running...");
 			if (!File.Exists(directory + "INode.cs")) {
 				Debug.WriteLine("did not find output directory");
--- a/src/Libraries/NRefactory/Project/NRefactory.csproj
+++ b/src/Libraries/NRefactory/Project/NRefactory.csproj
@ -53,13 +53,6 @@
				@@ -53,13 +53,6 @@
  <ItemGroup>
    <None Include="Resources\ICSharpCode.NRefactory.snk" />
    <None Include="Src\Lexer\BuildKeywords.pl" />
-    <None Include="Src\Parser\CSharp\cs.ATG" />
-    <None Include="Src\Parser\Frames\Parser.frame" />
-    <None Include="Src\Parser\Frames\Parser.frame.new" />
-    <None Include="Src\Parser\Frames\Parser.frame.old" />
-    <None Include="Src\Parser\Frames\Scanner.frame" />
-    <None Include="Src\Parser\gen.bat" />
-    <None Include="Src\Parser\VBNet\VBNET.ATG" />
    <Compile Include="Configuration\AssemblyInfo.cs" />
    <Compile Include="Src\Lexer\AbstractLexer.cs" />
    <Compile Include="Src\Lexer\CSharp\Keywords.cs" />
@ -77,66 +70,86 @@
				@@ -77,66 +70,86 @@
    <Compile Include="Src\Lexer\VBNet\Keywords.cs" />
    <Compile Include="Src\Lexer\VBNet\Lexer.cs" />
    <Compile Include="Src\Lexer\VBNet\Tokens.cs" />
-    <Compile Include="Src\Output\AbstractOutputFormatter.cs" />
-    <Compile Include="Src\Output\AbstractPrettyPrintOptions.cs" />
-    <Compile Include="Src\Output\CodeDOM\CodeDOMOutputVisitor.cs" />
-    <Compile Include="Src\Output\CSharp\CSharpOutputVisitor.cs" />
-    <Compile Include="Src\Output\CSharp\OutputFormatter.cs" />
-    <Compile Include="Src\Output\CSharp\PrettyPrintOptions.cs" />
-    <Compile Include="Src\Output\IOutputASTVisitor.cs" />
-    <Compile Include="Src\Output\NodeInformVisitor.cs" />
-    <Compile Include="Src\Output\VBNet\VBNetOutputFormatter.cs" />
-    <Compile Include="Src\Output\VBNet\VBNetOutputVisitor.cs" />
-    <Compile Include="Src\Output\VBNet\VBNetPrettyPrintOptions.cs" />
-    <Compile Include="Src\Parser\AbstractParser.cs" />
-    <Compile Include="Src\Parser\AST\AbstractNode.cs" />
-    <Compile Include="Src\Parser\AST\INode.cs" />
-    <Compile Include="Src\Parser\CSharp\Parser.cs" />
-    <Compile Include="Src\Parser\Errors.cs" />
-    <Compile Include="Src\Parser\IParser.cs" />
-    <Compile Include="Src\Parser\Modifiers.cs" />
-    <Compile Include="Src\Parser\ParserFactory.cs" />
-    <Compile Include="Src\Parser\VBNet\ParamModifier.cs" />
-    <Compile Include="Src\Parser\VBNet\Parser.cs" />
-    <Compile Include="Src\Parser\Visitors\AbstractASTVisitor.cs" />
-    <Compile Include="Src\Parser\Visitors\IASTVisitor.cs" />
-    <Compile Include="Src\Parser\Visitors\LookupTableVisitor.cs" />
    <Compile Include="Src\Lexer\Special\ISpecial.cs" />
-    <Compile Include="Src\Output\SpecialNodesInserter.cs" />
-    <Compile Include="Src\Parser\Visitors\CSharpToVBNetConvertVisitor.cs" />
-    <Compile Include="Src\Parser\Visitors\PrefixFieldsVisitor.cs" />
-    <Compile Include="Src\Parser\Visitors\VBNetToCSharpConvertVisitor.cs" />
-    <Compile Include="Src\Output\CodeDOM\CodeDOMVerboseOutputGenerator.cs" />
-    <Compile Include="Src\Parser\Visitors\VBNetConstructsConvertVisitor.cs" />
-    <Compile Include="Src\Parser\Visitors\CSharpConstructsVisitor.cs" />
-    <Compile Include="Src\Parser\Visitors\ToCSharpConvertVisitor.cs" />
-    <Compile Include="Src\Parser\Visitors\ToVBNetConvertVisitor.cs" />
-    <Compile Include="Src\Output\EnvironmentInformationProvider.cs" />
-    <Compile Include="Src\Parser\AST\Generated.cs" />
-    <Compile Include="Src\Parser\AST\Enums.cs" />
-    <Compile Include="Src\Parser\AST\INullable.cs" />
-    <Compile Include="Src\Parser\AST\TypeReference.cs" />
-    <Compile Include="Src\Parser\AST\General\CompilationUnit.cs" />
-    <Compile Include="Src\Parser\AST\General\Statement.cs" />
-    <Compile Include="Src\Parser\AST\General\Expression.cs" />
-    <Compile Include="Src\Parser\AST\General\BlockStatement.cs" />
-    <Compile Include="Src\Parser\AST\General\LocalVariableDeclaration.cs" />
-    <Compile Include="Src\Parser\AST\General\PrimitiveExpression.cs" />
-    <Compile Include="Src\Parser\Visitors\AbstractAstTransformer.cs" />
    <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="Src\Parser\Location.cs" />
    <Compile Include="Src\Parser\CSharp\CSharpParser.cs" />
+    <Compile Include="Src\Parser\CSharp\Parser.cs" />
+    <Compile Include="Src\Parser\VBNet\ParamModifier.cs" />
+    <Compile Include="Src\Parser\VBNet\Parser.cs" />
    <Compile Include="Src\Parser\VBNet\VBNetParser.cs" />
+    <Compile Include="Src\Parser\AbstractParser.cs" />
+    <Compile Include="Src\Parser\Errors.cs" />
+    <Compile Include="Src\Parser\IParser.cs" />
+    <Compile Include="Src\Parser\Modifiers.cs" />
+    <Compile Include="Src\PrettyPrinter\CSharp\CSharpOutputVisitor.cs" />
+    <Compile Include="Src\PrettyPrinter\CSharp\OutputFormatter.cs" />
+    <Compile Include="Src\PrettyPrinter\CSharp\PrettyPrintOptions.cs" />
+    <Compile Include="Src\PrettyPrinter\VBNet\VBNetOutputFormatter.cs" />
+    <Compile Include="Src\PrettyPrinter\VBNet\VBNetOutputVisitor.cs" />
+    <Compile Include="Src\PrettyPrinter\VBNet\VBNetPrettyPrintOptions.cs" />
+    <Compile Include="Src\PrettyPrinter\AbstractOutputFormatter.cs" />
+    <Compile Include="Src\PrettyPrinter\AbstractPrettyPrintOptions.cs" />
+    <Compile Include="Src\PrettyPrinter\IOutputAstVisitor.cs" />
+    <Compile Include="Src\PrettyPrinter\NodeInformVisitor.cs" />
+    <Compile Include="Src\PrettyPrinter\SpecialNodesInserter.cs" />
+    <Compile Include="Src\Visitors\AbstractAstTransformer.cs" />
+    <Compile Include="Src\Visitors\AbstractASTVisitor.cs" />
+    <Compile Include="Src\Visitors\CodeDOMOutputVisitor.cs" />
+    <Compile Include="Src\Visitors\CodeDOMVerboseOutputGenerator.cs" />
+    <Compile Include="Src\Visitors\CSharpConstructsVisitor.cs" />
+    <Compile Include="Src\Visitors\CSharpToVBNetConvertVisitor.cs" />
+    <Compile Include="Src\Visitors\LookupTableVisitor.cs" />
+    <Compile Include="Src\Visitors\PrefixFieldsVisitor.cs" />
+    <Compile Include="Src\Visitors\ToCSharpConvertVisitor.cs" />
+    <Compile Include="Src\Visitors\ToVBNetConvertVisitor.cs" />
+    <Compile Include="Src\Visitors\VBNetConstructsConvertVisitor.cs" />
+    <Compile Include="Src\Visitors\VBNetToCSharpConvertVisitor.cs" />
+    <Compile Include="Src\EnvironmentInformationProvider.cs" />
+    <Compile Include="Src\IAstVisitor.cs" />
+    <Compile Include="Src\ParserFactory.cs" />
+    <Compile Include="Src\Location.cs" />
+    <Compile Include="Src\Ast\General\BlockStatement.cs" />
+    <Compile Include="Src\Ast\General\CompilationUnit.cs" />
+    <Compile Include="Src\Ast\General\Expression.cs" />
+    <Compile Include="Src\Ast\General\LocalVariableDeclaration.cs" />
+    <Compile Include="Src\Ast\General\PrimitiveExpression.cs" />
+    <Compile Include="Src\Ast\General\Statement.cs" />
+    <Compile Include="Src\Ast\AbstractNode.cs" />
+    <Compile Include="Src\Ast\Enums.cs" />
+    <Compile Include="Src\Ast\Generated.cs" />
+    <Compile Include="Src\Ast\INode.cs" />
+    <Compile Include="Src\Ast\INullable.cs" />
+    <Compile Include="Src\Ast\TypeReference.cs" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="Src\Lexer\CSharp\KeywordList.txt" />
    <Content Include="Src\Lexer\VBNet\KeywordList.txt" />
+    <Folder Include="Src\Parser" />
+    <Folder Include="Src\Parser\AST" />
+    <Folder Include="Src\Parser\AST\General" />
+    <Folder Include="Src\Parser\CSharp" />
+    <Content Include="Src\Parser\CSharp\cs.ATG" />
    <Content Include="Src\Parser\CSharp\trace.txt" />
+    <Folder Include="Src\Parser\Frames" />
    <Content Include="Src\Parser\Frames\OldSharpCoco.exe" />
+    <Content Include="Src\Parser\Frames\Parser.frame" />
+    <Content Include="Src\Parser\Frames\Parser.frame.new" />
+    <Content Include="Src\Parser\Frames\Parser.frame.old" />
+    <Content Include="Src\Parser\Frames\Scanner.frame" />
    <Content Include="Src\Parser\Frames\SharpCoco.exe" />
    <Content Include="Src\Parser\Frames\trace.txt" />
+    <Folder Include="Src\Parser\VBNet" />
+    <Content Include="Src\Parser\VBNet\VBNET.ATG" />
+    <Folder Include="Src\Parser\Visitors" />
+    <Content Include="Src\Parser\gen.bat" />
+    <Folder Include="Src\PrettyPrinter" />
+    <Folder Include="Src\PrettyPrinter\CSharp" />
+    <Folder Include="Src\PrettyPrinter\VBNet" />
+    <Folder Include="Src\Visitors" />
+    <Folder Include="Src\Ast" />
+    <Folder Include="Src\Ast\General" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/AbstractNode.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/AbstractNode.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/Enums.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/Enums.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/BlockStatement.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/BlockStatement.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/CompilationUnit.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/CompilationUnit.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Expression.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Expression.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/LocalVariableDeclaration.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/LocalVariableDeclaration.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/PrimitiveExpression.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/PrimitiveExpression.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Statement.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Statement.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/Generated.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/Generated.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/INode.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/INode.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/INullable.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/INullable.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/AST/TypeReference.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/TypeReference.cs
--- a/src/Libraries/NRefactory/Project/Src/Output/EnvironmentInformationProvider.cs
+++ b/src/Libraries/NRefactory/Project/Src/Output/EnvironmentInformationProvider.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/IASTVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/IASTVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Location.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Location.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/ParserFactory.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/ParserFactory.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/AbstractOutputFormatter.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/AbstractOutputFormatter.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/AbstractPrettyPrintOptions.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/AbstractPrettyPrintOptions.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/OutputFormatter.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/OutputFormatter.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/PrettyPrintOptions.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/PrettyPrintOptions.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/IOutputAstVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/IOutputAstVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/NodeInformVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/NodeInformVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/SpecialNodesInserter.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/SpecialNodesInserter.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetOutputFormatter.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetOutputFormatter.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetOutputVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetOutputVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetPrettyPrintOptions.cs
+++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetPrettyPrintOptions.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractAstTransformer.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractAstTransformer.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpConstructsVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpConstructsVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpToVBNetConvertVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpToVBNetConvertVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMVerboseOutputGenerator.cs
+++ b/src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMVerboseOutputGenerator.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/LookupTableVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/LookupTableVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/PrefixFieldsVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/PrefixFieldsVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/ToCSharpConvertVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/ToCSharpConvertVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/ToVBNetConvertVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/ToVBNetConvertVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetConstructsConvertVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetConstructsConvertVisitor.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetToCSharpConvertVisitor.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/VBNetToCSharpConvertVisitor.cs