Various bugfixes.

uxmal · Jul 23, 2015 · 31bbc4f · 31bbc4f
1 parent 1d4e507
commit 31bbc4f
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 15 deletions.
diff --git a/src/DirectoryWalker.cs b/src/DirectoryWalker.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Pytocs.TypeInference;
 
 namespace Pytocs
 {
@@ -70,7 +71,10 @@ public void ProcessDirectoryFiles(EnumerationState state)
         {
             foreach (var file in Directory.GetFiles(state.DirectoryName, "*.py", SearchOption.TopDirectoryOnly))
             {
-                var xlator = new Translator(state.Namespace, Path.GetFileNameWithoutExtension(file));
+                var xlator = new Translator(
+                    state.Namespace, 
+                    Path.GetFileNameWithoutExtension(file),
+                    new ConsoleLogger());
                 xlator.TranslateFile(file, file + ".cs");
             }
         }

diff --git a/src/Program.cs b/src/Program.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Pytocs.TypeInference;
 
 namespace Pytocs
 {
@@ -14,7 +15,8 @@ static void Main(string[] args)
         {
             if (args.Length == 0)
             {
-                var xlator = new Translator("", "module_name");
+                var xlator = new Translator("", "module_name", 
+                    new ConsoleLogger());
                 xlator.Translate("-", Console.In, Console.Out);
                 Console.Out.Flush();
                 return;
@@ -29,15 +31,17 @@ static void Main(string[] args)
             if (args[0].ToLower() == "-r")
             {
                 var walker = new DirectoryWalker("*.py");
-                var symtab = new SymbolTable(); 
                 walker.Enumerate();
             }
             else
             {
-                var symtab = new SymbolTable(); 
                 foreach (var fileName in args)
                 {
-                    //ProcessFile(fileName, symtab);
+                    var xlator = new Translator(
+                        "", 
+                        Path.GetFileNameWithoutExtension(fileName),
+                        new ConsoleLogger());
+                    xlator.TranslateFile(fileName, fileName + ".cs");
                 }
             }
         }

diff --git a/src/Translator.cs b/src/Translator.cs
@@ -8,18 +8,21 @@
 using System.Text;
 using System.IO;
 using System.Threading.Tasks;
+using Pytocs.TypeInference;
 
 namespace Pytocs
 {
     public class Translator
     {
         private string nmspace;
         private string moduleName;
+        private ILogger logger;
 
-        public Translator(string nmspace, string moduleName)
+        public Translator(string nmspace, string moduleName, ILogger logger)
         {
             this.nmspace = nmspace;
             this.moduleName = moduleName;
+            this.logger = logger;
         }
 
         public void Translate(string filename, TextReader input, TextWriter output)
@@ -42,14 +45,27 @@ public void TranslateFile(string inputFileName, string outputFileName)
             TextWriter writer = null;
             try
             {
-                reader = new StreamReader(inputFileName);
-                writer = new StreamWriter(new FileStream(outputFileName, FileMode.Create, FileAccess.Write), new UTF8Encoding(false));
+                try
+                {
+                    reader = new StreamReader(inputFileName);
+                }
+                catch (IOException ex)
+                {
+                    logger.Error(ex, "Unable to open file {0} for reading.", inputFileName);
+                    return;
+                }
+                try 
+                {
+                    writer = new StreamWriter(new FileStream(outputFileName, FileMode.Create, FileAccess.Write), new UTF8Encoding(false));
+                }
+                catch (IOException ex)
+                {
+                    logger.Error(ex, "Unable to open file {0} for writing.", outputFileName);
+                    return;
+                }
                 Translate(inputFileName, reader, writer);
             }
-            catch (Exception)
-            {
-                // Diagnostic.
-            }
+
             finally
             {
                 if (writer != null) writer.Dispose();

diff --git a/src/TypeInference/ILogger.cs b/src/TypeInference/ILogger.cs
@@ -11,11 +11,44 @@ public interface ILogger
     {
         TraceLevel Level { get; set; }
 
-        void Error(Exception ex, string p);
+        void Error(Exception ex, string format, params object [] args);
+        void Error(string format, params object [] args);
         void Inform(string p);
         void Verbose(string p);
     }
 
+    public class ConsoleLogger : ILogger{
+
+        public void Error(Exception ex, string format, params object[] args)
+        {
+            Console.Error.Write("Error: ");
+            Console.Error.WriteLine(format, args);
+            while (ex != null)
+            {
+                Console.Error.WriteLine(" {0}", ex.Message);
+                ex = ex.InnerException;
+            }
+        }
+
+        public void Error(string format, params object[] args)
+        {
+            Console.Error.Write("Error: ");
+            Console.Error.WriteLine(format, args);
+        }
+
+        public void Inform(string p)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Verbose(string p)
+        {
+            throw new NotImplementedException();
+        }
+
+        public TraceLevel Level { get; set; }
+    }
+
     public class Logger : ILogger
     {
         private string title;
@@ -27,10 +60,15 @@ public Logger(string title)
 
         public TraceLevel Level { get; set; }
 
-        public void Error(Exception ex, string msg)
+        public void Error(string format, params object[] args)
+        {
+            Write(EventLogEntryType.Error, string.Format(format, args));
+        }
+
+        public void Error(Exception ex, string format, params object[] args)
         {
             var sb = new StringBuilder();
-            sb.AppendLine(msg);
+            sb.AppendFormat(format, args);
             while (ex != null)
             {
                 sb.Append(" ");

diff --git a/src/pytocs.csproj b/src/pytocs.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Commandlineparameters>foo.py</Commandlineparameters>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>