Prevent a exception if path contains incorrect characters like '<' & '>'.

Author: VladD2

Boot2/Nitra.Compiler/CompilingNitraProject.n

@@ -1,4 +1,4 @@
-using Nemerle;
+using Nemerle;
 using Nemerle.Collections;
 using Nemerle.Compiler;
 using Nemerle.Imperative;
@@ -82,16 +82,16 @@ namespace Nitra.Compiler
       mutable source;
       when (_loadedSources.TryGetValue(filePath, out source))
         return source;
-      
+
       def isExecutable = filePath.EndsWith(".dll",  StringComparison.OrdinalIgnoreCase) || filePath.EndsWith(".exe",  StringComparison.OrdinalIgnoreCase);
-      if (!isExecutable && IOFile.Exists(filePath))
+      if (!isExecutable && NitraUtils.IsFileExists(filePath))
       {
         def text = IOFile.ReadAllText(filePath, Encoding.UTF8);
         source = SourceSnapshot(text, filePath)
       }
       else
         source = SingleLineSourceSnapshot("", filePath);
-          
+
       _loadedSources[filePath] = source;
 
       source

Boot2/Nitra.Grammar/ProjectSystem/NemerleFile.n

@@ -1,4 +1,4 @@
-using Nemerle;
+using Nemerle;
 using Nemerle.Compiler;
 using Nemerle.Collections;
 using Nemerle.Text;
@@ -67,7 +67,7 @@ namespace Nitra.ProjectSystem
       base(project, index);
       def fullName     = FullName;
       def isExecutable = fullName.EndsWith(".dll",  StringComparison.OrdinalIgnoreCase) || fullName.EndsWith(".exe",  StringComparison.OrdinalIgnoreCase);
-      if (!isExecutable && File.Exists(fullName))
+      if (!isExecutable && NitraUtils.IsFileExists(fullName))
       {
         def text = File.ReadAllText(FullName, Encoding.UTF8);
         _source = SourceSnapshot(text, this, 0);

Boot2/Nitra.Grammar/Utils/Utils.n

@@ -79,7 +79,7 @@ namespace Nitra
       {
         def fullName = file.FullName;
         def isExecutable = fullName.EndsWith(".dll",  StringComparison.OrdinalIgnoreCase) || fullName.EndsWith(".exe",  StringComparison.OrdinalIgnoreCase);
-        if (!isExecutable && File.Exists(fullName))
+        if (!isExecutable && NitraUtils.IsFileExists(fullName))
           Compiler.Location(fullName, startLine, startCol, endLine, endCol)
         else
           Compiler.Location.Default

Boot2/Nitra.Runtime/NitraUtils.n

@@ -1,4 +1,4 @@
-using Nemerle;
+using Nemerle;
 using Nemerle.Collections;
 using Nemerle.Imperative;
 using Nemerle.Text;
@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 
 using SCG = System.Collections.Generic;
@@ -95,5 +96,18 @@ namespace Nitra
         | _ => BindResult.Multiple(res.ToImmutableArray())
       }
     }
+
+    public IsFileExists(path : string) : bool
+    {
+      when (FilePathHasInvalidChars(path))
+        return false;
+
+      File.Exists(path)
+    }
+
+    public FilePathHasInvalidChars(path : string) : bool
+    {
+      !string.IsNullOrEmpty(path) && path.IndexOfAny(System.IO.Path.GetInvalidPathChars()) >= 0
+    }
   } // module
 } // namespace

Boot2/Nitra.Runtime/ProjectSystem/FileBased/FsFile.n

