Bläddra i källkod

Fixed merge conflicts

Dmitry Panov 3 år sedan
förälder
incheckning
a34e79884e
4 ändrade filer med 11 tillägg och 7 borttagningar
  1. 4 4
      builtin_typedarrays.go
  2. 1 1
      compiler_expr.go
  3. 1 1
      runtime.go
  4. 5 1
      tc39_test.go

+ 4 - 4
builtin_typedarrays.go

@@ -1360,12 +1360,12 @@ func (r *Runtime) newFloat64Array(args []Value, newTarget, proto *Object) *Objec
 	return r._newTypedArray(args, newTarget, r.newFloat64ArrayObject, proto)
 }
 
-func (r *Runtime) newBigInt64Array(args []Value, newTarget *Object) *Object {
-	return r._newTypedArray(args, newTarget, r.newBigInt64ArrayObject)
+func (r *Runtime) newBigInt64Array(args []Value, newTarget, proto *Object) *Object {
+	return r._newTypedArray(args, newTarget, r.newBigInt64ArrayObject, proto)
 }
 
-func (r *Runtime) newBigUint64Array(args []Value, newTarget *Object) *Object {
-	return r._newTypedArray(args, newTarget, r.newBigUint64ArrayObject)
+func (r *Runtime) newBigUint64Array(args []Value, newTarget, proto *Object) *Object {
+	return r._newTypedArray(args, newTarget, r.newBigUint64ArrayObject, proto)
 }
 
 func (r *Runtime) createArrayBufferProto(val *Object) objectImpl {

+ 1 - 1
compiler_expr.go

@@ -2,11 +2,11 @@ package goja
 
 import (
 	"fmt"
-	"math/big"
 	"github.com/dop251/goja/ast"
 	"github.com/dop251/goja/file"
 	"github.com/dop251/goja/token"
 	"github.com/dop251/goja/unistring"
+	"math/big"
 )
 
 type compiledExpr interface {

+ 1 - 1
runtime.go

@@ -75,7 +75,7 @@ type global struct {
 	Float32Array      *Object
 	Float64Array      *Object
 	BigInt64Array     *Object
-	BigUint64Array     *Object
+	BigUint64Array    *Object
 
 	WeakSet *Object
 	WeakMap *Object

+ 5 - 1
tc39_test.go

@@ -228,13 +228,17 @@ var (
 
 		// Left-hand side as a CoverParenthesizedExpression
 		"test/language/expressions/assignment/fn-name-lhs-cover.js": true,
+
+		// multiplicative order of evaluation
+		"test/language/expressions/multiplication/order-of-evaluation.js": true,
+		"test/language/expressions/division/order-of-evaluation.js":       true,
+		"test/language/expressions/modulus/order-of-evaluation.js":        true,
 	}
 
 	featuresBlackList = []string{
 		"async-iteration",
 		"Symbol.asyncIterator",
 		"async-functions",
-		"BigInt",
 		"class",
 		"class-static-block",
 		"class-fields-private",