Support constructor type

es-meta · Oct 8, 2024 · de9ef68 · de9ef68
1 parent 24c7181
commit de9ef68
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 84 deletions.
diff --git a/src/main/resources/manuals/funcs/INTRINSICS.EvalError.ir b/src/main/resources/manuals/funcs/INTRINSICS.EvalError.ir
@@ -1,26 +1,25 @@
 def <BUILTIN>:INTRINSICS.EvalError(
   this: ESValue,
   ArgumentsList: List[ESValue],
-  NewTarget: Object | Undefined,
+  NewTarget: Constructor | Undefined,
 ): Unknown {
   if (< 0 ArgumentsList.length) let message = (pop < ArgumentsList) else let message = absent
   if (< 0 ArgumentsList.length) let options = (pop < ArgumentsList) else let options = absent
-  %0 = (= NewTarget undefined)
-  if %0 {
+  if (= NewTarget undefined) {
     let newTarget = @EXECUTION_STACK[0].Function
   } else {
     let newTarget = NewTarget
   }
-  call %1 = clo<OrdinaryCreateFromConstructor>(newTarget, "%EvalError.prototype%", (new ["ErrorData"]))
-  let O = [? %1]
-  %2 = (! (= message undefined))
-  if %2 {
-    call %3 = clo<ToString>(message)
-    let msg = [? %3]
-    call %4 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
-    [! %4]
+  call %0 = clo<OrdinaryCreateFromConstructor>(newTarget, "%EvalError.prototype%", (new ["ErrorData"]))
+  let O = [? %0]
+  %1 = (! (= message undefined))
+  if %1 {
+    call %2 = clo<ToString>(message)
+    let msg = [? %2]
+    call %3 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
+    [! %3]
   } else {}
-  call %5 = clo<InstallErrorCause>(O, options)
-  [? %5]
+  call %4 = clo<InstallErrorCause>(O, options)
+  [? %4]
   return O
 }
diff --git a/src/main/resources/manuals/funcs/INTRINSICS.RangeError.ir b/src/main/resources/manuals/funcs/INTRINSICS.RangeError.ir
@@ -1,26 +1,25 @@
 def <BUILTIN>:INTRINSICS.RangeError(
   this: ESValue,
   ArgumentsList: List[ESValue],
-  NewTarget: Object | Undefined,
+  NewTarget: Constructor | Undefined,
 ): Unknown {
   if (< 0 ArgumentsList.length) let message = (pop < ArgumentsList) else let message = absent
   if (< 0 ArgumentsList.length) let options = (pop < ArgumentsList) else let options = absent
-  %0 = (= NewTarget undefined)
-  if %0 {
+  if (= NewTarget undefined) {
     let newTarget = @EXECUTION_STACK[0].Function
   } else {
     let newTarget = NewTarget
   }
-  call %1 = clo<OrdinaryCreateFromConstructor>(newTarget, "%RangeError.prototype%", (new ["ErrorData"]))
-  let O = [? %1]
-  %2 = (! (= message undefined))
-  if %2 {
-    call %3 = clo<ToString>(message)
-    let msg = [? %3]
-    call %4 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
-    [! %4]
+  call %0 = clo<OrdinaryCreateFromConstructor>(newTarget, "%RangeError.prototype%", (new ["ErrorData"]))
+  let O = [? %0]
+  %1 = (! (= message undefined))
+  if %1 {
+    call %2 = clo<ToString>(message)
+    let msg = [? %2]
+    call %3 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
+    [! %3]
   } else {}
-  call %5 = clo<InstallErrorCause>(O, options)
-  [? %5]
+  call %4 = clo<InstallErrorCause>(O, options)
+  [? %4]
   return O
 }
diff --git a/src/main/resources/manuals/funcs/INTRINSICS.ReferenceError.ir b/src/main/resources/manuals/funcs/INTRINSICS.ReferenceError.ir
@@ -1,26 +1,25 @@
 def <BUILTIN>:INTRINSICS.ReferenceError(
   this: ESValue,
   ArgumentsList: List[ESValue],
-  NewTarget: Object | Undefined,
+  NewTarget: Constructor | Undefined,
 ): Unknown {
   if (< 0 ArgumentsList.length) let message = (pop < ArgumentsList) else let message = absent
   if (< 0 ArgumentsList.length) let options = (pop < ArgumentsList) else let options = absent
-  %0 = (= NewTarget undefined)
-  if %0 {
+  if (= NewTarget undefined) {
     let newTarget = @EXECUTION_STACK[0].Function
   } else {
     let newTarget = NewTarget
   }
-  call %1 = clo<OrdinaryCreateFromConstructor>(newTarget, "%ReferenceError.prototype%", (new ["ErrorData"]))
-  let O = [? %1]
-  %2 = (! (= message undefined))
-  if %2 {
-    call %3 = clo<ToString>(message)
-    let msg = [? %3]
-    call %4 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
-    [! %4]
+  call %0 = clo<OrdinaryCreateFromConstructor>(newTarget, "%ReferenceError.prototype%", (new ["ErrorData"]))
+  let O = [? %0]
+  %1 = (! (= message undefined))
+  if %1 {
+    call %2 = clo<ToString>(message)
+    let msg = [? %2]
+    call %3 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
+    [! %3]
   } else {}
-  call %5 = clo<InstallErrorCause>(O, options)
-  [? %5]
+  call %4 = clo<InstallErrorCause>(O, options)
+  [? %4]
   return O
 }
diff --git a/src/main/resources/manuals/funcs/INTRINSICS.SyntaxError.ir b/src/main/resources/manuals/funcs/INTRINSICS.SyntaxError.ir
@@ -1,26 +1,25 @@
 def <BUILTIN>:INTRINSICS.SyntaxError(
   this: ESValue,
   ArgumentsList: List[ESValue],
-  NewTarget: Object | Undefined,
+  NewTarget: Constructor | Undefined,
 ): Unknown {
   if (< 0 ArgumentsList.length) let message = (pop < ArgumentsList) else let message = absent
   if (< 0 ArgumentsList.length) let options = (pop < ArgumentsList) else let options = absent
-  %0 = (= NewTarget undefined)
-  if %0 {
+  if (= NewTarget undefined) {
     let newTarget = @EXECUTION_STACK[0].Function
   } else {
     let newTarget = NewTarget
   }
-  call %1 = clo<OrdinaryCreateFromConstructor>(newTarget, "%SyntaxError.prototype%", (new ["ErrorData"]))
-  let O = [? %1]
-  %2 = (! (= message undefined))
-  if %2 {
-    call %3 = clo<ToString>(message)
-    let msg = [? %3]
-    call %4 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
-    [! %4]
+  call %0 = clo<OrdinaryCreateFromConstructor>(newTarget, "%SyntaxError.prototype%", (new ["ErrorData"]))
+  let O = [? %0]
+  %1 = (! (= message undefined))
+  if %1 {
+    call %2 = clo<ToString>(message)
+    let msg = [? %2]
+    call %3 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
+    [! %3]
   } else {}
-  call %5 = clo<InstallErrorCause>(O, options)
-  [? %5]
+  call %4 = clo<InstallErrorCause>(O, options)
+  [? %4]
   return O
 }
diff --git a/src/main/resources/manuals/funcs/INTRINSICS.TypeError.ir b/src/main/resources/manuals/funcs/INTRINSICS.TypeError.ir
@@ -1,26 +1,25 @@
 def <BUILTIN>:INTRINSICS.TypeError(
   this: ESValue,
   ArgumentsList: List[ESValue],
-  NewTarget: Object | Undefined,
+  NewTarget: Constructor | Undefined,
 ): Unknown {
   if (< 0 ArgumentsList.length) let message = (pop < ArgumentsList) else let message = absent
   if (< 0 ArgumentsList.length) let options = (pop < ArgumentsList) else let options = absent
-  %0 = (= NewTarget undefined)
-  if %0 {
+  if (= NewTarget undefined) {
     let newTarget = @EXECUTION_STACK[0].Function
   } else {
     let newTarget = NewTarget
   }
-  call %1 = clo<OrdinaryCreateFromConstructor>(newTarget, "%TypeError.prototype%", (new ["ErrorData"]))
-  let O = [? %1]
-  %2 = (! (= message undefined))
-  if %2 {
-    call %3 = clo<ToString>(message)
-    let msg = [? %3]
-    call %4 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
-    [! %4]
+  call %0 = clo<OrdinaryCreateFromConstructor>(newTarget, "%TypeError.prototype%", (new ["ErrorData"]))
+  let O = [? %0]
+  %1 = (! (= message undefined))
+  if %1 {
+    call %2 = clo<ToString>(message)
+    let msg = [? %2]
+    call %3 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
+    [! %3]
   } else {}
-  call %5 = clo<InstallErrorCause>(O, options)
-  [? %5]
+  call %4 = clo<InstallErrorCause>(O, options)
+  [? %4]
   return O
 }
diff --git a/src/main/resources/manuals/funcs/INTRINSICS.URIError.ir b/src/main/resources/manuals/funcs/INTRINSICS.URIError.ir
@@ -1,26 +1,25 @@
 def <BUILTIN>:INTRINSICS.URIError(
   this: ESValue,
   ArgumentsList: List[ESValue],
-  NewTarget: Object | Undefined,
+  NewTarget: Constructor | Undefined,
 ): Unknown {
   if (< 0 ArgumentsList.length) let message = (pop < ArgumentsList) else let message = absent
   if (< 0 ArgumentsList.length) let options = (pop < ArgumentsList) else let options = absent
-  %0 = (= NewTarget undefined)
-  if %0 {
+  if (= NewTarget undefined) {
     let newTarget = @EXECUTION_STACK[0].Function
   } else {
     let newTarget = NewTarget
   }
-  call %1 = clo<OrdinaryCreateFromConstructor>(newTarget, "%URIError.prototype%", (new ["ErrorData"]))
-  let O = [? %1]
-  %2 = (! (= message undefined))
-  if %2 {
-    call %3 = clo<ToString>(message)
-    let msg = [? %3]
-    call %4 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
-    [! %4]
+  call %0 = clo<OrdinaryCreateFromConstructor>(newTarget, "%URIError.prototype%", (new ["ErrorData"]))
+  let O = [? %0]
+  %1 = (! (= message undefined))
+  if %1 {
+    call %2 = clo<ToString>(message)
+    let msg = [? %2]
+    call %3 = clo<CreateNonEnumerableDataPropertyOrThrow>(O, "message", msg)
+    [! %3]
   } else {}
-  call %5 = clo<InstallErrorCause>(O, options)
-  [? %5]
+  call %4 = clo<InstallErrorCause>(O, options)
+  [? %4]
   return O
 }
diff --git a/src/main/resources/manuals/tycheck-ignore.json b/src/main/resources/manuals/tycheck-ignore.json
@@ -37,6 +37,7 @@
   "LengthOfArrayLike",
   "MethodDefinition[0,0].DefineMethod",
   "ModuleNamespaceCreate",
+  "OrdinaryCreateFromConstructor",
   "OrdinaryFunctionCreate",
   "ProxyCreate",
   "SerializeJSONObject",
@@ -48,5 +49,6 @@
   "Statement[1,0].LabelledEvaluation",
   "Statement[2,0].LabelledEvaluation",
   "StringCreate",
-  "ToIndex"
+  "ToIndex",
+  "TypedArrayCreate"
 ]
diff --git a/src/main/resources/result/spec-summary b/src/main/resources/result/spec-summary
@@ -11,9 +11,9 @@
 - algorithm steps: 19535 (96.80%)
   - complete: 18909
   - incomplete: 626
-- types: 6999 (93.28%)
-  - known: 6529
-  - yet: 470
+- types: 6999 (93.60%)
+  - known: 6551
+  - yet: 448
   - unknown: 620
 - tables: 89
-- type model: 58
+- type model: 59
diff --git a/src/main/scala/esmeta/analyzer/TypeAnalyzer.scala b/src/main/scala/esmeta/analyzer/TypeAnalyzer.scala
@@ -114,6 +114,20 @@ class TypeAnalyzer(
     /** loading monads */
     import AbsState.monad.*
 
+    /** transfer function for expressions */
+    override def transfer(expr: Expr)(using
+      cp: ControlPoint,
+    ): Result[AbsValue] = expr match
+      // a precise type of `the active function object` in built-in functions
+      case ERef(
+            Prop(
+              Prop(Global("EXECUTION_STACK"), EMath(0)),
+              EStr("Function"),
+            ),
+          ) if cp.func.isBuiltin =>
+        pure(AbsValue(ConstructorT))
+      case _ => super.transfer(expr)
+
     /** return-if-abrupt completion */
     override def returnIfAbrupt(
       riaExpr: EReturnIfAbrupt,

diff --git a/src/main/scala/esmeta/spec/Head.scala b/src/main/scala/esmeta/spec/Head.scala
@@ -34,7 +34,7 @@ sealed trait Head extends SpecElem {
       List(
         Param(ir.THIS_STR, Type(ESValueT)),
         Param(ir.ARGS_LIST_STR, Type(ListT(ESValueT))),
-        Param(ir.NEW_TARGET_STR, Type(ObjectT || UndefT)),
+        Param(ir.NEW_TARGET_STR, Type(ConstructorT || UndefT)),
       )
 
   /** get function name */

diff --git a/src/main/scala/esmeta/ty/TyModel.scala b/src/main/scala/esmeta/ty/TyModel.scala
@@ -332,6 +332,9 @@ object TyModel {
       "FunctionObject" -> TyInfo(
         parent = Some("OrdinaryObject"),
       ),
+      "Constructor" -> TyInfo(
+        parent = Some("FunctionObject"),
+      ),
       "ECMAScriptFunctionObject" -> TyInfo(
         parent = Some("FunctionObject"),
         methods = Map(

diff --git a/src/main/scala/esmeta/ty/package.scala b/src/main/scala/esmeta/ty/package.scala
@@ -48,6 +48,8 @@ def NameT(names: String*): ValueTy =
   if (names.isEmpty) ValueTy.Bot
   else ValueTy(name = NameTy(Fin(names.toSet)))
 lazy val ObjectT: ValueTy = NameT("Object")
+lazy val FunctionT: ValueTy = NameT("FunctionObject")
+lazy val ConstructorT: ValueTy = NameT("Constructor")
 lazy val ESPrimT: ValueTy = ValueTy(
   symbol = true,
   number = NumberTy.Top,