Author: brett Date: Wed Jun 15 07:03:03 2011 New Revision: 1135939 URL: http://svn.apache.org/viewvc?rev=1135939&view=rev Log: [NPANDAY-441] improve error handling related to solution parsing errors
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/LexicalAnalizer.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/LexicalAnalizer.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/LexicalAnalizer.cs?rev=1135939&r1=1135938&r2=1135939&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/LexicalAnalizer.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/LexicalAnalizer.cs Wed Jun 15 07:03:03 2011 @@ -1052,7 +1052,7 @@ namespace NPanday.ProjectImporter.Parser { if (expected != expect) { - throw new Exception(string.Format("Expecting {0} but it is {1}!", expected, expect)); + throw new Exception(string.Format("Expecting token {0} but it is {1} with surrounding tokens '{2}' and '{3}'", expected, expect, Previous.Value, Next.Value)); } } Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs?rev=1135939&r1=1135938&r2=1135939&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Parser/SlnParser/ProjectSolutionParser.cs Wed Jun 15 07:03:03 2011 @@ -52,9 +52,17 @@ namespace NPanday.ProjectImporter.Parser public List<Dictionary<string, object>> Parse(FileInfo solutionFile, ref string warningMsg) { + NPanday.ProjectImporter.Parser.SlnParser.Model.Solution solution; List<Dictionary<string, object>> list = new List<Dictionary<string, object>>(); - NPanday.ProjectImporter.Parser.SlnParser.Model.Solution solution = SolutionFactory.GetSolution(solutionFile); + try + { + solution = SolutionFactory.GetSolution(solutionFile); + } + catch (Exception exception) + { + throw new Exception("Unknown error occurred parsing solution file: " + solutionFile + " (embedded error is: " + exception.Message + ")"); + } String UnsupportedProjectsMessage = string.Empty;