Rename Hint.None to Hint.Default (cf. "default" argument of Symbol.toPrimitive method).

Author: woess

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/ConstructorBuiltins.java

@@ -995,7 +995,7 @@ public ConstructDateNode(JSContext context, JSBuiltin builtin, boolean isNewTarg
         private Object toPrimitive(Object target) {
             if (toPrimitiveNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                toPrimitiveNode = insert(JSToPrimitiveNode.createHintNone());
+                toPrimitiveNode = insert(JSToPrimitiveNode.createHintDefault());
             }
             return toPrimitiveNode.execute(target);
         }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/TestV8Builtins.java

@@ -191,7 +191,7 @@ protected Object createNode(JSContext context, JSBuiltin builtin, boolean constr
             case toName:
                 return TestV8ToNameNodeGen.create(context, builtin, args().fixedArgs(1).createArgumentNodes(context));
             case toPrimitive:
-                return TestV8ToPrimitiveNodeGen.create(context, builtin, JSToPrimitiveNode.Hint.None, args().fixedArgs(1).createArgumentNodes(context));
+                return TestV8ToPrimitiveNodeGen.create(context, builtin, JSToPrimitiveNode.Hint.Default, args().fixedArgs(1).createArgumentNodes(context));
             case toPrimitiveString:
                 return TestV8ToPrimitiveNodeGen.create(context, builtin, JSToPrimitiveNode.Hint.String, args().fixedArgs(1).createArgumentNodes(context));
             case toPrimitiveNumber:

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/binary/JSAddConstantLeftNumberNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -147,7 +147,7 @@ protected Object doNumberString(TruffleString right,
 
     @Specialization
     protected Object doOverloaded(JSOverloadedOperatorsObject right,
-                    @Cached("createHintNone(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode) {
+                    @Cached("createHintDefault(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode) {
         return overloadedOperatorNode.execute(getLeftValue(), right);
     }
 
@@ -157,7 +157,7 @@ protected TruffleString getOverloadedOperatorName() {
 
     @Specialization(guards = {"!hasOverloadedOperators(right)"}, replaces = {"doInt", "doDouble", "doNumberString"})
     protected Object doPrimitiveConversion(Object right,
-                    @Cached("createHintNone()") JSToPrimitiveNode toPrimitiveB,
+                    @Cached("createHintDefault()") JSToPrimitiveNode toPrimitiveB,
                     @Cached("create()") JSToNumberNode toNumberB,
                     @Cached("leftValueToString()") TruffleString leftString,
                     @Cached("create()") JSConcatStringsNode createLazyString,

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/binary/JSAddConstantRightNumberNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -156,7 +156,7 @@ protected TruffleString doStringNumber(TruffleString a,
 
     @Specialization
     protected Object doOverloaded(JSOverloadedOperatorsObject a,
-                    @Cached("createHintNone(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode) {
+                    @Cached("createHintDefault(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode) {
         return overloadedOperatorNode.execute(a, getRightValue());
     }
 
@@ -166,7 +166,7 @@ protected TruffleString getOverloadedOperatorName() {
 
     @Specialization(guards = {"!hasOverloadedOperators(a)"}, replaces = {"doInt", "doDouble", "doStringNumber"})
     protected Object doPrimitiveConversion(Object a,
-                    @Cached("createHintNone()") JSToPrimitiveNode toPrimitiveA,
+                    @Cached("createHintDefault()") JSToPrimitiveNode toPrimitiveA,
                     @Cached("create()") JSToNumberNode toNumberA,
                     @Cached("rightValueToString()") TruffleString rightString,
                     @Cached("create()") JSConcatStringsNode createLazyString,

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/binary/JSAddNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -214,7 +214,7 @@ protected Object doNumberString(Object a, TruffleString b,
      */
     @Specialization(guards = "hasOverloadedOperators(a) || hasOverloadedOperators(b)")
     protected Object doOverloaded(Object a, Object b,
-                    @Cached("createHintNone(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode) {
+                    @Cached("createHintDefault(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode) {
         return overloadedOperatorNode.execute(a, b);
     }
 
@@ -225,8 +225,8 @@ protected TruffleString getOverloadedOperatorName() {
     @Specialization(guards = {"!hasOverloadedOperators(a)", "!hasOverloadedOperators(b)"}, replaces = {"doInt", "doIntOverflow", "doIntTruncate", "doSafeInteger",
                     "doIntSafeInteger", "doSafeIntegerInt", "doDouble", "doBigInt", "doString", "doStringInt", "doIntString", "doStringNumber", "doNumberString"})
     protected Object doPrimitiveConversion(Object a, Object b,
-                    @Cached("createHintNone()") JSToPrimitiveNode toPrimitiveA,
-                    @Cached("createHintNone()") JSToPrimitiveNode toPrimitiveB,
+                    @Cached("createHintDefault()") JSToPrimitiveNode toPrimitiveA,
+                    @Cached("createHintDefault()") JSToPrimitiveNode toPrimitiveB,
                     @Cached("create()") JSToNumericNode toNumericA,
                     @Cached("create()") JSToNumericNode toNumericB,
                     @Cached("create()") JSToStringNode toStringA,

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/binary/JSEqualNode.java

@@ -222,7 +222,7 @@ protected static boolean doRightNullOrUndefined(Object a, @SuppressWarnings("unu
 
     @Specialization(guards = {"hasOverloadedOperators(a) || hasOverloadedOperators(b)"})
     protected boolean doOverloaded(Object a, Object b,
-                    @Cached("createHintNone(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode,
+                    @Cached("createHintDefault(getOverloadedOperatorName())") JSOverloadedBinaryNode overloadedOperatorNode,
                     @Cached("create()") JSToBooleanNode toBooleanNode) {
         if (a == b) {
             return true;
@@ -250,7 +250,7 @@ protected static boolean doJSObject(JSDynamicObject a, JSObject b) {
     @Specialization(guards = {"!hasOverloadedOperators(a)", "isPrimitiveNode.executeBoolean(b)"}, limit = "1")
     protected boolean doJSObjectVsPrimitive(JSObject a, Object b,
                     @Shared("bInterop") @CachedLibrary(limit = "InteropLibraryLimit") InteropLibrary bInterop,
-                    @Shared("toPrimitive") @Cached("createHintNone()") JSToPrimitiveNode toPrimitiveNode,
+                    @Shared("toPrimitive") @Cached("createHintDefault()") JSToPrimitiveNode toPrimitiveNode,
                     @Shared("isPrimitive") @Cached @SuppressWarnings("unused") IsPrimitiveNode isPrimitiveNode,
                     @Shared("equal") @Cached JSEqualNode nestedEqualNode) {
         if (isNullish(b, bInterop)) {
@@ -262,7 +262,7 @@ protected boolean doJSObjectVsPrimitive(JSObject a, Object b,
     @Specialization(guards = {"!hasOverloadedOperators(b)", "isPrimitiveNode.executeBoolean(a)"}, limit = "1")
     protected boolean doJSObjectVsPrimitive(Object a, JSObject b,
                     @Shared("aInterop") @CachedLibrary(limit = "InteropLibraryLimit") InteropLibrary aInterop,
-                    @Shared("toPrimitive") @Cached("createHintNone()") JSToPrimitiveNode toPrimitiveNode,
+                    @Shared("toPrimitive") @Cached("createHintDefault()") JSToPrimitiveNode toPrimitiveNode,
                     @Shared("isPrimitive") @Cached @SuppressWarnings("unused") IsPrimitiveNode isPrimitiveNode,
                     @Shared("equal") @Cached JSEqualNode nestedEqualNode) {
         if (isNullish(a, aInterop)) {
@@ -317,7 +317,7 @@ protected boolean doForeign(Object a, Object b,
                     @Bind("isForeignObject(b)") boolean isBForeign,
                     @Shared("aInterop") @CachedLibrary(limit = "InteropLibraryLimit") InteropLibrary aInterop,
                     @Shared("bInterop") @CachedLibrary(limit = "InteropLibraryLimit") InteropLibrary bInterop,
-                    @Shared("toPrimitive") @Cached("createHintNone()") JSToPrimitiveNode toPrimitiveNode,
+                    @Shared("toPrimitive") @Cached("createHintDefault()") JSToPrimitiveNode toPrimitiveNode,
                     @Shared("isPrimitive") @Cached IsPrimitiveNode isPrimitiveNode,
                     @Shared("equal") @Cached JSEqualNode nestedEqualNode) {
         assert a != null && b != null;

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/binary/JSOverloadedBinaryNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -107,8 +107,8 @@ public static JSOverloadedBinaryNode create(TruffleString overloadedOperatorName
         return JSOverloadedBinaryNodeGen.create(overloadedOperatorName, false, hint, true);
     }
 
-    public static JSOverloadedBinaryNode createHintNone(TruffleString overloadedOperatorName) {
-        return JSOverloadedBinaryNodeGen.create(overloadedOperatorName, false, Hint.None, true);
+    public static JSOverloadedBinaryNode createHintDefault(TruffleString overloadedOperatorName) {
+        return JSOverloadedBinaryNodeGen.create(overloadedOperatorName, false, Hint.Default, true);
     }
 
     public static JSOverloadedBinaryNode createHintNumber(TruffleString overloadedOperatorName) {

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/cast/JSToOperandNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -64,8 +64,8 @@ protected JSToOperandNode(Hint hint, boolean checkOperatorAllowed) {
         this.checkOperatorAllowed = checkOperatorAllowed;
     }
 
-    public static JSToOperandNode createHintNone() {
-        return create(Hint.None);
+    public static JSToOperandNode createHintDefault() {
+        return create(Hint.Default);
     }
 
     public static JSToOperandNode createHintString() {

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/cast/JSToPrimitiveNode.java

@@ -86,7 +86,7 @@ public abstract class JSToPrimitiveNode extends JavaScriptBaseNode {
     @Child private OrdinaryToPrimitiveNode ordinaryToPrimitiveNode;
 
     public enum Hint {
-        None(Strings.HINT_DEFAULT),
+        Default(Strings.HINT_DEFAULT),
         Number(Strings.HINT_NUMBER),
         String(Strings.HINT_STRING);
 
@@ -109,8 +109,8 @@ protected JSToPrimitiveNode(Hint hint) {
 
     public abstract Object execute(Object value);
 
-    public static JSToPrimitiveNode createHintNone() {
-        return create(Hint.None);
+    public static JSToPrimitiveNode createHintDefault() {
+        return create(Hint.Default);
     }
 
     public static JSToPrimitiveNode createHintString() {
@@ -198,7 +198,7 @@ protected final boolean isHintString() {
     }
 
     protected final boolean isHintNumber() {
-        return hint == Hint.Number || hint == Hint.None;
+        return hint == Hint.Number || hint == Hint.Default;
     }
 
     @Specialization(guards = "isForeignObject(object)", limit = "InteropLibraryLimit")

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRuntime.java

@@ -285,7 +285,7 @@ public static boolean isNullish(Object value) {
      */
     @TruffleBoundary
     public static Object toPrimitive(Object value) {
-        return toPrimitive(value, JSToPrimitiveNode.Hint.None);
+        return toPrimitive(value, JSToPrimitiveNode.Hint.Default);
     }
 
     /**
@@ -326,7 +326,7 @@ public static Object toPrimitiveFromForeign(Object tObj, JSToPrimitiveNode.Hint
                 return maybeResult;
             }
         }
-        return foreignOrdinaryToPrimitive(tObj, hint == JSToPrimitiveNode.Hint.None ? JSToPrimitiveNode.Hint.Number : hint);
+        return foreignOrdinaryToPrimitive(tObj, hint == JSToPrimitiveNode.Hint.Default ? JSToPrimitiveNode.Hint.Number : hint);
     }
 
     @TruffleBoundary