From 436ad9cdfd95ac84147ea821af6a369f708314ae Mon Sep 17 00:00:00 2001 From: Mike Pennisi Date: Fri, 22 Apr 2016 16:29:24 -0400 Subject: [PATCH] fixup! Module semantics: evaluation Implement suggested modification to naming scheme. --- .../eval-gtbndng-indirect-trlng-comma.js | 2 +- ...eval-gtbndng-indirect-trlng-comma_FIXTURE.js} | 0 .../eval-gtbndng-indirect-update-as.js | 2 +- ...> eval-gtbndng-indirect-update-as_FIXTURE.js} | 0 .../eval-gtbndng-indirect-update-dflt.js | 2 +- ...eval-gtbndng-indirect-update-dflt_FIXTURE.js} | 0 .../module-code/eval-gtbndng-indirect-update.js | 2 +- ...s => eval-gtbndng-indirect-update_FIXTURE.js} | 0 ....js => eval-rqstd-abrupt-err-type_FIXTURE.js} | 0 ..._.js => eval-rqstd-abrupt-err-uri_FIXTURE.js} | 0 test/language/module-code/eval-rqstd-abrupt.js | 4 ++-- test/language/module-code/eval-rqstd-once.js | 16 ++++++++-------- ...rqstd-once_.js => eval-rqstd-once_FIXTURE.js} | 0 ...order-1_.js => eval-rqstd-order-1_FIXTURE.js} | 0 ...order-2_.js => eval-rqstd-order-2_FIXTURE.js} | 0 ...order-3_.js => eval-rqstd-order-3_FIXTURE.js} | 0 ...order-4_.js => eval-rqstd-order-4_FIXTURE.js} | 0 ...order-5_.js => eval-rqstd-order-5_FIXTURE.js} | 0 ...order-6_.js => eval-rqstd-order-6_FIXTURE.js} | 0 ...order-7_.js => eval-rqstd-order-7_FIXTURE.js} | 0 ...order-8_.js => eval-rqstd-order-8_FIXTURE.js} | 0 test/language/module-code/eval-rqstd-order.js | 16 ++++++++-------- 22 files changed, 22 insertions(+), 22 deletions(-) rename test/language/module-code/{eval-gtbndng-indirect-trlng-comma_.js => eval-gtbndng-indirect-trlng-comma_FIXTURE.js} (100%) rename test/language/module-code/{eval-gtbndng-indirect-update-as_.js => eval-gtbndng-indirect-update-as_FIXTURE.js} (100%) rename test/language/module-code/{eval-gtbndng-indirect-update-dflt_.js => eval-gtbndng-indirect-update-dflt_FIXTURE.js} (100%) rename test/language/module-code/{eval-gtbndng-indirect-update_.js => eval-gtbndng-indirect-update_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-abrupt-err-type_.js => eval-rqstd-abrupt-err-type_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-abrupt-err-uri_.js => eval-rqstd-abrupt-err-uri_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-once_.js => eval-rqstd-once_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-1_.js => eval-rqstd-order-1_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-2_.js => eval-rqstd-order-2_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-3_.js => eval-rqstd-order-3_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-4_.js => eval-rqstd-order-4_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-5_.js => eval-rqstd-order-5_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-6_.js => eval-rqstd-order-6_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-7_.js => eval-rqstd-order-7_FIXTURE.js} (100%) rename test/language/module-code/{eval-rqstd-order-8_.js => eval-rqstd-order-8_FIXTURE.js} (100%) diff --git a/test/language/module-code/eval-gtbndng-indirect-trlng-comma.js b/test/language/module-code/eval-gtbndng-indirect-trlng-comma.js index 045522c6a5..3bff206700 100644 --- a/test/language/module-code/eval-gtbndng-indirect-trlng-comma.js +++ b/test/language/module-code/eval-gtbndng-indirect-trlng-comma.js @@ -18,6 +18,6 @@ info: | flags: [module] ---*/ -import { x , } from './eval-gtbndng-indirect-trlng-comma_.js'; +import { x , } from './eval-gtbndng-indirect-trlng-comma_FIXTURE.js'; assert.sameValue(x, 1); diff --git a/test/language/module-code/eval-gtbndng-indirect-trlng-comma_.js b/test/language/module-code/eval-gtbndng-indirect-trlng-comma_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-gtbndng-indirect-trlng-comma_.js rename to test/language/module-code/eval-gtbndng-indirect-trlng-comma_FIXTURE.js diff --git a/test/language/module-code/eval-gtbndng-indirect-update-as.js b/test/language/module-code/eval-gtbndng-indirect-update-as.js index 410017adf5..cbe8afceff 100644 --- a/test/language/module-code/eval-gtbndng-indirect-update-as.js +++ b/test/language/module-code/eval-gtbndng-indirect-update-as.js @@ -20,7 +20,7 @@ includes: [fnGlobalObject.js] flags: [module] ---*/ -import { x as y, x as z } from './eval-gtbndng-indirect-update-as_.js'; +import { x as y, x as z } from './eval-gtbndng-indirect-update-as_FIXTURE.js'; assert.sameValue(y, 1); assert.sameValue(z, 1); diff --git a/test/language/module-code/eval-gtbndng-indirect-update-as_.js b/test/language/module-code/eval-gtbndng-indirect-update-as_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-gtbndng-indirect-update-as_.js rename to test/language/module-code/eval-gtbndng-indirect-update-as_FIXTURE.js diff --git a/test/language/module-code/eval-gtbndng-indirect-update-dflt.js b/test/language/module-code/eval-gtbndng-indirect-update-dflt.js index ef0477d2a6..d5ffcf57f1 100644 --- a/test/language/module-code/eval-gtbndng-indirect-update-dflt.js +++ b/test/language/module-code/eval-gtbndng-indirect-update-dflt.js @@ -18,7 +18,7 @@ info: | flags: [module] ---*/ -import val from './eval-gtbndng-indirect-update-dflt_.js'; +import val from './eval-gtbndng-indirect-update-dflt_FIXTURE.js'; assert.sameValue(val(), 1); assert.sameValue(val, 2); diff --git a/test/language/module-code/eval-gtbndng-indirect-update-dflt_.js b/test/language/module-code/eval-gtbndng-indirect-update-dflt_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-gtbndng-indirect-update-dflt_.js rename to test/language/module-code/eval-gtbndng-indirect-update-dflt_FIXTURE.js diff --git a/test/language/module-code/eval-gtbndng-indirect-update.js b/test/language/module-code/eval-gtbndng-indirect-update.js index 6bb489a58e..14cdab3160 100644 --- a/test/language/module-code/eval-gtbndng-indirect-update.js +++ b/test/language/module-code/eval-gtbndng-indirect-update.js @@ -20,7 +20,7 @@ includes: [fnGlobalObject.js] flags: [module] ---*/ -import { x } from './eval-gtbndng-indirect-update_.js'; +import { x } from './eval-gtbndng-indirect-update_FIXTURE.js'; assert.sameValue(x, 1); diff --git a/test/language/module-code/eval-gtbndng-indirect-update_.js b/test/language/module-code/eval-gtbndng-indirect-update_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-gtbndng-indirect-update_.js rename to test/language/module-code/eval-gtbndng-indirect-update_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-abrupt-err-type_.js b/test/language/module-code/eval-rqstd-abrupt-err-type_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-abrupt-err-type_.js rename to test/language/module-code/eval-rqstd-abrupt-err-type_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-abrupt-err-uri_.js b/test/language/module-code/eval-rqstd-abrupt-err-uri_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-abrupt-err-uri_.js rename to test/language/module-code/eval-rqstd-abrupt-err-uri_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-abrupt.js b/test/language/module-code/eval-rqstd-abrupt.js index cad22d1e3e..b52242627f 100644 --- a/test/language/module-code/eval-rqstd-abrupt.js +++ b/test/language/module-code/eval-rqstd-abrupt.js @@ -14,7 +14,7 @@ negative: TypeError flags: [module] ---*/ -import './eval-rqstd-abrupt-err-type_.js'; -import './eval-rqstd-abrupt-err-uri_.js'; +import './eval-rqstd-abrupt-err-type_FIXTURE.js'; +import './eval-rqstd-abrupt-err-uri_FIXTURE.js'; throw new RangeError(); diff --git a/test/language/module-code/eval-rqstd-once.js b/test/language/module-code/eval-rqstd-once.js index b263ece030..93a3779be8 100644 --- a/test/language/module-code/eval-rqstd-once.js +++ b/test/language/module-code/eval-rqstd-once.js @@ -15,14 +15,14 @@ includes: [fnGlobalObject.js] flags: [module] ---*/ -import {} from './eval-rqstd-once_.js'; -import './eval-rqstd-once_.js'; -import * as ns1 from './eval-rqstd-once_.js'; -import dflt1 from './eval-rqstd-once_.js'; -export {} from './eval-rqstd-once_.js'; -import dflt2, {} from './eval-rqstd-once_.js'; -export * from './eval-rqstd-once_.js'; -import dflt3, * as ns from './eval-rqstd-once_.js'; +import {} from './eval-rqstd-once_FIXTURE.js'; +import './eval-rqstd-once_FIXTURE.js'; +import * as ns1 from './eval-rqstd-once_FIXTURE.js'; +import dflt1 from './eval-rqstd-once_FIXTURE.js'; +export {} from './eval-rqstd-once_FIXTURE.js'; +import dflt2, {} from './eval-rqstd-once_FIXTURE.js'; +export * from './eval-rqstd-once_FIXTURE.js'; +import dflt3, * as ns from './eval-rqstd-once_FIXTURE.js'; export default null; var global = fnGlobalObject(); diff --git a/test/language/module-code/eval-rqstd-once_.js b/test/language/module-code/eval-rqstd-once_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-once_.js rename to test/language/module-code/eval-rqstd-once_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-1_.js b/test/language/module-code/eval-rqstd-order-1_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-1_.js rename to test/language/module-code/eval-rqstd-order-1_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-2_.js b/test/language/module-code/eval-rqstd-order-2_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-2_.js rename to test/language/module-code/eval-rqstd-order-2_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-3_.js b/test/language/module-code/eval-rqstd-order-3_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-3_.js rename to test/language/module-code/eval-rqstd-order-3_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-4_.js b/test/language/module-code/eval-rqstd-order-4_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-4_.js rename to test/language/module-code/eval-rqstd-order-4_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-5_.js b/test/language/module-code/eval-rqstd-order-5_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-5_.js rename to test/language/module-code/eval-rqstd-order-5_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-6_.js b/test/language/module-code/eval-rqstd-order-6_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-6_.js rename to test/language/module-code/eval-rqstd-order-6_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-7_.js b/test/language/module-code/eval-rqstd-order-7_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-7_.js rename to test/language/module-code/eval-rqstd-order-7_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order-8_.js b/test/language/module-code/eval-rqstd-order-8_FIXTURE.js similarity index 100% rename from test/language/module-code/eval-rqstd-order-8_.js rename to test/language/module-code/eval-rqstd-order-8_FIXTURE.js diff --git a/test/language/module-code/eval-rqstd-order.js b/test/language/module-code/eval-rqstd-order.js index c363577068..3d8ca0fdbd 100644 --- a/test/language/module-code/eval-rqstd-order.js +++ b/test/language/module-code/eval-rqstd-order.js @@ -20,18 +20,18 @@ flags: [module] assert.sameValue(fnGlobalObject().test262, '12345678'); -import {} from './eval-rqstd-order-1_.js'; +import {} from './eval-rqstd-order-1_FIXTURE.js'; -import './eval-rqstd-order-2_.js'; +import './eval-rqstd-order-2_FIXTURE.js'; -import * as ns1 from './eval-rqstd-order-3_.js'; +import * as ns1 from './eval-rqstd-order-3_FIXTURE.js'; -import dflt1 from './eval-rqstd-order-4_.js'; +import dflt1 from './eval-rqstd-order-4_FIXTURE.js'; -export {} from './eval-rqstd-order-5_.js'; +export {} from './eval-rqstd-order-5_FIXTURE.js'; -import dflt2, {} from './eval-rqstd-order-6_.js'; +import dflt2, {} from './eval-rqstd-order-6_FIXTURE.js'; -export * from './eval-rqstd-order-7_.js'; +export * from './eval-rqstd-order-7_FIXTURE.js'; -import dflt3, * as ns from './eval-rqstd-order-8_.js'; +import dflt3, * as ns from './eval-rqstd-order-8_FIXTURE.js';