Was made refactoring

Author: Taritsyn

src/MsieJavaScriptEngine.Net4/MsieJavaScriptEngine.Net40.csproj

@@ -54,8 +54,14 @@
     <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptJsEngineBase.ScriptSite.cs">
       <Link>ActiveScript\ActiveScriptJsEngineBase.ScriptSite.cs</Link>
     </Compile>
-    <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptWrapper.cs">
-      <Link>ActiveScript\ActiveScriptWrapper.cs</Link>
+    <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptWrapper32.cs">
+      <Link>ActiveScript\ActiveScriptWrapper32.cs</Link>
+    </Compile>
+    <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptWrapper64.cs">
+      <Link>ActiveScript\ActiveScriptWrapper64.cs</Link>
+    </Compile>
+    <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ActiveScriptWrapperBase.cs">
+      <Link>ActiveScript\ActiveScriptWrapperBase.cs</Link>
     </Compile>
     <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ChakraActiveScriptJsEngine.cs">
       <Link>ActiveScript\ChakraActiveScriptJsEngine.cs</Link>
@@ -249,6 +255,9 @@
     <Compile Include="..\MsieJavaScriptEngine\ActiveScript\IActiveScriptSite.cs">
       <Link>ActiveScript\IActiveScriptSite.cs</Link>
     </Compile>
+    <Compile Include="..\MsieJavaScriptEngine\ActiveScript\IActiveScriptWrapper.cs">
+      <Link>ActiveScript\IActiveScriptWrapper.cs</Link>
+    </Compile>
     <Compile Include="..\MsieJavaScriptEngine\ActiveScript\ScriptGCType.cs">
       <Link>ActiveScript\ScriptGCType.cs</Link>
     </Compile>

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptException.cs

@@ -1,6 +1,5 @@
 #if !NETSTANDARD1_3
 using System;
-using System.Runtime.InteropServices.ComTypes;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
 
@@ -15,19 +14,19 @@ public sealed class ActiveScriptException : Exception
 		private int _errorCode;
 
 		/// <summary>
-		/// WCode
+		/// Category of error
 		/// </summary>
-		private short _errorWCode;
+		private string _category = string.Empty;
 
 		/// <summary>
-		/// Application specific source context
+		/// Description of error
 		/// </summary>
-		private uint _sourceContext;
+		private string _description = string.Empty;
 
 		/// <summary>
-		/// Subcategory of error
+		/// Application specific source context
 		/// </summary>
-		private string _subcategory = string.Empty;
+		private uint _sourceContext;
 
 		/// <summary>
 		/// Line number on which the error occurred
@@ -42,7 +41,7 @@ public sealed class ActiveScriptException : Exception
 		/// <summary>
 		/// Content of the line on which the error occurred
 		/// </summary>
-		private string _sourceError = string.Empty;
+		private string _sourceFragment = string.Empty;
 
 		/// <summary>
 		/// Gets or sets a error code
@@ -54,30 +53,30 @@ public int ErrorCode
 		}
 
 		/// <summary>
-		/// Gets or sets a WCode
+		/// Gets or sets a category of error
 		/// </summary>
-		public short ErrorWCode
+		public string Category
 		{
-			get { return _errorWCode; }
-			set { _errorWCode = value; }
+			get { return _category; }
+			set { _category = value; }
 		}
 
 		/// <summary>
-		/// Gets or sets a application specific source context
+		/// Gets or sets a description of error
 		/// </summary>
-		public uint SourceContext
+		public string Description
 		{
-			get { return _sourceContext; }
-			set { _sourceContext = value; }
+			get { return _description; }
+			set { _description = value; }
 		}
 
 		/// <summary>
-		/// Gets or sets a subcategory of error
+		/// Gets or sets a application specific source context
 		/// </summary>
-		public string Subcategory
+		public uint SourceContext
 		{
-			get { return _subcategory; }
-			set { _subcategory = value; }
+			get { return _sourceContext; }
+			set { _sourceContext = value; }
 		}
 
 		/// <summary>
