Fix tests

nilproject · nilproject · commit 7fabeb5e24e6 · 2022-08-09T14:01:33.000+03:00
diff --git a/NiL.JS/BaseLibrary/RegExp.cs b/NiL.JS/BaseLibrary/RegExp.cs
@@ -49,11 +49,12 @@ private void makeRegex(Arguments args)
                 if (args.GetProperty("length")._iValue > 1 && args[1]._valueType > JSValueType.Undefined)
                     ExceptionHelper.Throw(new TypeError("Cannot supply flags when constructing one RegExp from another"));
                 _oValue = ptrn._oValue;
-                _regex = (ptrn.Value as RegExp)._regex;
-                _global = (ptrn.Value as RegExp)._global;
-                _sticky = (ptrn.Value as RegExp)._sticky;
-                _unicode = (ptrn.Value as RegExp)._unicode;
-                _source = (ptrn.Value as RegExp)._source;
+                var regExp = ptrn.Value as RegExp;
+                _regex = regExp._regex;
+                _global = regExp._global;
+                _sticky = regExp._sticky;
+                _unicode = regExp._unicode;
+                _source = regExp._source;
                 return;
             }
             var pattern = ptrn._valueType > JSValueType.Undefined ? ptrn.ToString() : "";
diff --git a/NiL.JS/Core/Interop/Proxy.cs b/NiL.JS/Core/Interop/Proxy.cs
@@ -434,7 +434,7 @@ internal JSValue proxyMember(bool forWrite, IList<MemberInfo> m)
             {
                 for (int i = 0; i < m.Count; i++)
                     if (!(m[i] is MethodBase))
-                        ExceptionHelper.Throw(_context.ProxyValue(new TypeError("Incompatible fields types.")));
+                        ExceptionHelper.Throw(new TypeError("Incompatible fields types."));
 
                 var cache = new MethodProxy[m.Count];
                 for (int i = 0; i < m.Count; i++)
diff --git a/NiL.JS/Core/JSException.cs b/NiL.JS/Core/JSException.cs
@@ -25,20 +25,21 @@ public JSException(Error data)
         }
 
         public JSException(Error data, CodeNode exceptionMaker, string code)
