Issue EvilBeaver#74 Выводить сведения об ошибке в машиночитаемом виде

EvilBeaver · EvilBeaver · commit 514a01eda3a6 · 2014-11-06T13:57:25.000+03:00
diff --git a/src/ScriptEngine/CodePositionInfo.cs b/src/ScriptEngine/CodePositionInfo.cs
@@ -7,6 +7,7 @@ namespace ScriptEngine
 {
     class CodePositionInfo
     {
+        public string ModuleName { get; set; }
         public int LineNumber { get; set; }
         public string Code { get; set; }
     }
diff --git a/src/ScriptEngine/CompilerService.cs b/src/ScriptEngine/CompilerService.cs
@@ -80,7 +80,16 @@ private ModuleHandle Compile(ICodeSource source)
 
             var compiler = new Compiler.Compiler();
             ModuleImage compiledImage;
-            compiledImage = compiler.Compile(parser, _currentContext);
+            try
+            {
+                compiledImage = compiler.Compile(parser, _currentContext);
+            }
+            catch (ScriptException e)
+            {
+                e.ModuleName = source.SourceDescription;
+                throw;
+            }
+
             foreach (var item in _predefinedVariables)
             {
                 var varDef = _scope.GetVariable(item);
diff --git a/src/ScriptEngine/Machine/MachineInstance.cs b/src/ScriptEngine/Machine/MachineInstance.cs
@@ -349,6 +349,7 @@ private void MainCommandLoop()
         private void SetScriptExceptionSource(RuntimeException exc)
         {
             exc.LineNumber = _lineNumber;
+            exc.ModuleName = _module.ModuleInfo.ModuleName;
             if (_module.ModuleInfo != null)
             {
                 exc.Code = _module.ModuleInfo.CodeIndexer.GetCodeLine(_lineNumber);
diff --git a/src/ScriptEngine/ScriptException.cs b/src/ScriptEngine/ScriptException.cs
@@ -57,11 +57,24 @@ internal set
             }
         }
 
+        public string ModuleName
+        {
+            get
+            {
+                return _codePosition.ModuleName;
+            }
+            internal set
+            {
+                _codePosition.ModuleName = value;
+            }
+        }
+
         public override string Message
         {
             get
             {
-                return String.Format("{{Ошибка в строке {0}: {1}}}\n  {2}",
+                return String.Format("{{Модуль {0} / Ошибка в строке: {1} / {2}}}\n  {3}",
+                    _codePosition.ModuleName,
                     _codePosition.LineNumber,
                     base.Message,
                     _codePosition.Code);

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace ScriptEngine`
`7`	`7`	`{`
`8`	`8`	`class CodePositionInfo`
`9`	`9`	`{`
	`10`	`+ public string ModuleName { get; set; }`
`10`	`11`	`public int LineNumber { get; set; }`
`11`	`12`	`public string Code { get; set; }`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,7 @@ private void MainCommandLoop()`
`349`	`349`	`private void SetScriptExceptionSource(RuntimeException exc)`
`350`	`350`	`{`
`351`	`351`	`exc.LineNumber = _lineNumber;`
	`352`	`+ exc.ModuleName = _module.ModuleInfo.ModuleName;`
`352`	`353`	`if (_module.ModuleInfo != null)`
`353`	`354`	`{`
`354`	`355`	`exc.Code = _module.ModuleInfo.CodeIndexer.GetCodeLine(_lineNumber);`