@@ -101,10 +100,10 @@ public int ColumnNumber
 		/// <summary>
 		/// Gets or sets a content of the line on which the error occurred
 		/// </summary>
-		public string SourceError
+		public string SourceFragment
 		{
-			get { return _sourceError; }
-			set { _sourceError = value; }
+			get { return _sourceFragment; }
+			set { _sourceFragment = value; }
 		}
 
 
@@ -139,83 +138,13 @@ private ActiveScriptException(SerializationInfo info, StreamingContext context)
 			if (info != null)
 			{
 				_errorCode = info.GetInt32("ErrorCode");
-				_errorWCode = info.GetInt16("ErrorWCode");
+				_category = info.GetString("Category");
+				_description = info.GetString("Description");
 				_sourceContext = info.GetUInt32("SourceContext");
-				_subcategory = info.GetString("Subcategory");
 				_lineNumber = info.GetUInt32("LineNumber");
 				_columnNumber = info.GetInt32("ColumnNumber");
-				_sourceError = info.GetString("SourceError");
-			}
-		}
-
-
-		internal static ActiveScriptException Create(string message, IActiveScriptError error)
-		{
-			int errorCode = 0;
-			short errorWCode = 0;
-			uint sourceContext = 0;
-			string subcategory = string.Empty;
-			string helpLink = string.Empty;
-			uint lineNumber = 0;
-			int columnNumber = 0;
-			string sourceError = string.Empty;
-
-			try
-			{
-				error.GetSourceLineText(out sourceError);
-			}
-			catch
-			{
-				// Do nothing
-			}
-
-			try
-			{
-				error.GetSourcePosition(out sourceContext, out lineNumber, out columnNumber);
-				++lineNumber;
-				++columnNumber;
-			}
-			catch
-			{
-				// Do nothing
-			}
-
-			try
-			{
-				EXCEPINFO excepInfo;
-				error.GetExceptionInfo(out excepInfo);
-
-				subcategory = excepInfo.bstrSource;
-				errorCode = excepInfo.scode;
-				errorWCode = excepInfo.wCode;
-				if (!string.IsNullOrWhiteSpace(excepInfo.bstrHelpFile)
-					&& excepInfo.dwHelpContext != 0)
-				{
-					helpLink = string.Format("{0}: {1}", excepInfo.bstrHelpFile, excepInfo.dwHelpContext);
-				}
-				else if (!string.IsNullOrWhiteSpace(excepInfo.bstrHelpFile))
-				{
-					helpLink = excepInfo.bstrHelpFile;
-				}
+				_sourceFragment = info.GetString("SourceFragment");
 			}
-			catch
-			{
-				// Do nothing
-			}
-
-			var activeScriptException = new ActiveScriptException(message)
-			{
-				ErrorCode = errorCode,
-				ErrorWCode = errorWCode,
-				SourceContext = sourceContext,
-				Subcategory = subcategory,
-				LineNumber = lineNumber,
-				ColumnNumber = columnNumber,
-				SourceError = sourceError,
-				HelpLink = helpLink,
-			};
-
-			return activeScriptException;
 		}
 
 		#region Exception overrides
@@ -235,12 +164,12 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
 			base.GetObjectData(info, context);
 			info.AddValue("ErrorCode", _errorCode);
-			info.AddValue("ErrorWCode", _errorWCode);
+			info.AddValue("Category", _category);
+			info.AddValue("Description", _description);
 			info.AddValue("SourceContext", _sourceContext);
-			info.AddValue("Subcategory", _subcategory);
 			info.AddValue("LineNumber", _lineNumber);
 			info.AddValue("ColumnNumber", _columnNumber);
-			info.AddValue("SourceError", _sourceError);
+			info.AddValue("SourceFragment", _sourceFragment);
 		}
 
 		#endregion