@@ -23,7 +23,7 @@ namespace Nitra.ProjectSystem
     {
       base(statistics);
       Language = language;
-      assert3(IO.File.Exists(filePath));
+      assert3(NitraUtils.IsFileExists(filePath));
       FilePath = filePath;
       when (fsProject != null)
         fsProject.FsFiles.Add(this);

Boot2/Nitra.Runtime/Serialization/MetadataReader.n

@@ -221,7 +221,7 @@ namespace Nitra.Serialization
     {
       def isExecutable = filePath.EndsWith(".dll",  StringComparison.OrdinalIgnoreCase) || filePath.EndsWith(".exe",  StringComparison.OrdinalIgnoreCase);
       def source =
-        if (!isExecutable && File.Exists(filePath))
+        if (!isExecutable && NitraUtils.IsFileExists(filePath))
         {
           def text = File.ReadAllText(filePath, Encoding.UTF8);
           SourceSnapshot(text, filePath)

Nitra.LanguageCompiler/CommandPromptReader.n

@@ -128,7 +128,7 @@ namespace Nitra.LanguageCompiler
       {
         def asmRef = Path.GetFullPath(assemblyReference);
 
-        when (!File.Exists(asmRef))
+        when (!NitraUtils.IsFileExists(asmRef))
         {
           WriteLine($"Error: The '$asmRef' file does not exist.");
           usage();

Nitra.LanguageCompiler/Main.n

@@ -140,13 +140,13 @@ namespace Nitra.LanguageCompiler
         def path = Path.GetFullPath(path1);
         if (Directory.Exists(path))
           FileSystem.CopyDirectory(path, binPath, UIOption.OnlyErrorDialogs);
-        else if (File.Exists(path))
+        else if (NitraUtils.IsFileExists(path))
         {
           def fileName = Path.GetFileName(path);
           def outPath = Path.Combine(binPath, fileName);
           File.Copy(path, outPath, overwrite=true);
           def pdbPath = Path.ChangeExtension(path, ".pdb");
-          when (File.Exists(pdbPath))
+          when (NitraUtils.IsFileExists(pdbPath))
           {
             def pdbFileName = Path.GetFileName(pdbPath);
             def pdbOutPath = Path.Combine(binPath, pdbFileName);
@@ -217,7 +217,7 @@ namespace Nitra.LanguageCompiler
       def prjName           = config.ProjectName;
       def guidsPath         = Path.Combine(config.OutputPath, prjName, guidsFileName);
       def templateGuids     = ReadGuids(templateGuidsPath);
-      def guids             = if (config.NewGuids || !File.Exists(guidsPath)) Hashtable() else ReadGuids(guidsPath);
+      def guids             = if (config.NewGuids || !NitraUtils.IsFileExists(guidsPath)) Hashtable() else ReadGuids(guidsPath);
       mutable replaces = vars;
 
       foreach ((templateConstName, templateGuid) in templateGuids.KeyValuePairs)
@@ -308,7 +308,7 @@ namespace Nitra.LanguageCompiler
       ExpandTemplates(VsPackageTemplatePath,  Path.Combine(config.OutputPath, prjName), vars, config);
 
       def snkPath = Path.Combine(config.OutputPath, prjName, "Key.snk");
-      unless (File.Exists(snkPath))
+      unless (NitraUtils.IsFileExists(snkPath))
         CreateSnk(snkPath);
     }
 

Nitra.TestsConverter/Main.n

@@ -15,43 +15,43 @@ module Program
   {
     when (args.Length != 1)
       Prompt(1);
-    
+
     def path = args[0];
-    
+
     when (!Directory.Exists(path))
       Prompt(2);
 
     def configPath = Path.Combine(path, "config.xml");
-      
+
     when (!File.Exists(configPath))
       Prompt(3);
 
     def dirs = Directory.GetDirectories(path);
-    
+
     mutable totalConverted = 0;
-    
+
     foreach (dir in dirs)
     {
       def testName = Path.GetFileNameWithoutExtension(dir);
       def projectPath = Path.Combine(dir, testName);
-      
+
       when (Directory.Exists(projectPath))
       {
         Error($<#Can't create dirrectory for '$testName' test. The dirrectory '$projectPath' allredy exists.#>);
         continue;
       }
-      
+
       _ = Directory.CreateDirectory(projectPath);
-      
+
       def files = Enumerable.Concat(Directory.EnumerateFiles(dir, "*.test"), Directory.EnumerateFiles(dir, "*.gold"));
       foreach (file in files)
         File.Move(file, Path.Combine(projectPath, Path.GetFileName(file)));
-        
+
       totalConverted++;
     }
-      
+
     def files = Directory.GetFiles(path, "*.test");
-    
+
     foreach (file in files)
     {
       def testName = Path.GetFileNameWithoutExtension(file);
@@ -61,27 +61,27 @@ module Program
         Error($<#Can't create dirrectory for '$testName' test. The dirrectory '$solutionPath' allredy exists.#>);
         continue;
       }
-      
+
       _ = Directory.CreateDirectory(solutionPath);
       def projectPath = Path.Combine(solutionPath, testName);
       _ = Directory.CreateDirectory(projectPath);
-      
+
       def destTestFilePath = Path.Combine(projectPath, testName) + ".test";
       File.Move(file, destTestFilePath);
-      
+
       def destGoldFilePath = Path.Combine(projectPath, testName) + ".gold";
       def goldPath = Path.ChangeExtension(file, ".gold");
       when (File.Exists(goldPath))
         File.Move(goldPath, destGoldFilePath);
-        
+
       totalConverted++;
     }
 
     def totalTests = dirs.Length + files.Length;
     WriteLine($"Converted $totalConverted of $totalTests tests.");
     0;
   }
-  
+
   Prompt(errorNum : int = 0) : void
   {
     WriteLine(<#usings: TestsConverter.exe "path to test-suit folder"#>);

Nitra.TestsLauncher/Main.n

@@ -247,4 +247,4 @@ namespace Nitra.TestsLauncher
       suites.SelectMany(x => x.GetAllTests()).Select(x => x.Name.Length).Max() + 3
     }
   }
-}
+}