Better error handling for compiling packages; set file name for prepr…

…ocessor
Nenkai · Apr 6, 2023 · bb6d626 · bb6d626
1 parent 89f8f20
commit bb6d626
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 50 deletions.
diff --git a/GTAdhocToolchain.Preprocessor/AdhocScriptPreprocessor.cs b/GTAdhocToolchain.Preprocessor/AdhocScriptPreprocessor.cs
@@ -87,6 +87,7 @@ public void SetBaseDirectory(string baseDirectory)
         public void SetCurrentFileName(string fileName)
         {
             _currentFileName = fileName;
+            _scanner?.SetFileName(fileName);
         }
 
         public void SetCurrentFileTimestamp(DateTime timestamp)
@@ -363,7 +364,7 @@ private void DoInclude()
             var oldFileName = _currentFileName;
             var oldTimestamp = _fileTimeStamp;
 
-            _currentFileName = file;
+            SetCurrentFileName(file);
             _fileTimeStamp = new FileInfo(pathToInclude).LastWriteTime;
 
             _writer.WriteLine($"# 1 \"{file}\"");
@@ -377,7 +378,7 @@ private void DoInclude()
             // Restore state
             _lookahead = oldToken;
             _scanner = oldScanner;
-            _currentFileName = oldFileName;
+            SetCurrentFileName(oldFileName);
             _fileTimeStamp = oldTimestamp;
 
             _writer.WriteLine($"# {_lookahead.Location.Start.Line} \"{_currentFileName}\"");

diff --git a/GTAdhocToolchain.Project/AdhocProject.cs b/GTAdhocToolchain.Project/AdhocProject.cs
@@ -237,13 +237,14 @@ private void BuildPackageFile()
             Directory.CreateDirectory(pkgContentPath);
 
             int logPadLen = FilesToCompile.Length.ToString().Length;
-            for (int i = 0; i < FilesToCompile.Length; i++)
+            try
             {
-                AdhocProjectFile srcFile = FilesToCompile[i];
-                Logger.Info($"[{(i + 1).ToString().PadLeft(logPadLen)}/{FilesToCompile.Length}] Compiling: {srcFile.Name}");
-
-                try
+                for (int i = 0; i < FilesToCompile.Length; i++)
                 {
+                    AdhocProjectFile srcFile = FilesToCompile[i];
+                    Logger.Info($"[{(i + 1).ToString().PadLeft(logPadLen)}/{FilesToCompile.Length}] Compiling: {srcFile.Name}");
+
+
                     string source = File.ReadAllText(srcFile.FullPath);
                     var time = new FileInfo(srcFile.FullPath).LastWriteTime;
 
@@ -267,58 +268,58 @@ private void BuildPackageFile()
                     AdhocCodeGen codeGen = new AdhocCodeGen(compiler, compiler.SymbolMap);
                     codeGen.Generate();
                     codeGen.SaveTo(Path.Combine(pkgContentPath, Path.ChangeExtension(srcFile.Name, ".adc")));
-                }
-                catch (PreprocessorException preprocessException)
-                {
-                    Logger.Error($"{preprocessException.FileName}:{preprocessException.Token.Location.Start.Line}: preprocess error: {preprocessException.Message}");
-                }
-                catch (ParserException parseException)
-                {
-                    Logger.Error($"Syntax error: {parseException.Description} at {parseException.SourceText}:{parseException.LineNumber}");
-                }
-                catch (AdhocCompilationException compileException)
-                {
-                    Logger.Error($"Compilation error: {compileException.Message}");
-                }
-                catch (Exception e)
-                {
-                    Logger.Fatal(e, "Internal error in compilation");
-                }
 
-                if (!srcFile.IsMain)
-                {
-                    string componentName = Path.ChangeExtension(srcFile.FullPath, ".mwidget");
-                    if (File.Exists(componentName))
+                    if (!srcFile.IsMain)
                     {
-                        Logger.Info($"Adding linked component '{Path.GetFileName(componentName)}'");
+                        string componentName = Path.ChangeExtension(srcFile.FullPath, ".mwidget");
+                        if (File.Exists(componentName))
+                        {
+                            Logger.Info($"Adding linked component '{Path.GetFileName(componentName)}'");
 
-                        string outTmpComponentFile = Path.Combine(pkgContentPath, Path.GetFileName(componentName));
-                        File.Copy(componentName, outTmpComponentFile);
+                            string outTmpComponentFile = Path.Combine(pkgContentPath, Path.GetFileName(componentName));
+                            File.Copy(componentName, outTmpComponentFile);
 
-                        if (SerializeComponents)
-                        {
-                            Logger.Info($"Serializing '{Path.GetFileName(componentName)}' to binary");
-                            MTextIO io = new MTextIO(componentName);
-                            var root = io.Read();
+                            if (SerializeComponents)
+                            {
+                                Logger.Info($"Serializing '{Path.GetFileName(componentName)}' to binary");
+                                MTextIO io = new MTextIO(componentName);
+                                var root = io.Read();
 
-                            MBinaryWriter writer = new MBinaryWriter(outTmpComponentFile);
-                            writer.Version = SerializeComponentsVersion;
-                            writer.WriteNode(root);
+                                MBinaryWriter writer = new MBinaryWriter(outTmpComponentFile);
+                                writer.Version = SerializeComponentsVersion;
+                                writer.WriteNode(root);
+                            }
+                        }
+                        else
+                        {
+                            Logger.Warn($"File '{srcFile.Name}' does not have a linked UI definition file '{Path.GetFileName(componentName)}' (this warning can be ignored if this is not a root)");
                         }
-                    }
-                    else
-                    {
-                        Logger.Warn($"File '{srcFile.Name}' does not have a linked UI definition file '{Path.GetFileName(componentName)}' (this warning can be ignored if this is not a root)");
                     }
                 }
-            }
 
-            // Create package mproject with external references
-            CreatePackageMProject(pkgContentPath);
+                // Create package mproject with external references
+                CreatePackageMProject(pkgContentPath);
 
-            Logger.Info($"Packaging...");
-            AdhocPackage.PackFromFolder(pkgPath, Path.Combine(ProjectDir, pkgName));
-            Logger.Info($"Packaging successful -> {pkgName}");
+                Logger.Info($"Packaging...");
+                AdhocPackage.PackFromFolder(pkgPath, Path.Combine(ProjectDir, pkgName));
+                Logger.Info($"Packaging successful -> {pkgName}");
+            }
+            catch (PreprocessorException preprocessException)
+            {
+                Logger.Error($"{preprocessException.FileName}:{preprocessException.Token.Location.Start.Line}: preprocess error: {preprocessException.Message}");
+            }
+            catch (ParserException parseException)
+            {
+                Logger.Error($"Syntax error: {parseException.Description} at {parseException.SourceText}:{parseException.LineNumber}");
+            }
+            catch (AdhocCompilationException compileException)
+            {
+                Logger.Error($"Compilation error: {compileException.Message}");
+            }
+            catch (Exception e)
+            {
+                Logger.Fatal(e, "Internal error in compilation");
+            }
         }
 
         /// <summary>

diff --git a/esprima-dotnet b/esprima-dotnet