From e0120fcbd601d091760955bdaa11c4bb91a87809 Mon Sep 17 00:00:00 2001
From: Mike Pennisi <mike@mikepennisi.com>
Date: Sun, 31 Mar 2019 20:19:49 -0400
Subject: [PATCH] Refactor literal tests for parsers

The tests for the parsing of literal values were expressed using eval.
This made the tests more complex than necessary and also prevented the
tests from providing value to ECMAScript parsers.

Remove the use of eval and instead express the expectations with literal
source text. Rename the files to make each test's purpose more clear.
---
 ...8.3-6-s.js => legacy-octal-integery-000-strict} | 14 +++++---------
 ...8.3-7-s.js => legacy-octal-integery-005-strict} | 14 +++++---------
 ....8.3-3-s.js => legacy-octal-integery-01-strict} | 14 +++++---------
 ...8.3-1-s.js => legacy-octal-integery-010-strict} | 14 +++++---------
 ....8.3-4-s.js => legacy-octal-integery-06-strict} | 14 +++++---------
 ....8.3-5-s.js => legacy-octal-integery-07-strict} | 14 +++++---------
 6 files changed, 30 insertions(+), 54 deletions(-)
 rename test/language/literals/numeric/{7.8.3-6-s.js => legacy-octal-integery-000-strict} (61%)
 rename test/language/literals/numeric/{7.8.3-7-s.js => legacy-octal-integery-005-strict} (61%)
 rename test/language/literals/numeric/{7.8.3-3-s.js => legacy-octal-integery-01-strict} (61%)
 rename test/language/literals/numeric/{7.8.3-1-s.js => legacy-octal-integery-010-strict} (61%)
 rename test/language/literals/numeric/{7.8.3-4-s.js => legacy-octal-integery-06-strict} (61%)
 rename test/language/literals/numeric/{7.8.3-5-s.js => legacy-octal-integery-07-strict} (61%)

diff --git a/test/language/literals/numeric/7.8.3-6-s.js b/test/language/literals/numeric/legacy-octal-integery-000-strict
similarity index 61%
rename from test/language/literals/numeric/7.8.3-6-s.js
rename to test/language/literals/numeric/legacy-octal-integery-000-strict
index d71528b639..a62ef52b27 100644
--- a/test/language/literals/numeric/7.8.3-6-s.js
+++ b/test/language/literals/numeric/legacy-octal-integery-000-strict
@@ -4,16 +4,12 @@
 /*---
 es5id: 7.8.3-6-s
 description: Strict Mode - octal extension (000) is forbidden in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-var err = null;
+$DONOTEVALUATE();
 
-try {
-  eval("var _7_8_3_6 = 000;");
-} catch (e) {
-  err = e;
-}
-
-assert(err instanceof SyntaxError);
-assert.sameValue(typeof _7_8_3_6, "undefined");
+000;
diff --git a/test/language/literals/numeric/7.8.3-7-s.js b/test/language/literals/numeric/legacy-octal-integery-005-strict
similarity index 61%
rename from test/language/literals/numeric/7.8.3-7-s.js
rename to test/language/literals/numeric/legacy-octal-integery-005-strict
index 0f755cdb1d..f32c082333 100644
--- a/test/language/literals/numeric/7.8.3-7-s.js
+++ b/test/language/literals/numeric/legacy-octal-integery-005-strict
@@ -4,16 +4,12 @@
 /*---
 es5id: 7.8.3-7-s
 description: Strict Mode - octal extension (005) is forbidden in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-var err = null;
+$DONOTEVALUATE();
 
-try {
-  eval("var _7_8_3_7 = 005;");
-} catch (e) {
-  err = e;
-}
-
-assert(err instanceof SyntaxError);
-assert.sameValue(typeof _7_8_3_7, "undefined");
+005;
diff --git a/test/language/literals/numeric/7.8.3-3-s.js b/test/language/literals/numeric/legacy-octal-integery-01-strict
similarity index 61%
rename from test/language/literals/numeric/7.8.3-3-s.js
rename to test/language/literals/numeric/legacy-octal-integery-01-strict
index 18b4da88da..fc89b50f41 100644
--- a/test/language/literals/numeric/7.8.3-3-s.js
+++ b/test/language/literals/numeric/legacy-octal-integery-01-strict
@@ -4,16 +4,12 @@
 /*---
 es5id: 7.8.3-3-s
 description: Strict Mode - octal extension (01) is forbidden in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-var err = null;
+$DONOTEVALUATE();
 
-try {
-  eval("var _7_8_3_3 = 01;");
-} catch (e) {
-  err = e;
-}
-
-assert(err instanceof SyntaxError);
-assert.sameValue(typeof _7_8_3_3, "undefined");
+01;
diff --git a/test/language/literals/numeric/7.8.3-1-s.js b/test/language/literals/numeric/legacy-octal-integery-010-strict
similarity index 61%
rename from test/language/literals/numeric/7.8.3-1-s.js
rename to test/language/literals/numeric/legacy-octal-integery-010-strict
index 87480a5df6..7bb23e259d 100644
--- a/test/language/literals/numeric/7.8.3-1-s.js
+++ b/test/language/literals/numeric/legacy-octal-integery-010-strict
@@ -4,16 +4,12 @@
 /*---
 es5id: 7.8.3-1-s
 description: Strict Mode - octal extension (010) is forbidden in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-var err = null;
+$DONOTEVALUATE();
 
-try {
-  eval("var _7_8_3_1 = 010;");
-} catch (e) {
-  err = e;
-}
-
-assert(err instanceof SyntaxError);
-assert.sameValue(typeof _7_8_3_1, "undefined");
+010;
diff --git a/test/language/literals/numeric/7.8.3-4-s.js b/test/language/literals/numeric/legacy-octal-integery-06-strict
similarity index 61%
rename from test/language/literals/numeric/7.8.3-4-s.js
rename to test/language/literals/numeric/legacy-octal-integery-06-strict
index 79fe5aa2e8..ac6eab9cf7 100644
--- a/test/language/literals/numeric/7.8.3-4-s.js
+++ b/test/language/literals/numeric/legacy-octal-integery-06-strict
@@ -4,16 +4,12 @@
 /*---
 es5id: 7.8.3-4-s
 description: Strict Mode - octal extension (06) is forbidden in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-var err = null;
+$DONOTEVALUATE();
 
-try {
-  eval("var _7_8_3_4 = 06;");
-} catch (e) {
-  err = e;
-}
-
-assert(err instanceof SyntaxError);
-assert.sameValue(typeof _7_8_3_4, "undefined");
+06;
diff --git a/test/language/literals/numeric/7.8.3-5-s.js b/test/language/literals/numeric/legacy-octal-integery-07-strict
similarity index 61%
rename from test/language/literals/numeric/7.8.3-5-s.js
rename to test/language/literals/numeric/legacy-octal-integery-07-strict
index 2361233a7a..ac5c6bd3fe 100644
--- a/test/language/literals/numeric/7.8.3-5-s.js
+++ b/test/language/literals/numeric/legacy-octal-integery-07-strict
@@ -4,16 +4,12 @@
 /*---
 es5id: 7.8.3-5-s
 description: Strict Mode - octal extension (07) is forbidden in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-var err = null;
+$DONOTEVALUATE();
 
-try {
-  eval("var _7_8_3_5 = 07;");
-} catch (e) {
-  err = e;
-}
-
-assert(err instanceof SyntaxError);
-assert.sameValue(typeof _7_8_3_5, "undefined");
+07;