Change ScriptableObject to TopLevel to avoid churn later.

Author: aardvark179

examples/src/main/java/Control.java

@@ -8,6 +8,7 @@
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * Example of controlling the JavaScript execution engine.
@@ -32,7 +33,7 @@ public static void main(String[] args) {
 
             // Initialize the standard objects (Object, Function, etc.)
             // This must be done before scripts can be executed.
-            Scriptable scope = cx.initStandardObjects();
+            TopLevel scope = cx.initStandardObjects();
 
             // Now we can evaluate a script. Let's create a new object
             // using the object literal notation.

examples/src/main/java/CounterTest.java

@@ -7,6 +7,7 @@
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * An example illustrating how to create a JavaScript object and retrieve properties and call
@@ -62,7 +63,7 @@ public class CounterTest {
     public static void main(String[] args) throws Exception {
         Context cx = Context.enter();
         try {
-            Scriptable scope = cx.initStandardObjects();
+            TopLevel scope = cx.initStandardObjects();
             ScriptableObject.defineClass(scope, Counter.class);
 
             Scriptable testCounter = cx.newObject(scope, "Counter");

examples/src/main/java/DynamicScopes.java

@@ -8,7 +8,7 @@
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.Script;
 import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 
 /** Example of controlling the JavaScript with multiple scopes and threads. */
 public class DynamicScopes {
@@ -85,7 +85,7 @@ static void runScripts(Context cx, Script script) {
         // Initialize the standard objects (Object, Function, etc.)
         // This must be done before scripts can be executed. The call
         // returns a new scope that we will share.
-        ScriptableObject sharedScope = cx.initStandardObjects(null, true);
+        TopLevel sharedScope = cx.initStandardObjects(null, true);
 
         // Now we can execute the precompiled script against the scope
         // to define x variable and f function in the shared scope.

examples/src/main/java/RunScript.java

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * RunScript: simplest example of controlling execution of Rhino.
@@ -54,7 +54,7 @@ public static void main(String args[]) {
             // Initialize the standard objects (Object, Function, etc.)
             // This must be done before scripts can be executed. Returns
             // a scope object that we use in later calls.
-            Scriptable scope = cx.initStandardObjects();
+            TopLevel scope = cx.initStandardObjects();
 
             // Collect the arguments into a single string.
             String s = "";

examples/src/main/java/RunScript2.java

@@ -5,8 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * RunScript2: Like RunScript, but reflects the System.out into JavaScript.
@@ -53,7 +53,7 @@ public class RunScript2 {
     public static void main(String args[]) {
         Context cx = Context.enter();
         try {
-            Scriptable scope = cx.initStandardObjects();
+            TopLevel scope = cx.initStandardObjects();
 
             // Add a global variable "out" that is a JavaScript reflection
             // of System.out

examples/src/main/java/RunScript3.java

@@ -7,6 +7,7 @@
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * RunScript3: Example of using JavaScript objects
@@ -69,7 +70,7 @@ public class RunScript3 {
     public static void main(String args[]) {
         Context cx = Context.enter();
         try {
-            Scriptable scope = cx.initStandardObjects();
+            TopLevel scope = cx.initStandardObjects();
 
             // Collect the arguments into a single string.
             String s = "";

examples/src/main/java/RunScript4.java

@@ -7,6 +7,7 @@
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * RunScript4: Execute scripts in an environment that includes the example Counter class.
@@ -69,7 +70,7 @@ public class RunScript4 {
     public static void main(String args[]) throws Exception {
         Context cx = Context.enter();
         try {
-            Scriptable scope = cx.initStandardObjects();
+            TopLevel scope = cx.initStandardObjects();
 
             // Use the Counter class to define a Counter constructor
             // and prototype in JavaScript.

rhino-engine/src/main/java/org/mozilla/javascript/engine/Builtins.java

@@ -13,6 +13,7 @@
 import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.TopLevel;
 import org.mozilla.javascript.Undefined;
 
 /**
@@ -29,20 +30,21 @@ public class Builtins {
 
     private Writer stdout;
 
-    void register(Context cx, ScriptableObject scope, ScriptContext sc) {
+    void register(Context cx, TopLevel scope, ScriptContext sc) {
         if (sc.getWriter() == null) {
             stdout = new OutputStreamWriter(System.out, StandardCharsets.UTF_8);
         } else {
             stdout = sc.getWriter();
         }
 
-        scope.defineProperty(
-                scope,
-                "print",
-                0,
-                Builtins::print,
-                ScriptableObject.PERMANENT | ScriptableObject.DONTENUM,
-                ScriptableObject.DONTENUM | ScriptableObject.READONLY);
+        scope.getGlobalThis()
+                .defineProperty(
+                        scope,
+                        "print",
+                        0,
+                        Builtins::print,
+                        ScriptableObject.PERMANENT | ScriptableObject.DONTENUM,
+                        ScriptableObject.DONTENUM | ScriptableObject.READONLY);
     }
 
     private static Object print(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {

rhino-xml/src/test/java/org/mozilla/javascript/tests/XMLSecureParserTest.java

@@ -12,7 +12,7 @@
 import org.junit.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ContextFactory;
-import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * Test for secure xml parsing
@@ -121,7 +121,7 @@ public void xmlInsecureConfiguration() {
     }
 
     private void executeXML(Context cx) {
-        Scriptable scope = cx.initStandardObjects();
+        TopLevel scope = cx.initStandardObjects();
         cx.evaluateString(scope, "new XML('<a></a>').toXMLString();", "source", 1, null);
     }
 

rhino-xml/src/test/java/org/mozilla/javascript/xmlimpl/tests/XmlNonResettableDocumentBuilderTest.java

@@ -6,7 +6,7 @@
 import org.junit.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ContextFactory;
-import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.TopLevel;
 
 public class XmlNonResettableDocumentBuilderTest {
     private static final String XML_PROPERTY = "javax.xml.parsers.DocumentBuilderFactory";
@@ -29,7 +29,7 @@ public void tearDown() {
     @Test
     public void nonResettableDocumentBuilder() {
         try (Context cx = new ContextFactory().enterContext()) {
-            Scriptable scope = cx.initStandardObjects();
+            TopLevel scope = cx.initStandardObjects();
             Object result =
                     cx.evaluateString(
                             scope,