Renaming module record's [[AsyncEvaluating]] to [[AsyncEvaluation]].

Author: iamstolis

graal-js/src/com.oracle.truffle.js.parser/src/com/oracle/truffle/js/parser/GraalJSEvaluator.java

@@ -688,7 +688,7 @@ public Object moduleEvaluation(JSRealm realm, JSModuleRecord moduleRecord) {
                 innerModuleEvaluation(realm, module, stack, 0);
                 assert module.getStatus() == Status.Evaluated;
                 assert module.getEvaluationError() == null;
-                if (!module.isAsyncEvaluating()) {
+                if (!module.isAsyncEvaluation()) {
                     JSFunction.call(JSArguments.create(Undefined.instance, capability.getResolve(), Undefined.instance));
                 }
                 assert stack.isEmpty();
@@ -769,14 +769,14 @@ private int innerModuleEvaluation(JSRealm realm, JSModuleRecord moduleRecord, De
                     throw JSRuntime.rethrow(moduleRecord.getEvaluationError());
                 }
             }
-            if (requiredModule.isAsyncEvaluating()) {
+            if (requiredModule.isAsyncEvaluation()) {
                 moduleRecord.incPendingAsyncDependencies();
                 requiredModule.appendAsyncParentModules(moduleRecord);
             }
         }
         if (moduleRecord.getPendingAsyncDependencies() > 0 || moduleRecord.hasTLA()) {
-            assert !moduleRecord.isAsyncEvaluating() && moduleRecord.getAsyncEvaluatingOrder() == 0;
-            moduleRecord.setAsyncEvaluating(true);
+            assert !moduleRecord.isAsyncEvaluation() && moduleRecord.getAsyncEvaluatingOrder() == 0;
+            moduleRecord.setAsyncEvaluation(true);
             moduleRecord.setAsyncEvaluatingOrder(realm.nextAsyncEvaluationOrder());
             if (moduleRecord.getPendingAsyncDependencies() == 0) {
                 moduleAsyncExecution(realm, moduleRecord);
@@ -876,7 +876,7 @@ private static void gatherAvailableAncestors(JSModuleRecord module, Set<JSModule
         for (JSModuleRecord m : module.getAsyncParentModules()) {
             if (!execList.contains(m) && m.getCycleRoot().getEvaluationError() == null) {
                 assert m.getEvaluationError() == null;
-                assert m.isAsyncEvaluating();
+                assert m.isAsyncEvaluation();
                 assert m.getPendingAsyncDependencies() > 0;
                 m.decPendingAsyncDependencies();
                 if (m.getPendingAsyncDependencies() == 0) {
@@ -891,9 +891,9 @@ private static void gatherAvailableAncestors(JSModuleRecord module, Set<JSModule
 
     @TruffleBoundary
     private static Object asyncModuleExecutionFulfilled(JSRealm realm, JSModuleRecord module, Object dynamicImportResolutionResult) {
-        assert module.isAsyncEvaluating();
+        assert module.isAsyncEvaluation();
         assert module.getEvaluationError() == null;
-        module.setAsyncEvaluating(false);
+        module.setAsyncEvaluation(false);
         if (module.getTopLevelCapability() != null) {
             assert module.getCycleRoot() == module;
             JSFunction.call(JSArguments.create(Undefined.instance, module.getTopLevelCapability().getResolve(), dynamicImportResolutionResult));
@@ -906,14 +906,14 @@ public int compare(JSModuleRecord o1, JSModuleRecord o2) {
         });
         gatherAvailableAncestors(module, execList);
         for (JSModuleRecord m : execList) {
-            if (!m.isAsyncEvaluating()) {
+            if (!m.isAsyncEvaluation()) {
                 assert m.getEvaluationError() != null;
             } else if (m.hasTLA()) {
                 moduleAsyncExecution(realm, m);
             } else {
                 try {
                     moduleExecution(realm, m, null);
-                    m.setAsyncEvaluating(false);
+                    m.setAsyncEvaluation(false);
                     if (m.getTopLevelCapability() != null) {
                         assert m.getCycleRoot() == m;
                         JSFunction.call(JSArguments.create(Undefined.instance, m.getTopLevelCapability().getResolve(), dynamicImportResolutionResult));
@@ -930,13 +930,13 @@ public int compare(JSModuleRecord o1, JSModuleRecord o2) {
     private static Object asyncModuleExecutionRejected(JSRealm realm, JSModuleRecord module, Object error) {
         assert error != null : "Cannot reject a module creation with null error";
         assert module.getStatus() == Status.Evaluated;
-        if (!module.isAsyncEvaluating()) {
+        if (!module.isAsyncEvaluation()) {
             assert module.getEvaluationError() != null;
             return Undefined.instance;
         }
         assert module.getEvaluationError() == null;
         module.setEvaluationError(JSRuntime.getException(error));
-        module.setAsyncEvaluating(false);
+        module.setAsyncEvaluation(false);
         for (JSModuleRecord m : module.getAsyncParentModules()) {
             asyncModuleExecutionRejected(realm, m, error);
         }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/promise/ImportCallNode.java

@@ -365,7 +365,7 @@ public Object execute(VirtualFrame frame) {
                         promiseThenNode.execute((DynamicObject) innerPromise, resolve, reject, moduleLoadedCapability);
                     } else {
                         Object result = finishDynamicImport(realm, moduleRecord, referencingScriptOrModule, moduleRequest);
-                        if (moduleRecord.isAsyncEvaluating()) {
+                        if (moduleRecord.isAsyncEvaluation()) {
                             // Some module import started an async loading chain. The top-level
                             // capability will reject/resolve the dynamic import promise.
                             PromiseCapabilityRecord topLevelCapability = moduleRecord.getTopLevelCapability();

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/objects/JSModuleRecord.java

@@ -243,8 +243,8 @@ public void setUninstantiated() {
     private JSModuleRecord cycleRoot = this;
     // [[HasTLA]]
     private final boolean hasTLA;
-    // [[AsyncEvaluating]]
-    private boolean asyncEvaluating = false;
+    // [[AsyncEvaluation]]
+    private boolean asyncEvaluation = false;
     private long asyncEvaluatingOrder;
     // [[TopLevelCapability]]
     private PromiseCapabilityRecord topLevelPromiseCapability = null;
@@ -261,8 +261,8 @@ public void setTopLevelCapability(PromiseCapabilityRecord capability) {
         this.topLevelPromiseCapability = capability;
     }
 
-    public boolean isAsyncEvaluating() {
-        return asyncEvaluating;
+    public boolean isAsyncEvaluation() {
+        return asyncEvaluation;
     }
 
     public List<JSModuleRecord> getAsyncParentModules() {
@@ -294,8 +294,8 @@ public int getPendingAsyncDependencies() {
         return pendingAsyncDependencies;
     }
 
-    public void setAsyncEvaluating(boolean value) {
-        asyncEvaluating = value;
+    public void setAsyncEvaluation(boolean value) {
+        asyncEvaluation = value;
     }
 
     public void setAsyncEvaluatingOrder(long order) {