+            : this(Context.CurrentGlobalContext.ProxyValue(data), exceptionMaker, code)
+        {
+        }
+
+        public JSException(JSValue data, CodeNode exceptionMaker, string code)
         {
             Error = Context.CurrentGlobalContext.ProxyValue(data);
             ExceptionMaker = exceptionMaker;
             Code = code;
-            if (code != null) {
+            if (code != null)
+            {
                 CodeCoordinates = CodeCoordinates.FromTextPosition(code, exceptionMaker.Position, exceptionMaker.Length);
             }
         }
 
-        public JSException(JSValue data)
-        {
-            Error = data;
-        }
-
         public JSException(JSValue data, Exception innerException)
             : base("External error", innerException)
         {
diff --git a/NiL.JS/Core/JSValue.cs b/NiL.JS/Core/JSValue.cs
@@ -555,6 +555,7 @@ internal protected virtual JSValue GetProperty(JSValue key, bool forWrite, Prope
                 {
                     if (propertyScope == PropertyScope.Own)
                         return notExists;
+
                     forWrite = false;
                     return Context.CurrentGlobalContext.GetPrototype(typeof(BaseLibrary.Boolean)).GetProperty(key, false, PropertyScope.Common);
                 }
@@ -563,6 +564,7 @@ internal protected virtual JSValue GetProperty(JSValue key, bool forWrite, Prope
                 {
                     if (propertyScope == PropertyScope.Own)
                         return notExists;
+
                     forWrite = false;
                     return Context.CurrentGlobalContext.GetPrototype(typeof(Number)).GetProperty(key, false, PropertyScope.Common);
                 }
@@ -581,8 +583,10 @@ internal protected virtual JSValue GetProperty(JSValue key, bool forWrite, Prope
                 {
                     if (_oValue == this)
                         break;
+
                     if (_oValue == null)
                         ExceptionHelper.ThrowTypeError(string.Format(Strings.TryingToGetProperty, key, "null"));
+                    
                     var inObj = _oValue as JSObject;
                     if (inObj != null)
                         return inObj.GetProperty(key, forWrite, propertyScope);
diff --git a/NiL.JS/ExceptionHelper.cs b/NiL.JS/ExceptionHelper.cs
@@ -43,9 +43,9 @@ internal static void Throw(Error error, CodeNode exceptionMaker, Context context
         /// </exception>
         [MethodImpl(MethodImplOptions.NoInlining)]
         [DebuggerStepThrough]
-        internal static void Throw(JSValue error)
+        internal static void Throw(JSValue error, CodeNode exceptionMaker, Context context)
         {
-            throw new JSException(error ?? JSValue.undefined);
+            throw new JSException(error ?? JSValue.undefined, exceptionMaker, GetCode(context));
         }
 
         /// <exception cref="NiL.JS.Core.JSException">
diff --git a/NiL.JS/Expressions/AwaitExpression.cs b/NiL.JS/Expressions/AwaitExpression.cs
@@ -24,7 +24,7 @@ public override JSValue Evaluate(Context context)
                 if ((bool)context.SuspendData[this])
                 {
                     context._executionMode = ExecutionMode.Regular;
-                    throw new JSException(context._executionInfo);
+                    ExceptionHelper.Throw(context._executionInfo, this, context);
                 }
             }
             else if (context._executionMode == ExecutionMode.Resume)
diff --git a/NiL.JS/Expressions/Yield.cs b/NiL.JS/Expressions/Yield.cs
@@ -91,7 +91,7 @@ public override JSValue Evaluate(Context context)
                 context.SuspendData.Clear();
                 context._executionMode = ExecutionMode.Regular;
                 var exceptionData = context._executionInfo;
-                ExceptionHelper.Throw(exceptionData);
+                ExceptionHelper.Throw(exceptionData, this, context);
             }
 
             if (_reiterate)
diff --git a/NiL.JS/Script.cs b/NiL.JS/Script.cs
@@ -7,8 +7,10 @@ namespace NiL.JS
 {
     public sealed class Script
     {
+        private static readonly object _scriptStackLock = new();
+
         [ThreadStatic]
-        private static readonly Stack<Script> _scriptsStack = new Stack<Script>();
+        private static Stack<Script> _scriptsStack;
 
         internal static Script CurrentScript => _scriptsStack.Count > 0 ? _scriptsStack.Peek() : null;
 
@@ -67,8 +69,13 @@ public JSValue Evaluate(Context context)
             if (Code == "")
                 return JSValue.Undefined;
 
-            lock (_scriptsStack)
+            lock (_scriptStackLock)
+            {
+                if (_scriptsStack == null)
+                    _scriptsStack = new();
+
                 _scriptsStack.Push(this);
+            }
 
             try
             {
@@ -81,7 +88,7 @@ public JSValue Evaluate(Context context)
                     Root._variables[i].cacheContext = null;
                 context.Deactivate();
 
-                lock (_scriptsStack)
+                lock (_scriptStackLock)
                     _scriptsStack.Pop();
             }
         }
diff --git a/NiL.JS/Statements/Throw.cs b/NiL.JS/Statements/Throw.cs
@@ -59,7 +59,7 @@ public override JSValue Evaluate(Context context)
             if (context._executionMode == ExecutionMode.Suspend)
                 return null;
 
-            ExceptionHelper.Throw(value);
+            ExceptionHelper.Throw(value, this, context);
             return null;
         }
 
diff --git a/NiL.JS/Statements/TryCatch.cs b/NiL.JS/Statements/TryCatch.cs
@@ -141,7 +141,7 @@ public override JSValue Evaluate(Context context)
                             continue;
 
                         isOurException = true;
-                        stackTrace.Add("   at " + (item.Item1?._owner?.name ?? "<unknown function>") + ": line " + item.Item2.Line);
+                        stackTrace.Add("   at " + (item.Item1?._owner?.name ?? "<unknown function>") + (item.Item2 != null ? ": line " + item.Item2.Line : string.Empty));
                     }
 
                     if (!isOurException)
diff --git a/Tests/ParamsArraySupportTests.cs b/Tests/ParamsArraySupportTests.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NiL.JS.Core;
 using NiL.JS.Extensions;
@@ -66,7 +67,7 @@ public void OneArrayArgumentShouldWorkAsRaw()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(JSException))]
+        [ExpectedException(typeof(InvalidCastException))]
         public void TwoArrayArgumentsShouldCauseException()
         {
             var testClass = new ClassWithTwoMethods();

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ internal JSValue proxyMember(bool forWrite, IList<MemberInfo> m)`
`434`	`434`	`{`
`435`	`435`	`for (int i = 0; i < m.Count; i++)`
`436`	`436`	`if (!(m[i] is MethodBase))`
`437`		`- ExceptionHelper.Throw(_context.ProxyValue(new TypeError("Incompatible fields types.")));`
	`437`	`+ ExceptionHelper.Throw(new TypeError("Incompatible fields types."));`
`438`	`438`
`439`	`439`	`var cache = new MethodProxy[m.Count];`
`440`	`440`	`for (int i = 0; i < m.Count; i++)`
Original file line number	Diff line number	Diff line change
`@@ -25,20 +25,21 @@ public JSException(Error data)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public JSException(Error data, CodeNode exceptionMaker, string code)`
	`28`	`+ : this(Context.CurrentGlobalContext.ProxyValue(data), exceptionMaker, code)`
	`29`	`+ {`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ public JSException(JSValue data, CodeNode exceptionMaker, string code)`
`28`	`33`	`{`
`29`	`34`	`Error = Context.CurrentGlobalContext.ProxyValue(data);`
`30`	`35`	`ExceptionMaker = exceptionMaker;`
`31`	`36`	`Code = code;`
`32`		`- if (code != null) {`
	`37`	`+ if (code != null)`
	`38`	`+ {`
`33`	`39`	`CodeCoordinates = CodeCoordinates.FromTextPosition(code, exceptionMaker.Position, exceptionMaker.Length);`
`34`	`40`	`}`
`35`	`41`	`}`
`36`	`42`
`37`		`- public JSException(JSValue data)`
`38`		`- {`
`39`		`- Error = data;`
`40`		`- }`
`41`		`-`
`42`	`43`	`public JSException(JSValue data, Exception innerException)`
`43`	`44`	`: base("External error", innerException)`
`44`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,7 @@ internal protected virtual JSValue GetProperty(JSValue key, bool forWrite, Prope`
`555`	`555`	`{`
`556`	`556`	`if (propertyScope == PropertyScope.Own)`
`557`	`557`	`return notExists;`
	`558`	`+`
`558`	`559`	`forWrite = false;`
`559`	`560`	`return Context.CurrentGlobalContext.GetPrototype(typeof(BaseLibrary.Boolean)).GetProperty(key, false, PropertyScope.Common);`
`560`	`561`	`}`
`@@ -563,6 +564,7 @@ internal protected virtual JSValue GetProperty(JSValue key, bool forWrite, Prope`
`563`	`564`	`{`
`564`	`565`	`if (propertyScope == PropertyScope.Own)`
`565`	`566`	`return notExists;`
	`567`	`+`
`566`	`568`	`forWrite = false;`
`567`	`569`	`return Context.CurrentGlobalContext.GetPrototype(typeof(Number)).GetProperty(key, false, PropertyScope.Common);`
`568`	`570`	`}`
`@@ -581,8 +583,10 @@ internal protected virtual JSValue GetProperty(JSValue key, bool forWrite, Prope`
`581`	`583`	`{`
`582`	`584`	`if (_oValue == this)`
`583`	`585`	`break;`
	`586`	`+`
`584`	`587`	`if (_oValue == null)`
`585`	`588`	`ExceptionHelper.ThrowTypeError(string.Format(Strings.TryingToGetProperty, key, "null"));`
	`589`	`+`
`586`	`590`	`var inObj = _oValue as JSObject;`
`587`	`591`	`if (inObj != null)`
`588`	`592`	`return inObj.GetProperty(key, forWrite, propertyScope);`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ internal static void Throw(Error error, CodeNode exceptionMaker, Context context`
`43`	`43`	`/// </exception>`
`44`	`44`	`[MethodImpl(MethodImplOptions.NoInlining)]`
`45`	`45`	`[DebuggerStepThrough]`
`46`		`- internal static void Throw(JSValue error)`
	`46`	`+ internal static void Throw(JSValue error, CodeNode exceptionMaker, Context context)`
`47`	`47`	`{`
`48`		`- throw new JSException(error ?? JSValue.undefined);`
	`48`	`+ throw new JSException(error ?? JSValue.undefined, exceptionMaker, GetCode(context));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/// <exception cref="NiL.JS.Core.JSException">`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public override JSValue Evaluate(Context context)`
`24`	`24`	`if ((bool)context.SuspendData[this])`
`25`	`25`	`{`
`26`	`26`	`context._executionMode = ExecutionMode.Regular;`
`27`		`- throw new JSException(context._executionInfo);`
	`27`	`+ ExceptionHelper.Throw(context._executionInfo, this, context);`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`else if (context._executionMode == ExecutionMode.Resume)`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public override JSValue Evaluate(Context context)`
`91`	`91`	`context.SuspendData.Clear();`
`92`	`92`	`context._executionMode = ExecutionMode.Regular;`
`93`	`93`	`var exceptionData = context._executionInfo;`
`94`		`- ExceptionHelper.Throw(exceptionData);`
	`94`	`+ ExceptionHelper.Throw(exceptionData, this, context);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if (_reiterate)`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,10 @@ namespace NiL.JS`
`7`	`7`	`{`
`8`	`8`	`public sealed class Script`
`9`	`9`	`{`
	`10`	`+ private static readonly object _scriptStackLock = new();`
	`11`	`+`
`10`	`12`	`[ThreadStatic]`
`11`		`- private static readonly Stack<Script> _scriptsStack = new Stack<Script>();`
	`13`	`+ private static Stack<Script> _scriptsStack;`
`12`	`14`
`13`	`15`	`internal static Script CurrentScript => _scriptsStack.Count > 0 ? _scriptsStack.Peek() : null;`
`14`	`16`
`@@ -67,8 +69,13 @@ public JSValue Evaluate(Context context)`
`67`	`69`	`if (Code == "")`
`68`	`70`	`return JSValue.Undefined;`
`69`	`71`
`70`		`- lock (_scriptsStack)`
	`72`	`+ lock (_scriptStackLock)`
	`73`	`+ {`
	`74`	`+ if (_scriptsStack == null)`
	`75`	`+ _scriptsStack = new();`
	`76`	`+`
`71`	`77`	`_scriptsStack.Push(this);`
	`78`	`+ }`
`72`	`79`
`73`	`80`	`try`
`74`	`81`	`{`
`@@ -81,7 +88,7 @@ public JSValue Evaluate(Context context)`
`81`	`88`	`Root._variables[i].cacheContext = null;`
`82`	`89`	`context.Deactivate();`
`83`	`90`
`84`		`- lock (_scriptsStack)`
	`91`	`+ lock (_scriptStackLock)`
`85`	`92`	`_scriptsStack.Pop();`
`86`	`93`	`}`
`87`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public override JSValue Evaluate(Context context)`
`59`	`59`	`if (context._executionMode == ExecutionMode.Suspend)`
`60`	`60`	`return null;`
`61`	`61`
`62`		`- ExceptionHelper.Throw(value);`
	`62`	`+ ExceptionHelper.Throw(value, this, context);`
`63`	`63`	`return null;`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public override JSValue Evaluate(Context context)`
`141`	`141`	`continue;`
`142`	`142`
`143`	`143`	`isOurException = true;`
`144`		`- stackTrace.Add(" at " + (item.Item1?._owner?.name ?? "<unknown function>") + ": line " + item.Item2.Line);`
	`144`	`+ stackTrace.Add(" at " + (item.Item1?._owner?.name ?? "<unknown function>") + (item.Item2 != null ? ": line " + item.Item2.Line : string.Empty));`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`if (!isOurException)`