Fix up exception/error handling.

RickStrahl · RickStrahl · commit cd657677736a · 2019-02-20T20:36:44.000-10:00
diff --git a/Westwind.Scripting/CSharpScriptExecution.cs b/Westwind.Scripting/CSharpScriptExecution.cs
@@ -1,13 +1,9 @@
 &#65279;using System;
 using System.CodeDom.Compiler;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-//using Microsoft.CSharp;
-using Microsoft.CodeDom.Providers.DotNetCompilerPlatform;
 
 namespace Westwind.Scripting
 {
@@ -71,6 +67,12 @@ public class CSharpScriptExecution
         /// </summary>
         public bool SaveGeneratedCode { get; set; }
 
+        /// <summary>
+        /// If true throws exceptions rather than failing silently
+        /// and returning error state. Default is false.
+        /// </summary>
+        public bool ThrowExceptions { get; set; }
+
 
         #region Error Handling Properties
 
@@ -219,6 +221,17 @@ public void AddAssembly(Type type)
             AddAssembly(type.Assembly.Location);
         }
 
+        /// <summary>
+        /// Adds a list of assemblies to the References
+        /// collection.
+        /// </summary>
+        /// <param name="assemblies"></param>
+        public void AddAssemblies(params string[] assemblies)
+        {
+            foreach (var assembly in assemblies)
+                AddAssembly(assembly);            
+        }
+
         /// <summary>
         /// Adds a namespace to the referenced namespaces
         /// used at compile time.
@@ -247,6 +260,10 @@ public void AddNamespaces(params string[] namespaces)
             }
         }
 
+        /// <summary>
+        /// Adds basic System assemblies and namespaces so basic
+        /// operations work.                
+        /// </summary>
         public void AddDefaultReferencesAndNamespaces()
         {
             AddAssembly("System.dll");
@@ -273,6 +290,8 @@ public void AddDefaultReferencesAndNamespaces()
         /// <returns></returns>
         public object ExecuteMethod(string code,string methodName, params object[] parameters)
         {
+            ClearErrors();
+
             object instance = ObjectInstance;
 
             if (instance == null)
@@ -293,7 +312,7 @@ public object ExecuteMethod(string code,string methodName, params object[] param
                     Assembly = CachedAssemblies[hash];
 
                     // Figure out the class name
-                    Type type = Assembly.ExportedTypes.First();
+                    var type = Assembly.ExportedTypes.First();
                     GeneratedClassName = type.Name;
                     GeneratedNamespace = type.Namespace;
                 }
@@ -316,6 +335,8 @@ public object ExecuteMethod(string code,string methodName, params object[] param
         /// <returns></returns>
         public object Evaluate(string code, params object[] parameters)
         {
+            ClearErrors();
+
             if (string.IsNullOrEmpty(code))
                 throw new ArgumentException("Can't evaluate empty code. Please pass code.");
 
@@ -335,6 +356,8 @@ public object Evaluate(string code, params object[] parameters)
         /// <returns></returns>
         public object ExecuteCode(string code, params object[] parameters)
         {
+            ClearErrors();
+
             code = ParseCodeNumberedParameters(code, parameters);
 
             return ExecuteMethod("public object ExecuteCode(params object[] parameters)" +
@@ -426,6 +449,7 @@ private StringBuilder GenerateClass(string code)
 
             if (SaveGeneratedCode)
                 GeneratedClassCode = sb.ToString();
+
             return sb;
         }
 
@@ -441,6 +465,8 @@ private StringBuilder GenerateClass(string code)
         /// <returns></returns>
         public object ExecuteCodeFromAssembly(string code, Assembly assembly, params object[] parameters)
         {
+            ClearErrors();
+
             Assembly = assembly;
 
             ObjectInstance = CreateInstance();
@@ -457,6 +483,8 @@ public object ExecuteCodeFromAssembly(string code, Assembly assembly, params obj
         /// <returns></returns>
         public bool CompileAssembly(string source)
         {
+            ClearErrors();
+
             if (OutputAssembly == null)
                 Parameters.GenerateInMemory = true;
             else
@@ -472,28 +500,42 @@ public bool CompileAssembly(string source)
             
             CompilerResults = Compiler.CompileAssemblyFromSource(Parameters, source);
 
-            //if (CompilerMode == ScriptCompilerModes.Roslyn)
-            //    CompilerResults = Compiler.CompileAssemblyFromSource(Parameters, source);
-            //else
-            //    CompilerResults = CompilerClassic.CompileAssemblyFromSource(Parameters, source);
-
             if (CompilerResults.Errors.HasErrors)
             {
-                Error = true;
-
                 // *** Create Error String
                 ErrorMessage = CompilerResults.Errors.Count + " Errors:";
                 for (int x = 0; x < CompilerResults.Errors.Count; x++)
-                    ErrorMessage = ErrorMessage + "\r\nLine: " + CompilerResults.Errors[x].Line.ToString() + " - " +
+                    ErrorMessage = ErrorMessage + "\r\nLine: " + CompilerResults.Errors[x].Line + " - " +
                                    CompilerResults.Errors[x].ErrorText;
+
+                SetErrors(new ApplicationException(ErrorMessage));
+                
                 return false;
             }
 
             Assembly = CompilerResults.CompiledAssembly;
 
             return true;
         }
+        #endregion
+
+        #region Errors
+        private void ClearErrors()
+        {
+            LastException = null;
+            Error = false;
+            ErrorMessage = null;
+        }
+
+        private void SetErrors(Exception ex)
+        {
+            Error = true;
+            LastException = ex.GetBaseException();
+            ErrorMessage = LastException.Message;
 
+            if (ThrowExceptions)
+                throw LastException;
+        }
 
         #endregion
 
@@ -509,6 +551,8 @@ public bool CompileAssembly(string source)
         /// <returns></returns>
         public object InvokeMethod(object instance, string method, params object[] parameters)
         {
+            ClearErrors();
+
             // *** Try to run it
             try
             {
@@ -518,8 +562,7 @@ public object InvokeMethod(object instance, string method, params object[] param
             }
             catch (Exception ex)
             {
-                Error = true;
-                ErrorMessage = ex.GetBaseException().Message;
+                SetErrors(ex);
             }
 
             return null;
@@ -534,10 +577,7 @@ public object InvokeMethod(object instance, string method, params object[] param
         /// <returns>Instance of the class or null on error</returns>
         public object CreateInstance()
         {
-
-            LastException = null;
-            Error = false;
-            ErrorMessage = null;
+            ClearErrors();
 
             if (ObjectInstance != null)
                 return ObjectInstance;
@@ -551,15 +591,17 @@ public object CreateInstance()
             }
             catch (Exception ex)
             {
-                Error = true;
-                LastException = ex.GetBaseException();
-                ErrorMessage = ex.Message;
+                SetErrors(ex);
             }
 
             return null;
         }
 
+
+
         #endregion
+
+       
     }
 
     public enum ScriptCompilerModes
