From fde0d556ac1d6d1ea7983ceb761f81e5a6829561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20B=C3=A1tyai?= Date: Fri, 12 Jun 2020 17:55:00 +0200 Subject: [PATCH] Re-target for ES.Next (#3901) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A list of changes: - 'es2015-subset' profile is deprecated, and an 'es.next' profile is added. - The default profile is changed to 'es.next' - Renamed the JERRY_ES2015 guard to JERRY_ESNEXT - Renamed JERRY_ES2015_BUILTIN_* guards to JERRY_BUILTIN_* - Moved es2015 specific tests to a new 'es.next' subdirectory - Updated docs, targets, and test runners to reflect these changes Resolves #3737. JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu --- docs/00.GETTING-STARTED.md | 4 +- docs/01.CONFIGURATION.md | 2 +- docs/02.API-REFERENCE.md | 84 ++-- docs/05.PORT-API.md | 4 +- docs/15.MODULE-SYSTEM.md | 4 +- jerry-core/CMakeLists.txt | 50 ++- jerry-core/api/jerry-snapshot.c | 20 +- jerry-core/api/jerry.c | 310 ++++++------- jerry-core/config.h | 146 +++--- jerry-core/ecma/base/ecma-gc.c | 152 +++---- jerry-core/ecma/base/ecma-globals.h | 42 +- .../ecma/base/ecma-helpers-conversion.c | 4 +- jerry-core/ecma/base/ecma-helpers-string.c | 24 +- jerry-core/ecma/base/ecma-helpers-value.c | 42 +- jerry-core/ecma/base/ecma-helpers.c | 28 +- jerry-core/ecma/base/ecma-helpers.h | 44 +- jerry-core/ecma/base/ecma-init-finalize.c | 12 +- jerry-core/ecma/base/ecma-literal-storage.c | 14 +- jerry-core/ecma/base/ecma-module.c | 8 +- jerry-core/ecma/base/ecma-module.h | 4 +- .../ecma-builtin-array-iterator-prototype.c | 4 +- ...cma-builtin-array-iterator-prototype.inc.h | 4 +- ...ecma-builtin-array-prototype-unscopables.c | 4 +- ...-builtin-array-prototype-unscopables.inc.h | 4 +- .../ecma-builtin-array-prototype.c | 102 ++--- .../ecma-builtin-array-prototype.inc.h | 8 +- .../ecma/builtin-objects/ecma-builtin-array.c | 10 +- .../builtin-objects/ecma-builtin-array.inc.h | 8 +- .../ecma-builtin-arraybuffer-prototype.c | 4 +- .../ecma-builtin-arraybuffer-prototype.inc.h | 8 +- .../ecma-builtin-arraybuffer.c | 4 +- .../ecma-builtin-arraybuffer.inc.h | 4 +- .../ecma-builtin-boolean.inc.h | 4 +- .../ecma-builtin-dataview-prototype.c | 8 +- .../ecma-builtin-dataview-prototype.inc.h | 8 +- .../builtin-objects/ecma-builtin-dataview.c | 4 +- .../ecma-builtin-dataview.inc.h | 4 +- .../ecma-builtin-date-prototype.c | 12 +- .../ecma-builtin-date-prototype.inc.h | 4 +- .../ecma/builtin-objects/ecma-builtin-date.c | 8 +- .../builtin-objects/ecma-builtin-date.inc.h | 4 +- .../builtin-objects/ecma-builtin-error.inc.h | 4 +- .../ecma-builtin-evalerror.inc.h | 4 +- .../ecma-builtin-function-prototype.c | 34 +- .../ecma-builtin-function-prototype.inc.h | 8 +- .../ecma-builtin-function.inc.h | 4 +- .../ecma-builtin-generator-function.c | 4 +- .../ecma-builtin-generator-function.inc.h | 4 +- .../ecma-builtin-generator-prototype.c | 4 +- .../ecma-builtin-generator-prototype.inc.h | 4 +- .../builtin-objects/ecma-builtin-generator.c | 4 +- .../ecma-builtin-generator.inc.h | 4 +- .../builtin-objects/ecma-builtin-global.c | 4 +- .../builtin-objects/ecma-builtin-global.inc.h | 46 +- .../ecma-builtin-helpers-macro-defines.inc.h | 4 +- .../ecma-builtin-helpers-macro-undefs.inc.h | 4 +- .../builtin-objects/ecma-builtin-helpers.c | 56 +-- .../builtin-objects/ecma-builtin-helpers.h | 4 +- ...a-builtin-internal-routines-template.inc.h | 4 +- .../builtin-objects/ecma-builtin-intrinsic.c | 4 +- .../ecma-builtin-intrinsic.inc.h | 4 +- .../ecma-builtin-iterator-prototype.c | 4 +- .../ecma-builtin-iterator-prototype.inc.h | 4 +- .../ecma/builtin-objects/ecma-builtin-json.c | 12 +- .../builtin-objects/ecma-builtin-json.inc.h | 4 +- .../ecma-builtin-map-iterator-prototype.c | 4 +- .../ecma-builtin-map-iterator-prototype.inc.h | 4 +- .../ecma-builtin-map-prototype.c | 8 +- .../ecma-builtin-map-prototype.inc.h | 12 +- .../ecma/builtin-objects/ecma-builtin-map.c | 4 +- .../builtin-objects/ecma-builtin-map.inc.h | 4 +- .../ecma/builtin-objects/ecma-builtin-math.c | 28 +- .../builtin-objects/ecma-builtin-math.inc.h | 8 +- .../builtin-objects/ecma-builtin-number.c | 4 +- .../builtin-objects/ecma-builtin-number.inc.h | 8 +- .../ecma-builtin-object-prototype.c | 12 +- .../builtin-objects/ecma-builtin-object.c | 142 +++--- .../builtin-objects/ecma-builtin-object.inc.h | 12 +- .../ecma-builtin-promise-prototype.c | 4 +- .../ecma-builtin-promise-prototype.inc.h | 8 +- .../builtin-objects/ecma-builtin-promise.c | 4 +- .../ecma-builtin-promise.inc.h | 4 +- .../ecma/builtin-objects/ecma-builtin-proxy.c | 4 +- .../builtin-objects/ecma-builtin-proxy.inc.h | 4 +- .../ecma-builtin-rangeerror.inc.h | 4 +- .../ecma-builtin-referenceerror.inc.h | 4 +- .../builtin-objects/ecma-builtin-reflect.c | 12 +- .../ecma-builtin-reflect.inc.h | 4 +- .../ecma-builtin-regexp-prototype.c | 24 +- .../ecma-builtin-regexp-prototype.inc.h | 6 +- .../builtin-objects/ecma-builtin-regexp.c | 24 +- .../builtin-objects/ecma-builtin-regexp.inc.h | 4 +- .../ecma-builtin-set-iterator-prototype.c | 4 +- .../ecma-builtin-set-iterator-prototype.inc.h | 4 +- .../ecma-builtin-set-prototype.c | 8 +- .../ecma-builtin-set-prototype.inc.h | 12 +- .../ecma/builtin-objects/ecma-builtin-set.c | 4 +- .../builtin-objects/ecma-builtin-set.inc.h | 4 +- .../ecma-builtin-string-iterator-prototype.c | 4 +- ...ma-builtin-string-iterator-prototype.inc.h | 4 +- .../ecma-builtin-string-prototype.c | 46 +- .../ecma-builtin-string-prototype.inc.h | 4 +- .../builtin-objects/ecma-builtin-string.c | 12 +- .../builtin-objects/ecma-builtin-string.inc.h | 8 +- .../ecma-builtin-symbol-prototype.c | 4 +- .../ecma-builtin-symbol-prototype.inc.h | 4 +- .../builtin-objects/ecma-builtin-symbol.c | 4 +- .../builtin-objects/ecma-builtin-symbol.inc.h | 4 +- .../ecma-builtin-syntaxerror.inc.h | 4 +- .../ecma-builtin-typeerror.inc.h | 4 +- .../ecma-builtin-urierror.inc.h | 4 +- .../ecma-builtin-weakmap-prototype.c | 4 +- .../ecma-builtin-weakmap-prototype.inc.h | 4 +- .../builtin-objects/ecma-builtin-weakmap.c | 4 +- .../ecma-builtin-weakmap.inc.h | 4 +- .../ecma-builtin-weakset-prototype.c | 4 +- .../ecma-builtin-weakset-prototype.inc.h | 4 +- .../builtin-objects/ecma-builtin-weakset.c | 4 +- .../ecma-builtin-weakset.inc.h | 4 +- .../builtin-objects/ecma-builtins-internal.h | 8 +- .../ecma/builtin-objects/ecma-builtins.c | 54 +-- .../ecma/builtin-objects/ecma-builtins.inc.h | 60 +-- .../ecma-builtin-float32array-prototype.c | 4 +- .../ecma-builtin-float32array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-float32array.c | 4 +- .../ecma-builtin-float32array.inc.h | 4 +- .../ecma-builtin-float64array-prototype.c | 4 +- .../ecma-builtin-float64array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-float64array.c | 4 +- .../ecma-builtin-float64array.inc.h | 4 +- .../ecma-builtin-int16array-prototype.c | 4 +- .../ecma-builtin-int16array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-int16array.c | 4 +- .../typedarray/ecma-builtin-int16array.inc.h | 4 +- .../ecma-builtin-int32array-prototype.c | 4 +- .../ecma-builtin-int32array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-int32array.c | 4 +- .../typedarray/ecma-builtin-int32array.inc.h | 4 +- .../ecma-builtin-int8array-prototype.c | 4 +- .../ecma-builtin-int8array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-int8array.c | 4 +- .../typedarray/ecma-builtin-int8array.inc.h | 4 +- .../ecma-builtin-typedarray-helpers.c | 4 +- .../ecma-builtin-typedarray-helpers.h | 4 +- ...uiltin-typedarray-prototype-template.inc.h | 4 +- .../ecma-builtin-typedarray-prototype.c | 12 +- .../ecma-builtin-typedarray-prototype.inc.h | 12 +- .../ecma-builtin-typedarray-template.inc.h | 4 +- .../typedarray/ecma-builtin-typedarray.c | 4 +- .../typedarray/ecma-builtin-typedarray.inc.h | 4 +- .../ecma-builtin-uint16array-prototype.c | 4 +- .../ecma-builtin-uint16array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-uint16array.c | 4 +- .../typedarray/ecma-builtin-uint16array.inc.h | 4 +- .../ecma-builtin-uint32array-prototype.c | 4 +- .../ecma-builtin-uint32array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-uint32array.c | 4 +- .../typedarray/ecma-builtin-uint32array.inc.h | 4 +- .../ecma-builtin-uint8array-prototype.c | 4 +- .../ecma-builtin-uint8array-prototype.inc.h | 4 +- .../typedarray/ecma-builtin-uint8array.c | 4 +- .../typedarray/ecma-builtin-uint8array.inc.h | 4 +- ...ecma-builtin-uint8clampedarray-prototype.c | 4 +- ...-builtin-uint8clampedarray-prototype.inc.h | 4 +- .../ecma-builtin-uint8clampedarray.c | 4 +- .../ecma-builtin-uint8clampedarray.inc.h | 4 +- .../ecma/operations/ecma-array-object.c | 8 +- .../ecma/operations/ecma-array-object.h | 4 +- .../ecma/operations/ecma-arraybuffer-object.c | 4 +- .../ecma/operations/ecma-arraybuffer-object.h | 4 +- jerry-core/ecma/operations/ecma-comparison.c | 12 +- .../ecma/operations/ecma-container-object.c | 60 +-- .../ecma/operations/ecma-container-object.h | 4 +- jerry-core/ecma/operations/ecma-conversion.c | 40 +- jerry-core/ecma/operations/ecma-conversion.h | 8 +- .../ecma/operations/ecma-dataview-object.c | 4 +- .../ecma/operations/ecma-dataview-object.h | 4 +- jerry-core/ecma/operations/ecma-eval.c | 4 +- jerry-core/ecma/operations/ecma-exceptions.c | 4 +- .../ecma/operations/ecma-function-object.c | 176 ++++---- .../ecma/operations/ecma-function-object.h | 8 +- .../ecma/operations/ecma-get-put-value.c | 28 +- .../ecma/operations/ecma-iterator-object.c | 4 +- .../ecma/operations/ecma-iterator-object.h | 4 +- jerry-core/ecma/operations/ecma-jobqueue.c | 4 +- jerry-core/ecma/operations/ecma-jobqueue.h | 4 +- jerry-core/ecma/operations/ecma-lex-env.c | 26 +- jerry-core/ecma/operations/ecma-lex-env.h | 12 +- .../ecma/operations/ecma-objects-arguments.c | 4 +- .../ecma/operations/ecma-objects-general.c | 18 +- .../ecma/operations/ecma-objects-general.h | 4 +- jerry-core/ecma/operations/ecma-objects.c | 262 +++++------ jerry-core/ecma/operations/ecma-objects.h | 8 +- .../ecma/operations/ecma-promise-object.c | 4 +- .../ecma/operations/ecma-promise-object.h | 4 +- .../ecma/operations/ecma-proxy-object.c | 4 +- .../ecma/operations/ecma-proxy-object.h | 4 +- jerry-core/ecma/operations/ecma-reference.c | 56 +-- jerry-core/ecma/operations/ecma-reference.h | 4 +- .../ecma/operations/ecma-regexp-object.c | 100 ++--- .../ecma/operations/ecma-regexp-object.h | 4 +- .../ecma/operations/ecma-symbol-object.c | 4 +- .../ecma/operations/ecma-symbol-object.h | 4 +- .../ecma/operations/ecma-typedarray-object.c | 4 +- .../ecma/operations/ecma-typedarray-object.h | 4 +- jerry-core/include/jerryscript-port.h | 6 +- jerry-core/jcontext/jcontext.h | 20 +- jerry-core/lit/lit-char-helpers.c | 16 +- jerry-core/lit/lit-char-helpers.h | 4 +- jerry-core/lit/lit-magic-strings.inc.h | 418 +++++++++--------- jerry-core/parser/js/byte-code.h | 6 +- jerry-core/parser/js/common.h | 4 +- jerry-core/parser/js/js-lexer.c | 200 ++++----- jerry-core/parser/js/js-lexer.h | 36 +- jerry-core/parser/js/js-parser-expr.c | 294 ++++++------ jerry-core/parser/js/js-parser-internal.h | 62 +-- jerry-core/parser/js/js-parser-module.c | 12 +- jerry-core/parser/js/js-parser-statm.c | 248 +++++------ .../js/js-parser-tagged-template-literal.c | 4 +- .../js/js-parser-tagged-template-literal.h | 4 +- jerry-core/parser/js/js-parser-util.c | 16 +- jerry-core/parser/js/js-parser.c | 156 +++---- jerry-core/parser/js/js-parser.h | 16 +- jerry-core/parser/js/js-scanner-internal.h | 84 ++-- jerry-core/parser/js/js-scanner-ops.c | 44 +- jerry-core/parser/js/js-scanner-util.c | 258 +++++------ jerry-core/parser/js/js-scanner.c | 402 ++++++++--------- jerry-core/parser/js/js-scanner.h | 34 +- jerry-core/parser/regexp/re-bytecode.c | 30 +- jerry-core/parser/regexp/re-bytecode.h | 4 +- jerry-core/parser/regexp/re-parser.c | 62 +-- jerry-core/profiles/README.md | 48 +- jerry-core/profiles/es.next.profile | 1 + jerry-core/profiles/es5.1.profile | 2 +- jerry-core/profiles/minimal.profile | 2 +- jerry-core/vm/opcodes-ecma-arithmetics.c | 4 +- .../vm/opcodes-ecma-relational-equality.c | 4 +- jerry-core/vm/opcodes.c | 28 +- jerry-core/vm/opcodes.h | 12 +- jerry-core/vm/vm-stack.c | 28 +- jerry-core/vm/vm-stack.h | 8 +- jerry-core/vm/vm.c | 144 +++--- jerry-core/vm/vm.h | 24 +- targets/curie_bsp/setup.py | 2 +- targets/esp8266/Makefile.esp8266 | 1 + targets/nuttx-stm32f4/Makefile.travis | 2 +- targets/nuttx-stm32f4/README.md | 2 +- targets/riot-stm32f4/Makefile.riot | 1 + .../{es2015 => es.next}/15.03.04.02-001.js | 0 .../{es2015 => es.next}/15.03.04.02-004.js | 0 .../19/19.01/19.01.02/19.01.02-001.js | 0 .../19/19.01/19.01.02/19.01.02-002.js | 0 .../19/19.01/19.01.02/19.01.02-003.js | 0 .../19/19.01/19.01.02/19.01.02-004.js | 0 .../19/19.01/19.01.02/19.01.02-005.js | 0 .../19/19.01/19.01.02/19.01.02-006.js | 0 .../22/22.02/22.02.01/22.02.01-001.js | 0 .../22/22.02/22.02.01/22.02.01-002.js | 0 .../22/22.02/22.02.01/22.02.01-003.js | 0 .../22/22.02/22.02.01/22.02.01-004.js | 0 .../22/22.02/22.02.01/22.02.01-005.js | 0 .../22/22.02/22.02.01/22.02.01-006.js | 0 .../22/22.02/22.02.01/22.02.01-007.js | 0 .../22/22.02/22.02.01/22.02.01-008.js | 0 .../22/22.02/22.02.01/22.02.01-009.js | 0 .../22/22.02/22.02.01/22.02.01-010.js | 0 .../22/22.02/22.02.01/22.02.01-011.js | 0 .../22/22.02/22.02.01/22.02.01-012.js | 0 .../22/22.02/22.02.01/22.02.01-013.js | 0 .../22/22.02/22.02.01/22.02.01-014.js | 0 .../22/22.02/22.02.01/22.02.01-015.js | 0 .../22/22.02/22.02.01/22.02.01-016.js | 0 .../22/22.02/22.02.01/22.02.01-017.js | 0 .../22/22.02/22.02.01/22.02.01-018.js | 0 .../22/22.02/22.02.01/22.02.01-019.js | 0 .../22/22.02/22.02.01/22.02.01-020.js | 0 .../22/22.02/22.02.01/22.02.01-021.js | 0 .../22/22.02/22.02.02/22.02.02-001.js | 0 .../22/22.02/22.02.02/22.02.02-002.js | 0 .../22/22.02/22.02.02/22.02.02-003.js | 0 .../22/22.02/22.02.02/22.02.02-004.js | 0 .../22/22.02/22.02.02/22.02.02-005.js | 0 .../22/22.02/22.02.03/22.02.03-001.js | 0 .../22/22.02/22.02.03/22.02.03-002.js | 0 .../22/22.02/22.02.03/22.02.03-003.js | 0 .../22/22.02/22.02.03/22.02.03-004.js | 0 .../22/22.02/22.02.03/22.02.03-005.js | 0 .../22/22.02/22.02.03/22.02.03-006.js | 0 .../22/22.02/22.02.03/22.02.03-007.js | 0 .../22/22.02/22.02.03/22.02.03-008.js | 0 .../22/22.02/22.02.03/22.02.03-009.js | 0 .../22/22.02/22.02.03/22.02.03-010.js | 0 .../22/22.02/22.02.03/22.02.03-011.js | 0 .../22/22.02/22.02.03/22.02.03-012.js | 0 .../22/22.02/22.02.03/22.02.03-013.js | 0 .../22/22.02/22.02.03/22.02.03-014.js | 0 .../22/22.02/22.02.03/22.02.03-015.js | 0 .../22/22.02/22.02.03/22.02.03-016.js | 0 .../22/22.02/22.02.03/22.02.03-017.js | 0 .../22/22.02/22.02.03/22.02.03-018.js | 0 .../22/22.02/22.02.03/22.02.03-019.js | 0 .../22/22.02/22.02.03/22.02.03-020.js | 0 .../22/22.02/22.02.03/22.02.03-021.js | 0 .../22/22.02/22.02.05/22.02.05-001.js | 0 .../22/22.02/22.02.06/22.02.06-001.js | 0 .../24/24.01/24.01.02/24.01.02-001.js | 0 .../24/24.01/24.01.02/24.01.02-002.js | 0 .../24/24.01/24.01.02/24.01.02-003.js | 0 .../24/24.01/24.01.02/24.01.02-004.js | 0 .../24/24.01/24.01.02/24.01.02-005.js | 0 .../24/24.01/24.01.02/24.01.02-006.js | 0 .../24/24.01/24.01.02/24.01.02-007.js | 0 .../24/24.01/24.01.02/24.01.02-008.js | 0 .../24/24.01/24.01.02/24.01.02-009.js | 0 .../24/24.01/24.01.02/24.01.02-010.js | 0 .../24/24.01/24.01.02/24.01.02-011.js | 0 .../24/24.01/24.01.02/24.01.02-012.js | 0 .../24/24.01/24.01.02/24.01.02-013.js | 0 .../24/24.01/24.01.03/24.01.03-001.js | 0 .../24/24.01/24.01.04/24.01.04-001.js | 0 .../24/24.01/24.01.04/24.01.04-002.js | 0 .../24/24.01/24.01.04/24.01.04-003.js | 0 .../24/24.01/24.01.04/24.01.04-004.js | 0 .../24/24.01/24.01.04/24.01.04-005.js | 0 .../24/24.01/24.01.04/24.01.04-006.js | 0 .../24/24.01/24.01.04/24.01.04-007.js | 0 .../25/25.04/25.04.03/25.04.03-001.js | 0 .../25/25.04/25.04.03/25.04.03-002.js | 0 .../25/25.04/25.04.04/25.04.04-001.js | 0 .../25/25.04/25.04.04/25.04.04-002.js | 0 .../25/25.04/25.04.04/25.04.04-003.js | 0 .../25/25.04/25.04.04/25.04.04-004.js | 0 .../25/25.04/25.04.04/25.04.04-005.js | 0 .../25/25.04/25.04.05/25.04.05-001.js | 0 .../25/25.04/25.04.05/25.04.05-002.js | 0 .../25/25.04/25.04.05/25.04.05-003.js | 0 .../25/25.04/25.04.05/25.04.05-004.js | 0 .../25/25.04/25.04.05/25.04.05-005.js | 0 .../25/25.04/25.04.05/25.04.05-006.js | 0 .../{es2015 => es.next}/argument-spread.js | 0 .../{es2015 => es.next}/arguments-iterator.js | 0 tests/jerry/{es2015 => es.next}/array-from.js | 0 .../{es2015 => es.next}/array-isarray.js | 0 .../array-new-target-support.js | 0 tests/jerry/{es2015 => es.next}/array-of.js | 0 .../{es2015 => es.next}/array-pattern.js | 0 .../array-prototype-copywithin.js | 0 .../array-prototype-entries.js | 0 .../array-prototype-fill.js | 0 .../array-prototype-find-index.js | 0 .../array-prototype-find.js | 0 .../array-prototype-keys.js | 0 .../array-prototype-slice.js | 0 .../array-prototype-values.js | 0 .../{es2015 => es.next}/array-species.js | 0 .../jerry/{es2015 => es.next}/array-spread.js | 0 .../{es2015 => es.next}/arraybuffer-isview.js | 0 .../{es2015 => es.next}/arrow-assignment.js | 0 tests/jerry/{es2015 => es.next}/arrow-eval.js | 0 .../{es2015 => es.next}/arrow-function.js | 0 tests/jerry/{es2015 => es.next}/arrow-this.js | 0 .../{es2015 => es.next}/binary-literal.js | 0 ...-objects-accessor-property-configurable.js | 0 .../{es2015 => es.next}/builtin-prototypes.js | 0 .../class-get-set-as-method.js | 0 .../class-inheritance-bound.js | 0 .../class-inheritance-builtin-array.js | 0 .../class-inheritance-builtin-typedarray.js | 0 .../class-inheritance-core-1.js | 0 .../class-inheritance-core-10.js | 0 .../class-inheritance-core-11.js | 0 .../class-inheritance-core-12.js | 0 .../class-inheritance-core-13.js | 0 .../class-inheritance-core-14.js | 0 .../class-inheritance-core-15.js | 0 .../class-inheritance-core-2.js | 0 .../class-inheritance-core-3.js | 0 .../class-inheritance-core-4.js | 0 .../class-inheritance-core-5.js | 0 .../class-inheritance-core-6.js | 0 .../class-inheritance-core-7.js | 0 .../class-inheritance-core-8.js | 0 .../class-inheritance-core-9.js | 0 .../class-inheritance-early-semantics.js | 0 .../class-inheritance-has-instance.js | 0 .../class-inheritance-inner-class.js | 0 .../class-inheritance-mixins-1.js | 0 .../class-inheritance-mixins-2.js | 0 .../class-super-access-direct.js | 0 .../class-super-access-indirect.js | 0 tests/jerry/{es2015 => es.next}/class.js | 0 tests/jerry/{es2015 => es.next}/const1.js | 0 tests/jerry/{es2015 => es.next}/continue.js | 0 tests/jerry/{es2015 => es.next}/dataview.js | 0 .../date-prototype-toprimitive.js | 0 tests/jerry/{es2015 => es.next}/directive.js | 0 tests/jerry/{es2015 => es.next}/error.js | 0 .../{es2015 => es.next}/exponentiation.js | 0 .../for-let-reference-error.js | 0 tests/jerry/{es2015 => es.next}/for-let.js | 0 .../for-of-iterator-close.js | 0 tests/jerry/{es2015 => es.next}/for-of.js | 0 .../jerry/{es2015 => es.next}/for-pattern.js | 0 .../forin-header-strict.js | 0 .../{es2015 => es.next}/function-accessor.js | 0 .../function-arguments-caller.js | 0 .../{es2015 => es.next}/function-async1.js | 0 .../{es2015 => es.next}/function-async2.js | 0 .../{es2015 => es.next}/function-await1.js | 0 .../{es2015 => es.next}/function-call.js | 0 .../jerry/{es2015 => es.next}/function-if.js | 0 .../{es2015 => es.next}/function-name.js | 0 .../function-new-target.js | 0 .../function-param-init.js | 0 .../function-param-init2.js | 0 .../function-param-init3.js | 0 .../function-param-init4.js | 0 .../{es2015 => es.next}/function-pattern1.js | 0 .../{es2015 => es.next}/function-pattern2.js | 0 .../function-properties.js | 0 .../function-prototype-bind.js | 0 .../function-prototype-hasinstance-class.js | 0 .../function-prototype-hasinstance.js | 0 .../function-rest-parameter.js | 0 .../{es2015 => es.next}/function-scope.js | 0 .../{es2015 => es.next}/function-scope2.js | 0 .../{es2015 => es.next}/generator-function.js | 0 .../generator-initializer.js | 0 .../{es2015 => es.next}/generator-return.js | 0 .../{es2015 => es.next}/generator-throw.js | 0 .../generator-yield-iterator.js | 0 .../{es2015 => es.next}/generator-yield.js | 0 tests/jerry/{es2015 => es.next}/generator.js | 0 .../{es2015 => es.next}/identifier-escape.js | 0 .../instanceof-symbol-hasinstance-class.js | 0 .../instanceof-symbol-hasinstance.js | 0 .../{es2015 => es.next}/iterator-prototype.js | 0 .../{es2015 => es.next}/json-stringify.js | 0 .../{es2015 => es.next}/length-property.js | 0 tests/jerry/{es2015 => es.next}/let1.js | 0 tests/jerry/{es2015 => es.next}/let10.js | 0 tests/jerry/{es2015 => es.next}/let11.js | 0 tests/jerry/{es2015 => es.next}/let12.js | 0 tests/jerry/{es2015 => es.next}/let13.js | 0 tests/jerry/{es2015 => es.next}/let14.js | 0 tests/jerry/{es2015 => es.next}/let15.js | 0 tests/jerry/{es2015 => es.next}/let2.js | 0 tests/jerry/{es2015 => es.next}/let3.js | 0 tests/jerry/{es2015 => es.next}/let4.js | 0 tests/jerry/{es2015 => es.next}/let5.js | 0 tests/jerry/{es2015 => es.next}/let6.js | 0 tests/jerry/{es2015 => es.next}/let7.js | 0 tests/jerry/{es2015 => es.next}/let8.js | 0 tests/jerry/{es2015 => es.next}/let9.js | 0 .../{es2015 => es.next}/map-iterators.js | 0 .../map-prototype-foreach.js | 0 tests/jerry/{es2015 => es.next}/map.js | 0 tests/jerry/{es2015 => es.next}/math-acosh.js | 0 tests/jerry/{es2015 => es.next}/math-asinh.js | 0 tests/jerry/{es2015 => es.next}/math-atanh.js | 0 tests/jerry/{es2015 => es.next}/math-cbrt.js | 0 tests/jerry/{es2015 => es.next}/math-cosh.js | 0 tests/jerry/{es2015 => es.next}/math-expm1.js | 0 .../math-functions-tonumber-rule2.js | 0 tests/jerry/{es2015 => es.next}/math-log10.js | 0 tests/jerry/{es2015 => es.next}/math-log1p.js | 0 tests/jerry/{es2015 => es.next}/math-log2.js | 0 tests/jerry/{es2015 => es.next}/math-sign.js | 0 tests/jerry/{es2015 => es.next}/math-sinh.js | 0 tests/jerry/{es2015 => es.next}/math-tanh.js | 0 tests/jerry/{es2015 => es.next}/math-trunc.js | 0 .../{es2015 => es.next}/module-export-01.js | 0 .../{es2015 => es.next}/module-export-02.js | 0 .../{es2015 => es.next}/module-export-03.js | 0 .../{es2015 => es.next}/module-export-04.js | 0 .../{es2015 => es.next}/module-export-05.js | 0 .../{es2015 => es.next}/module-export-06.js | 0 .../{es2015 => es.next}/module-export-07.js | 0 .../module-export-fail-test.js | 0 .../{es2015 => es.next}/module-import-01.js | 0 .../{es2015 => es.next}/module-import-02.js | 0 .../{es2015 => es.next}/module-import-03.js | 0 .../{es2015 => es.next}/module-import-04.js | 0 .../{es2015 => es.next}/new-target-async.js | 0 .../{es2015 => es.next}/new-target-class.js | 0 .../new-target-for-containers.js | 0 .../new-target-for-date-object.js | 0 .../new-target-generator.js | 0 tests/jerry/{es2015 => es.next}/new-target.js | 0 .../{es2015 => es.next}/number-constants.js | 0 .../{es2015 => es.next}/number-isfinite.js | 0 .../{es2015 => es.next}/number-isinteger.js | 0 .../jerry/{es2015 => es.next}/number-isnan.js | 0 .../number-issafeinteger.js | 0 .../{es2015 => es.next}/number-methods.js | 0 .../{es2015 => es.next}/object-assign.js | 0 .../object-computed-prescanner.js | 0 .../{es2015 => es.next}/object-computed.js | 0 .../object-freeze-with-symbol.js | 0 .../object-get-own-property-names.js | 0 .../object-get-own-property-symbols.js | 0 .../object-getprototypeof.js | 0 .../{es2015 => es.next}/object-initializer.js | 0 tests/jerry/{es2015 => es.next}/object-is.js | 0 .../{es2015 => es.next}/object-methods.js | 0 .../{es2015 => es.next}/object-pattern.js | 0 .../object-prototype-proto.js | 0 .../object-prototype-tostring.js | 0 .../object-seal-with-symbol.js | 0 .../{es2015 => es.next}/octal-literal.js | 0 .../promise-all-iterator.js | 0 .../{es2015 => es.next}/promise-new-target.js | 0 .../promise-race-iterator.js | 0 .../{es2015 => es.next}/promise-species.js | 0 .../{es2015 => es.next}/promise-thenable.js | 0 tests/jerry/{es2015 => es.next}/proxy_call.js | 0 .../{es2015 => es.next}/proxy_construct.js | 0 .../jerry/{es2015 => es.next}/proxy_create.js | 0 .../proxy_define_own_property.js | 0 .../jerry/{es2015 => es.next}/proxy_delete.js | 0 tests/jerry/{es2015 => es.next}/proxy_get.js | 0 .../proxy_get_own_property_descriptor.js | 0 .../proxy_get_prototoype_of.js | 0 tests/jerry/{es2015 => es.next}/proxy_has.js | 0 .../proxy_is_extensible.js | 0 .../{es2015 => es.next}/proxy_own_keys.js | 0 .../proxy_prevent_extensions.js | 0 .../{es2015 => es.next}/proxy_revocable.js | 0 tests/jerry/{es2015 => es.next}/proxy_set.js | 0 .../proxy_set_apply_receiver.js | 0 .../proxy_set_prototoype_of.js | 0 .../{es2015 => es.next}/reflect-apply.js | 0 .../{es2015 => es.next}/reflect-construct.js | 0 .../reflect-define-Property.js | 0 .../reflect-deleteproperty.js | 0 .../reflect-get-own-property-description.js | 0 .../jerry/{es2015 => es.next}/reflect-get.js | 0 .../reflect-getPrototypeOf.js | 0 .../jerry/{es2015 => es.next}/reflect-has.js | 0 .../reflect-isextensible.js | 0 .../{es2015 => es.next}/reflect-own-keys.js | 0 .../reflect-preventextensions.js | 0 .../jerry/{es2015 => es.next}/reflect-set.js | 0 .../reflect-setPrototypeOf.js | 0 .../regexp-accessors-descriptors.js | 0 .../{es2015 => es.next}/regexp-construct.js | 0 .../jerry/{es2015 => es.next}/regexp-flags.js | 0 .../{es2015 => es.next}/regexp-lastindex.js | 0 .../{es2015 => es.next}/regexp-new-target.js | 0 .../regexp-prototype-match.js | 0 .../regexp-prototype-source.js | 0 .../regexp-prototype-test.js | 0 .../{es2015 => es.next}/regexp-routines.js | 0 .../{es2015 => es.next}/regexp-unicode.js | 0 .../regression-test-issue-1616.js | 0 .../regression-test-issue-1622.js | 0 .../regression-test-issue-1633.js | 0 .../regression-test-issue-1670.js | 0 .../regression-test-issue-1763.js | 0 .../regression-test-issue-1765.js | 0 .../regression-test-issue-1881.js | 0 .../regression-test-issue-1936.js | 0 .../regression-test-issue-1995.js | 0 .../regression-test-issue-1996.js | 0 .../regression-test-issue-1997.js | 0 .../regression-test-issue-2107.js | 0 .../regression-test-issue-2110.js | 0 .../regression-test-issue-2111.js | 0 .../regression-test-issue-2143.js | 0 .../regression-test-issue-2181.js | 0 .../regression-test-issue-2414.js | 0 .../regression-test-issue-2435.js | 0 .../regression-test-issue-2465.js | 0 .../regression-test-issue-2468.js | 0 .../regression-test-issue-2486.js | 0 .../regression-test-issue-2487.js | 0 .../regression-test-issue-2488.js | 0 .../regression-test-issue-2489-original.js | 0 .../regression-test-issue-2490.js | 0 .../regression-test-issue-2528.js | 0 .../regression-test-issue-2544.js | 0 .../regression-test-issue-2587.js | 0 .../regression-test-issue-2602.js | 0 .../regression-test-issue-2603.js | 0 .../regression-test-issue-2657.js | 0 .../regression-test-issue-2658.js | 0 .../regression-test-issue-2664.js | 0 .../regression-test-issue-2666.js | 0 .../regression-test-issue-2667.js | 0 .../regression-test-issue-2671.js | 0 .../regression-test-issue-2693.js | 0 .../regression-test-issue-2698.js | 0 .../regression-test-issue-2724.js | 0 .../regression-test-issue-2743.js | 0 .../regression-test-issue-2757.js | 0 .../regression-test-issue-2768.js | 0 .../regression-test-issue-2769.js | 0 .../regression-test-issue-2770.js | 0 .../regression-test-issue-2777.js | 0 .../regression-test-issue-2779.js | 0 .../regression-test-issue-2782.js | 0 .../regression-test-issue-2783.js | 0 .../regression-test-issue-2822.js | 0 .../regression-test-issue-2823.js | 0 .../regression-test-issue-2825.js | 0 .../regression-test-issue-2842.js | 0 .../regression-test-issue-2848.js | 0 .../regression-test-issue-2850.js | 0 .../regression-test-issue-2851.js | 0 .../regression-test-issue-2852.js | 0 .../regression-test-issue-2853.js | 0 .../regression-test-issue-2854.js | 0 .../regression-test-issue-2891.js | 0 .../regression-test-issue-2895.js | 0 .../regression-test-issue-2910.js | 0 .../regression-test-issue-2911.js | 0 .../regression-test-issue-2947.js | 0 .../regression-test-issue-2948.js | 0 .../regression-test-issue-2950.js | 0 .../regression-test-issue-2951.js | 0 .../regression-test-issue-2975.js | 2 +- .../regression-test-issue-2990.js | 0 .../regression-test-issue-3040.js | 0 .../regression-test-issue-3043-3046.js | 0 .../regression-test-issue-3045.js | 0 .../regression-test-issue-3049.js | 0 .../regression-test-issue-3050.js | 0 .../regression-test-issue-3062.js | 0 .../regression-test-issue-3063.js | 0 .../regression-test-issue-3067.js | 0 .../regression-test-issue-3070.js | 0 .../regression-test-issue-3072.js | 0 .../regression-test-issue-3078.js | 0 .../regression-test-issue-3079.js | 0 .../regression-test-issue-3084.js | 0 .../regression-test-issue-3095.js | 0 .../regression-test-issue-3097.js | 0 .../regression-test-issue-3105.js | 0 .../regression-test-issue-3106.js | 0 .../regression-test-issue-3107.js | 0 .../regression-test-issue-3109.js | 0 .../regression-test-issue-3129.js | 0 .../regression-test-issue-3162.js | 0 .../regression-test-issue-3204.js | 0 .../regression-test-issue-3222.js | 0 .../regression-test-issue-3237.js | 0 .../regression-test-issue-3243.js | 0 .../regression-test-issue-3250.js | 0 .../regression-test-issue-3252.js | 0 .../regression-test-issue-3262.js | 0 .../regression-test-issue-3267.js | 0 .../regression-test-issue-3298.js | 0 .../regression-test-issue-3306.js | 0 .../regression-test-issue-3348.js | 0 .../regression-test-issue-3355.js | 0 .../regression-test-issue-3356.js | 0 .../regression-test-issue-3360.js | 0 .../regression-test-issue-3361.js | 0 .../regression-test-issue-3363.js | 0 .../regression-test-issue-3364.js | 0 .../regression-test-issue-3376.js | 0 .../regression-test-issue-3381.js | 0 .../regression-test-issue-3383.js | 0 .../regression-test-issue-3390.js | 0 .../regression-test-issue-3396.js | 0 .../regression-test-issue-3408.js | 0 .../regression-test-issue-3409.js | 0 .../regression-test-issue-3411.js | 0 .../regression-test-issue-3419.js | 0 .../regression-test-issue-3420.js | 0 .../regression-test-issue-3421.js | 0 .../regression-test-issue-3422.js | 0 .../regression-test-issue-3431.js | 0 .../regression-test-issue-3434.js | 0 .../regression-test-issue-3437.js | 0 .../regression-test-issue-3454.js | 0 .../regression-test-issue-3455.js | 0 .../regression-test-issue-3458.js | 0 .../regression-test-issue-3459.js | 0 .../regression-test-issue-3478.js | 0 .../regression-test-issue-3479.js | 0 .../regression-test-issue-3483.js | 0 .../regression-test-issue-3485.js | 0 .../regression-test-issue-3519.js | 0 .../regression-test-issue-3527.js | 0 .../regression-test-issue-3534.js | 0 .../regression-test-issue-3536.js | 0 .../regression-test-issue-3580.js | 0 .../regression-test-issue-3588.js | 0 .../regression-test-issue-3589.js | 0 .../regression-test-issue-3595.js | 0 .../regression-test-issue-3606.js | 0 .../regression-test-issue-3611.js | 0 .../regression-test-issue-3625.js | 0 .../regression-test-issue-3628.js | 0 .../regression-test-issue-3630.js | 0 .../regression-test-issue-3636.js | 0 .../regression-test-issue-3637.js | 0 .../regression-test-issue-3640.js | 0 .../regression-test-issue-3641.js | 0 .../regression-test-issue-3647.js | 0 .../regression-test-issue-3655.js | 0 .../regression-test-issue-3656.js | 0 .../regression-test-issue-3658.js | 0 .../regression-test-issue-3665.js | 0 .../regression-test-issue-3671.js | 0 .../regression-test-issue-3715.js | 0 .../regression-test-issue-3751.js | 0 .../regression-test-issue-3760.js | 0 .../regression-test-issue-3784.js | 0 .../regression-test-issue-3785.js | 0 .../regression-test-issue-3787.js | 0 .../regression-test-issue-3812.js | 0 .../regression-test-issue-3814.js | 0 .../regression-test-issue-3817.js | 0 .../regression-test-issue-3819.js | 0 .../regression-test-issue-3820.js | 0 .../regression-test-issue-3822.js | 0 .../regression-test-issue-3823.js | 0 .../regression-test-issue-3824.js | 0 .../regression-test-issue-3825.js | 0 .../regression-test-issue-3836.js | 0 .../regression-test-issue-3837.js | 0 .../regression-test-issue-3845.js | 0 .../regression-test-issue-3849.js | 0 .../regression-test-issue-3860.js | 0 .../regression-test-issue-3861.js | 0 .../regression-test-issue-3862.js | 0 .../regression-test-issue-3866.js | 0 .../regression-test-issue-3868.js | 0 .../regression-test-issue-3870.js | 0 .../regression-test-issue-3871.js | 0 .../regression-test-issue-3880.js | 0 .../regression-test-issue-3893.js | 0 .../regression-test-issue-612.js | 0 .../regression-test-issue-782.js | 0 .../regresssion-test-issue-3302.js | 0 .../regresssion-test-issue-3395.js | 0 .../regresssion-test-issue-3713.js | 0 .../regresssion-test-issue-3727.js | 0 .../regresssion-test-issue-3841.js | 0 .../regresssion-test-issue-3842.js | 0 .../regresssion-test-issue-3856.js | 0 .../regresssion-test-issue-3857.js | 0 .../regresssion-test-issue-3869.js | 0 .../regresssion-test-issue-3888.js | 0 .../{es2015 => es.next}/set-iterators.js | 0 tests/jerry/{es2015 => es.next}/set.js | 0 .../string-fromcodepoint.js | 0 .../{es2015 => es.next}/string-iterator.js | 0 .../string-prototype-codepointat.js | 0 .../string-prototype-endswith.js | 0 .../string-prototype-includes.js | 0 .../string-prototype-match.js | 0 .../string-prototype-repeat.js | 0 .../string-prototype-split.js | 0 .../string-prototype-startswith.js | 0 .../string-raw-crash-escaping-backslash.js | 0 tests/jerry/{es2015 => es.next}/string-raw.js | 0 .../{es2015 => es.next}/super-assignment.js | 0 .../symbol-computed-object-literal.js | 0 .../{es2015 => es.next}/symbol-exception.js | 0 tests/jerry/{es2015 => es.next}/symbol-in.js | 0 .../symbol-isconcatspreadable.js | 0 .../{es2015 => es.next}/symbol-key-keyfor.js | 0 .../symbol-prototype-symbol-toprimitive.js | 0 .../symbol-prototype-tostring.js | 0 .../symbol-prototype-valueof.js | 0 .../symbol-prototype.toprimitive.js | 0 .../{es2015 => es.next}/symbol-replace.js | 0 .../{es2015 => es.next}/symbol-search.js | 0 .../jerry/{es2015 => es.next}/symbol-split.js | 0 .../{es2015 => es.next}/symbol-unscopables.js | 0 tests/jerry/{es2015 => es.next}/symbol.js | 0 .../tagged-template-literal.js | 0 .../{es2015 => es.next}/template_string.js | 0 .../{es2015 => es.next}/to-number-string.js | 0 tests/jerry/{es2015 => es.next}/try-catch.js | 0 .../jerry/{es2015 => es.next}/try-pattern.js | 0 .../{es2015 => es.next}/typedArray-fill.js | 0 .../typedArray-find-index.js | 0 .../{es2015 => es.next}/typedArray-find.js | 0 .../{es2015 => es.next}/typedArray-join.js | 0 .../typedArray-set-with-typedArray.js | 0 .../{es2015 => es.next}/typedArray-sort.js | 0 .../typedArray-stringify.js | 0 .../typedArray-subarray.js | 0 .../typedArray-tostring.js | 0 .../{es2015 => es.next}/typedarray-from.js | 0 .../{es2015 => es.next}/typedarray-of.js | 0 .../typedarray-prototype-copy-within.js | 0 .../typedarray-prototype-entires.js | 0 .../typedarray-prototype-indexof.js | 0 .../typedarray-prototype-keys.js | 0 .../typedarray-prototype-lastindexof.js | 0 ...edarray-prototype-slice-ext-arraybuffer.js | 0 .../typedarray-prototype-slice.js | 0 .../typedarray-prototype-tolocalestring.js | 0 .../typedarray-prototype-values.js | 0 .../typedarray-symbol-properties.js | 0 tests/jerry/{es2015 => es.next}/weakmap.js | 0 tests/jerry/{es2015 => es.next}/weakset.js | 0 tests/jerry/fail/module-002.js | 2 +- tests/jerry/fail/module-003.js | 2 +- tests/jerry/fail/module-004.js | 2 +- tests/jerry/fail/module-005.js | 2 +- tests/jerry/fail/module-010.js | 2 +- tests/jerry/fail/module-014.js | 2 +- tests/jerry/fail/module-015.js | 2 +- tests/jerry/fail/module-016.js | 2 +- tests/jerry/fail/module-017.js | 2 +- tests/jerry/fail/module-018.js | 2 +- tests/jerry/fail/module-020.js | 2 +- tests/jerry/fail/module-021.js | 4 +- tests/jerry/fail/module-022.js | 2 +- tests/jerry/fail/module-023.js | 2 +- tests/jerry/fail/module-024.js | 2 +- tests/jerry/fail/module-025.js | 2 +- tests/jerry/fail/module-028.js | 2 +- tests/jerry/fail/module-029.js | 2 +- tests/jerry/fail/module-030.js | 2 +- tests/jerry/fail/module-032.js | 2 +- tests/jerry/fail/module-033.js | 2 +- tests/jerry/fail/module-034.js | 2 +- tests/jerry/fail/module-035.js | 2 +- .../jerry/fail/regression-test-issue-2896.js | 2 +- tests/unit-core/test-newtarget.c | 4 +- tests/unit-core/test-objects-foreach.c | 2 +- tests/unit-core/test-regression-3588.c | 4 +- tests/unit-core/test-to-length.c | 12 +- tools/check-sonarqube.sh | 4 +- tools/run-tests.py | 52 +-- 832 files changed, 3053 insertions(+), 3046 deletions(-) create mode 100644 jerry-core/profiles/es.next.profile rename tests/jerry-test-suite/{es2015 => es.next}/15.03.04.02-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/15.03.04.02-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/19/19.01/19.01.02/19.01.02-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/19/19.01/19.01.02/19.01.02-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/19/19.01/19.01.02/19.01.02-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/19/19.01/19.01.02/19.01.02-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/19/19.01/19.01.02/19.01.02-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/19/19.01/19.01.02/19.01.02-006.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-006.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-007.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-008.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-009.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-010.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-011.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-012.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-013.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-014.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-015.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-016.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-017.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-018.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-019.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-020.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.01/22.02.01-021.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.02/22.02.02-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.02/22.02.02-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.02/22.02.02-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.02/22.02.02-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.02/22.02.02-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-006.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-007.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-008.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-009.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-010.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-011.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-012.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-013.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-014.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-015.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-016.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-017.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-018.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-019.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-020.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.03/22.02.03-021.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.05/22.02.05-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/22/22.02/22.02.06/22.02.06-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-006.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-007.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-008.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-009.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-010.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-011.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-012.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.02/24.01.02-013.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.03/24.01.03-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.04/24.01.04-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.04/24.01.04-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.04/24.01.04-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.04/24.01.04-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.04/24.01.04-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.04/24.01.04-006.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/24/24.01/24.01.04/24.01.04-007.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.03/25.04.03-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.03/25.04.03-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.04/25.04.04-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.04/25.04.04-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.04/25.04.04-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.04/25.04.04-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.04/25.04.04-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.05/25.04.05-001.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.05/25.04.05-002.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.05/25.04.05-003.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.05/25.04.05-004.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.05/25.04.05-005.js (100%) rename tests/jerry-test-suite/{es2015 => es.next}/25/25.04/25.04.05/25.04.05-006.js (100%) rename tests/jerry/{es2015 => es.next}/argument-spread.js (100%) rename tests/jerry/{es2015 => es.next}/arguments-iterator.js (100%) rename tests/jerry/{es2015 => es.next}/array-from.js (100%) rename tests/jerry/{es2015 => es.next}/array-isarray.js (100%) rename tests/jerry/{es2015 => es.next}/array-new-target-support.js (100%) rename tests/jerry/{es2015 => es.next}/array-of.js (100%) rename tests/jerry/{es2015 => es.next}/array-pattern.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-copywithin.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-entries.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-fill.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-find-index.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-find.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-keys.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-slice.js (100%) rename tests/jerry/{es2015 => es.next}/array-prototype-values.js (100%) rename tests/jerry/{es2015 => es.next}/array-species.js (100%) rename tests/jerry/{es2015 => es.next}/array-spread.js (100%) rename tests/jerry/{es2015 => es.next}/arraybuffer-isview.js (100%) rename tests/jerry/{es2015 => es.next}/arrow-assignment.js (100%) rename tests/jerry/{es2015 => es.next}/arrow-eval.js (100%) rename tests/jerry/{es2015 => es.next}/arrow-function.js (100%) rename tests/jerry/{es2015 => es.next}/arrow-this.js (100%) rename tests/jerry/{es2015 => es.next}/binary-literal.js (100%) rename tests/jerry/{es2015 => es.next}/builtin-objects-accessor-property-configurable.js (100%) rename tests/jerry/{es2015 => es.next}/builtin-prototypes.js (100%) rename tests/jerry/{es2015 => es.next}/class-get-set-as-method.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-bound.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-builtin-array.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-builtin-typedarray.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-1.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-10.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-11.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-12.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-13.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-14.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-15.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-2.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-3.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-4.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-5.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-6.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-7.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-8.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-core-9.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-early-semantics.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-has-instance.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-inner-class.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-mixins-1.js (100%) rename tests/jerry/{es2015 => es.next}/class-inheritance-mixins-2.js (100%) rename tests/jerry/{es2015 => es.next}/class-super-access-direct.js (100%) rename tests/jerry/{es2015 => es.next}/class-super-access-indirect.js (100%) rename tests/jerry/{es2015 => es.next}/class.js (100%) rename tests/jerry/{es2015 => es.next}/const1.js (100%) rename tests/jerry/{es2015 => es.next}/continue.js (100%) rename tests/jerry/{es2015 => es.next}/dataview.js (100%) rename tests/jerry/{es2015 => es.next}/date-prototype-toprimitive.js (100%) rename tests/jerry/{es2015 => es.next}/directive.js (100%) rename tests/jerry/{es2015 => es.next}/error.js (100%) rename tests/jerry/{es2015 => es.next}/exponentiation.js (100%) rename tests/jerry/{es2015 => es.next}/for-let-reference-error.js (100%) rename tests/jerry/{es2015 => es.next}/for-let.js (100%) rename tests/jerry/{es2015 => es.next}/for-of-iterator-close.js (100%) rename tests/jerry/{es2015 => es.next}/for-of.js (100%) rename tests/jerry/{es2015 => es.next}/for-pattern.js (100%) rename tests/jerry/{es2015 => es.next}/forin-header-strict.js (100%) rename tests/jerry/{es2015 => es.next}/function-accessor.js (100%) rename tests/jerry/{es2015 => es.next}/function-arguments-caller.js (100%) rename tests/jerry/{es2015 => es.next}/function-async1.js (100%) rename tests/jerry/{es2015 => es.next}/function-async2.js (100%) rename tests/jerry/{es2015 => es.next}/function-await1.js (100%) rename tests/jerry/{es2015 => es.next}/function-call.js (100%) rename tests/jerry/{es2015 => es.next}/function-if.js (100%) rename tests/jerry/{es2015 => es.next}/function-name.js (100%) rename tests/jerry/{es2015 => es.next}/function-new-target.js (100%) rename tests/jerry/{es2015 => es.next}/function-param-init.js (100%) rename tests/jerry/{es2015 => es.next}/function-param-init2.js (100%) rename tests/jerry/{es2015 => es.next}/function-param-init3.js (100%) rename tests/jerry/{es2015 => es.next}/function-param-init4.js (100%) rename tests/jerry/{es2015 => es.next}/function-pattern1.js (100%) rename tests/jerry/{es2015 => es.next}/function-pattern2.js (100%) rename tests/jerry/{es2015 => es.next}/function-properties.js (100%) rename tests/jerry/{es2015 => es.next}/function-prototype-bind.js (100%) rename tests/jerry/{es2015 => es.next}/function-prototype-hasinstance-class.js (100%) rename tests/jerry/{es2015 => es.next}/function-prototype-hasinstance.js (100%) rename tests/jerry/{es2015 => es.next}/function-rest-parameter.js (100%) rename tests/jerry/{es2015 => es.next}/function-scope.js (100%) rename tests/jerry/{es2015 => es.next}/function-scope2.js (100%) rename tests/jerry/{es2015 => es.next}/generator-function.js (100%) rename tests/jerry/{es2015 => es.next}/generator-initializer.js (100%) rename tests/jerry/{es2015 => es.next}/generator-return.js (100%) rename tests/jerry/{es2015 => es.next}/generator-throw.js (100%) rename tests/jerry/{es2015 => es.next}/generator-yield-iterator.js (100%) rename tests/jerry/{es2015 => es.next}/generator-yield.js (100%) rename tests/jerry/{es2015 => es.next}/generator.js (100%) rename tests/jerry/{es2015 => es.next}/identifier-escape.js (100%) rename tests/jerry/{es2015 => es.next}/instanceof-symbol-hasinstance-class.js (100%) rename tests/jerry/{es2015 => es.next}/instanceof-symbol-hasinstance.js (100%) rename tests/jerry/{es2015 => es.next}/iterator-prototype.js (100%) rename tests/jerry/{es2015 => es.next}/json-stringify.js (100%) rename tests/jerry/{es2015 => es.next}/length-property.js (100%) rename tests/jerry/{es2015 => es.next}/let1.js (100%) rename tests/jerry/{es2015 => es.next}/let10.js (100%) rename tests/jerry/{es2015 => es.next}/let11.js (100%) rename tests/jerry/{es2015 => es.next}/let12.js (100%) rename tests/jerry/{es2015 => es.next}/let13.js (100%) rename tests/jerry/{es2015 => es.next}/let14.js (100%) rename tests/jerry/{es2015 => es.next}/let15.js (100%) rename tests/jerry/{es2015 => es.next}/let2.js (100%) rename tests/jerry/{es2015 => es.next}/let3.js (100%) rename tests/jerry/{es2015 => es.next}/let4.js (100%) rename tests/jerry/{es2015 => es.next}/let5.js (100%) rename tests/jerry/{es2015 => es.next}/let6.js (100%) rename tests/jerry/{es2015 => es.next}/let7.js (100%) rename tests/jerry/{es2015 => es.next}/let8.js (100%) rename tests/jerry/{es2015 => es.next}/let9.js (100%) rename tests/jerry/{es2015 => es.next}/map-iterators.js (100%) rename tests/jerry/{es2015 => es.next}/map-prototype-foreach.js (100%) rename tests/jerry/{es2015 => es.next}/map.js (100%) rename tests/jerry/{es2015 => es.next}/math-acosh.js (100%) rename tests/jerry/{es2015 => es.next}/math-asinh.js (100%) rename tests/jerry/{es2015 => es.next}/math-atanh.js (100%) rename tests/jerry/{es2015 => es.next}/math-cbrt.js (100%) rename tests/jerry/{es2015 => es.next}/math-cosh.js (100%) rename tests/jerry/{es2015 => es.next}/math-expm1.js (100%) rename tests/jerry/{es2015 => es.next}/math-functions-tonumber-rule2.js (100%) rename tests/jerry/{es2015 => es.next}/math-log10.js (100%) rename tests/jerry/{es2015 => es.next}/math-log1p.js (100%) rename tests/jerry/{es2015 => es.next}/math-log2.js (100%) rename tests/jerry/{es2015 => es.next}/math-sign.js (100%) rename tests/jerry/{es2015 => es.next}/math-sinh.js (100%) rename tests/jerry/{es2015 => es.next}/math-tanh.js (100%) rename tests/jerry/{es2015 => es.next}/math-trunc.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-01.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-02.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-03.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-04.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-05.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-06.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-07.js (100%) rename tests/jerry/{es2015 => es.next}/module-export-fail-test.js (100%) rename tests/jerry/{es2015 => es.next}/module-import-01.js (100%) rename tests/jerry/{es2015 => es.next}/module-import-02.js (100%) rename tests/jerry/{es2015 => es.next}/module-import-03.js (100%) rename tests/jerry/{es2015 => es.next}/module-import-04.js (100%) rename tests/jerry/{es2015 => es.next}/new-target-async.js (100%) rename tests/jerry/{es2015 => es.next}/new-target-class.js (100%) rename tests/jerry/{es2015 => es.next}/new-target-for-containers.js (100%) rename tests/jerry/{es2015 => es.next}/new-target-for-date-object.js (100%) rename tests/jerry/{es2015 => es.next}/new-target-generator.js (100%) rename tests/jerry/{es2015 => es.next}/new-target.js (100%) rename tests/jerry/{es2015 => es.next}/number-constants.js (100%) rename tests/jerry/{es2015 => es.next}/number-isfinite.js (100%) rename tests/jerry/{es2015 => es.next}/number-isinteger.js (100%) rename tests/jerry/{es2015 => es.next}/number-isnan.js (100%) rename tests/jerry/{es2015 => es.next}/number-issafeinteger.js (100%) rename tests/jerry/{es2015 => es.next}/number-methods.js (100%) rename tests/jerry/{es2015 => es.next}/object-assign.js (100%) rename tests/jerry/{es2015 => es.next}/object-computed-prescanner.js (100%) rename tests/jerry/{es2015 => es.next}/object-computed.js (100%) rename tests/jerry/{es2015 => es.next}/object-freeze-with-symbol.js (100%) rename tests/jerry/{es2015 => es.next}/object-get-own-property-names.js (100%) rename tests/jerry/{es2015 => es.next}/object-get-own-property-symbols.js (100%) rename tests/jerry/{es2015 => es.next}/object-getprototypeof.js (100%) rename tests/jerry/{es2015 => es.next}/object-initializer.js (100%) rename tests/jerry/{es2015 => es.next}/object-is.js (100%) rename tests/jerry/{es2015 => es.next}/object-methods.js (100%) rename tests/jerry/{es2015 => es.next}/object-pattern.js (100%) rename tests/jerry/{es2015 => es.next}/object-prototype-proto.js (100%) rename tests/jerry/{es2015 => es.next}/object-prototype-tostring.js (100%) rename tests/jerry/{es2015 => es.next}/object-seal-with-symbol.js (100%) rename tests/jerry/{es2015 => es.next}/octal-literal.js (100%) rename tests/jerry/{es2015 => es.next}/promise-all-iterator.js (100%) rename tests/jerry/{es2015 => es.next}/promise-new-target.js (100%) rename tests/jerry/{es2015 => es.next}/promise-race-iterator.js (100%) rename tests/jerry/{es2015 => es.next}/promise-species.js (100%) rename tests/jerry/{es2015 => es.next}/promise-thenable.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_call.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_construct.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_create.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_define_own_property.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_delete.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_get.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_get_own_property_descriptor.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_get_prototoype_of.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_has.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_is_extensible.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_own_keys.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_prevent_extensions.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_revocable.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_set.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_set_apply_receiver.js (100%) rename tests/jerry/{es2015 => es.next}/proxy_set_prototoype_of.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-apply.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-construct.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-define-Property.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-deleteproperty.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-get-own-property-description.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-get.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-getPrototypeOf.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-has.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-isextensible.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-own-keys.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-preventextensions.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-set.js (100%) rename tests/jerry/{es2015 => es.next}/reflect-setPrototypeOf.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-accessors-descriptors.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-construct.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-flags.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-lastindex.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-new-target.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-prototype-match.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-prototype-source.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-prototype-test.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-routines.js (100%) rename tests/jerry/{es2015 => es.next}/regexp-unicode.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1616.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1622.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1633.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1670.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1763.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1765.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1881.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1936.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1995.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1996.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-1997.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2107.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2110.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2111.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2143.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2181.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2414.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2435.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2465.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2468.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2486.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2487.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2488.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2489-original.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2490.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2528.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2544.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2587.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2602.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2603.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2657.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2658.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2664.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2666.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2667.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2671.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2693.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2698.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2724.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2743.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2757.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2768.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2769.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2770.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2777.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2779.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2782.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2783.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2822.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2823.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2825.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2842.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2848.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2850.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2851.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2852.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2853.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2854.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2891.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2895.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2910.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2911.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2947.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2948.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2950.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2951.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2975.js (91%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-2990.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3040.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3043-3046.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3045.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3049.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3050.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3062.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3063.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3067.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3070.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3072.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3078.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3079.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3084.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3095.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3097.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3105.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3106.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3107.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3109.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3129.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3162.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3204.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3222.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3237.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3243.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3250.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3252.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3262.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3267.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3298.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3306.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3348.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3355.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3356.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3360.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3361.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3363.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3364.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3376.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3381.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3383.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3390.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3396.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3408.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3409.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3411.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3419.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3420.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3421.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3422.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3431.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3434.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3437.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3454.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3455.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3458.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3459.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3478.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3479.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3483.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3485.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3519.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3527.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3534.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3536.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3580.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3588.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3589.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3595.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3606.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3611.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3625.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3628.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3630.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3636.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3637.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3640.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3641.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3647.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3655.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3656.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3658.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3665.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3671.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3715.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3751.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3760.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3784.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3785.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3787.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3812.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3814.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3817.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3819.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3820.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3822.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3823.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3824.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3825.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3836.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3837.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3845.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3849.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3860.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3861.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3862.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3866.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3868.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3870.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3871.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3880.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-3893.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-612.js (100%) rename tests/jerry/{es2015 => es.next}/regression-test-issue-782.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3302.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3395.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3713.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3727.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3841.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3842.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3856.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3857.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3869.js (100%) rename tests/jerry/{es2015 => es.next}/regresssion-test-issue-3888.js (100%) rename tests/jerry/{es2015 => es.next}/set-iterators.js (100%) rename tests/jerry/{es2015 => es.next}/set.js (100%) rename tests/jerry/{es2015 => es.next}/string-fromcodepoint.js (100%) rename tests/jerry/{es2015 => es.next}/string-iterator.js (100%) rename tests/jerry/{es2015 => es.next}/string-prototype-codepointat.js (100%) rename tests/jerry/{es2015 => es.next}/string-prototype-endswith.js (100%) rename tests/jerry/{es2015 => es.next}/string-prototype-includes.js (100%) rename tests/jerry/{es2015 => es.next}/string-prototype-match.js (100%) rename tests/jerry/{es2015 => es.next}/string-prototype-repeat.js (100%) rename tests/jerry/{es2015 => es.next}/string-prototype-split.js (100%) rename tests/jerry/{es2015 => es.next}/string-prototype-startswith.js (100%) rename tests/jerry/{es2015 => es.next}/string-raw-crash-escaping-backslash.js (100%) rename tests/jerry/{es2015 => es.next}/string-raw.js (100%) rename tests/jerry/{es2015 => es.next}/super-assignment.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-computed-object-literal.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-exception.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-in.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-isconcatspreadable.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-key-keyfor.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-prototype-symbol-toprimitive.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-prototype-tostring.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-prototype-valueof.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-prototype.toprimitive.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-replace.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-search.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-split.js (100%) rename tests/jerry/{es2015 => es.next}/symbol-unscopables.js (100%) rename tests/jerry/{es2015 => es.next}/symbol.js (100%) rename tests/jerry/{es2015 => es.next}/tagged-template-literal.js (100%) rename tests/jerry/{es2015 => es.next}/template_string.js (100%) rename tests/jerry/{es2015 => es.next}/to-number-string.js (100%) rename tests/jerry/{es2015 => es.next}/try-catch.js (100%) rename tests/jerry/{es2015 => es.next}/try-pattern.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-fill.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-find-index.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-find.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-join.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-set-with-typedArray.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-sort.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-stringify.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-subarray.js (100%) rename tests/jerry/{es2015 => es.next}/typedArray-tostring.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-from.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-of.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-copy-within.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-entires.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-indexof.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-keys.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-lastindexof.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-slice-ext-arraybuffer.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-slice.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-tolocalestring.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-prototype-values.js (100%) rename tests/jerry/{es2015 => es.next}/typedarray-symbol-properties.js (100%) rename tests/jerry/{es2015 => es.next}/weakmap.js (100%) rename tests/jerry/{es2015 => es.next}/weakset.js (100%) diff --git a/docs/00.GETTING-STARTED.md b/docs/00.GETTING-STARTED.md index 9ef07a4a8..8f5997c30 100644 --- a/docs/00.GETTING-STARTED.md +++ b/docs/00.GETTING-STARTED.md @@ -51,10 +51,10 @@ tools/build.py --debug --logging=on --error-messages=on --line-info=on python tools/build.py --cmake-param=CMAKE_PARAM ``` -**Set a profile mode (ES5.1, subset of ES2015, minimal)** +**Set a profile mode (ES.next, ES5.1, minimal)** ```bash -python tools/build.py --profile=es5.1|es2015-subset|minimal +python tools/build.py --profile=es.next|es5.1|minimal ``` See also the related [README.md](https://github.com/jerryscript-project/jerryscript/blob/master/jerry-core/profiles/README.md). diff --git a/docs/01.CONFIGURATION.md b/docs/01.CONFIGURATION.md index cef99932c..c22f5f149 100644 --- a/docs/01.CONFIGURATION.md +++ b/docs/01.CONFIGURATION.md @@ -41,7 +41,7 @@ that can be used by the debugger to identify the currently executed source conte ### Profiles This option can be used to enable/disable available JavaScript language features by providing profile files. Profile files contain a list of C definitions that configure each individual feature. -The `path` value for CMake and Python arguments should be a file path to the profile file, or one of `es2015-subset`, `es5.1`, or `minimal`, which are the pre-defined profiles. +The `path` value for CMake and Python arguments should be a file path to the profile file, or one of `es.next`, `es5.1`, or `minimal`, which are the pre-defined profiles. To see how a profile file should be created, or what configuration options are available in C, see the profile [README](https://github.com/jerryscript-project/jerryscript/blob/master/jerry-core/profiles/README.md). | Options | | diff --git a/docs/02.API-REFERENCE.md b/docs/02.API-REFERENCE.md index 46d040b7c..01eb5aabb 100644 --- a/docs/02.API-REFERENCE.md +++ b/docs/02.API-REFERENCE.md @@ -1459,10 +1459,10 @@ jerry_value_is_array (const jerry_value_t value) Returns whether the given `jerry_value_t` is an ArrayBuffer object. *Notes*: -- This API depends on a build option (`JERRY_ES2015_BUILTIN_TYPEDARRAY`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_TYPEDARRAY`) and can be checked in runtime with the `JERRY_FEATURE_TYPEDARRAY` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -1584,10 +1584,10 @@ jerry_value_is_constructor (const jerry_value_t value) Returns whether the given `jerry_value_t` is a DataView object value. *Notes*: -- This API depends on a build option (`JERRY_ES2015_BUILTIN_DATAVIEW`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_DATAVIEW`) and can be checked in runtime with the `JERRY_FEATURE_DATAVIEW` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -1841,10 +1841,10 @@ jerry_value_is_object (const jerry_value_t value) Returns whether the given `jerry_value_t` is a promise value. *Notes*: -- This API depends on a build option (`JERRY_ES2015_BUILTIN_PROMISE`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked in runtime with the `JERRY_FEATURE_PROMISE` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -1890,10 +1890,10 @@ jerry_value_is_promise (const jerry_value_t value) Returns whether the given `jerry_value_t` is a proxy value. *Notes*: -- This API depends on a build option (`JERRY_ES2015_BUILTIN_PROXY`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_PROXY`) and can be checked in runtime with the `JERRY_FEATURE_PROXY` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -1978,10 +1978,10 @@ jerry_value_is_string (const jerry_value_t value) Returns whether the given `jerry_value_t` is a symbol value. *Notes*: -- This API depends on a build option (`JERRY_ES2015_BUILTIN_SYMBOL`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_SYMBOL`) and can be checked in runtime with the `JERRY_FEATURE_SYMBOL` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -2038,10 +2038,10 @@ main (void) Checks whether the given `jerry_value_t` is a TypedArray object or not. *Notes*: -- This API depends on a build option (`JERRY_ES2015_BUILTIN_TYPEDARRAY`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_TYPEDARRAY`) and can be checked in runtime with the `JERRY_FEATURE_TYPEDARRAY` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -2096,11 +2096,11 @@ main (void) Checks whether the given `jerry_value_t` is the given `jerry_container_type_t` type container object. *Notes* -- This API function depends on a build option (`JERRY_ES2015_BUILTIN_CONTAINER`) and can be checked +- This API function depends on a build option (`JERRY_BUILTIN_CONTAINER`) and can be checked runtime with the `JERRY_FEATURE_MAP, JERRY_FEATURE_SET, JERRY_FEATURE_WEAKMAP, JERRY_FEATURE_WEAKSET` feature enum values. see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. *New in version 2.3*. @@ -3376,7 +3376,7 @@ jerry_value_to_string (const jerry_value_t value); # Functions for promise objects -These APIs all depend on the ES2015-subset profile (or on some build options). +These APIs all depend on the es.next profile (or on some build options). ## jerry_get_promise_result @@ -3387,10 +3387,10 @@ The function returns the result of a Promise object. *Notes*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_PROMISE`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked in runtime with the `JERRY_FEATURE_PROMISE` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -3454,10 +3454,10 @@ example (void) *Notes*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_PROMISE`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked in runtime with the `JERRY_FEATURE_PROMISE` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -3525,10 +3525,10 @@ Resolve or reject the promise with an argument. *Note*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_PROMISE`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_PROMISE`) and can be checked in runtime with the `JERRY_FEATURE_PROMISE` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -3582,7 +3582,7 @@ jerry_resolve_or_reject_promise (jerry_value_t promise, # Functions for symbols -These APIs all depend on the ES2015-subset profile (or on build options). +These APIs all depend on the es.next profile (or on build options). ## jerry_get_symbol_descriptive_string @@ -3594,10 +3594,10 @@ Based on ECMA 262 v6 19.4.3.2.1 this is in the form of `Symbol()`. *Notes*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_SYMBOL`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_SYMBOL`) and can be checked in runtime with the `JERRY_FEATURE_SYMBOL` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. - If the symbol support is not enabled an error will be returned. **Prototype** @@ -3767,7 +3767,7 @@ jerry_create_array (uint32_t size); Create a jerry_value_t representing an ArrayBuffer object. *Note*: - - This API depends on the ES2015-subset profile. + - This API depends on the es.next profile. - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. @@ -3815,7 +3815,7 @@ After the object is not needed the GC will call the `free_cb` so the user can release the buffer which was provided. *Note*: - - This API depends on the ES2015-subset profile. + - This API depends on the es.next profile. - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. @@ -3988,7 +3988,7 @@ jerry_create_error_sz (jerry_error_t error_type, Create new JavaScript DataView object. *Note*: - - This API depends on the ES2015-subset profile. + - This API depends on the es.next profile. - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. @@ -4304,7 +4304,7 @@ Create an empty promise object which can be resolved or rejected later by calling jerry_resolve_or_reject_promise. *Note*: - - This API depends on the ES2015-subset profile. + - This API depends on the es.next profile. - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. @@ -4344,7 +4344,7 @@ jerry_create_promise (void) Create a new Proxy object with the given target and handler. *Note*: - - This API depends on the ES2015-subset profile. + - This API depends on the es.next profile. - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. @@ -4572,7 +4572,7 @@ Create symbol from an API value. *Note*: - The given argument is converted to string. This operation can throw an error. - - This API depends on the ES2015-subset profile. + - This API depends on the es.next profile. - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. @@ -4714,10 +4714,10 @@ and element count can be specified. *Notes*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_TYPEDARRAY`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_TYPEDARRAY`) and can be checked in runtime with the `JERRY_FEATURE_TYPEDARRAY` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -4770,10 +4770,10 @@ one of the allowed TypedArray functions. *Notes*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_TYPEDARRAY`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_TYPEDARRAY`) and can be checked in runtime with the `JERRY_FEATURE_TYPEDARRAY` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -4831,10 +4831,10 @@ one of the allowed TypedArray functions. *Notes*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_TYPEDARRAY`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_TYPEDARRAY`) and can be checked in runtime with the `JERRY_FEATURE_TYPEDARRAY` feature enum value, see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. **Prototype** @@ -4887,11 +4887,11 @@ Create a jerry_value_t representing a given type container object. - This method is expected to work the same way as the JavaScript Map constructor. - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This API depends on a build option (`JERRY_ES2015_BUILTIN_CONTAINER`) and can be checked +- This API depends on a build option (`JERRY_BUILTIN_CONTAINER`) and can be checked in runtime with the `JERRY_FEATURE_MAP, JERRY_FEATURE_SET, JERRY_FEATURE_WEAKMAP, JERRY_FEATURE_WEAKSET` feature enum values. see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- The ES2015-subset profile enables this by default. +- The es.next profile enables this by default. *New in version 2.3*. @@ -7926,10 +7926,10 @@ If used outside of a native C function it will return "undefined" value. *Notes*: - Returned value must be freed with [jerry_release_value](#jerry_release_value) when it is no longer needed. -- This feature depends on build option (`JERRY_ES2015`) and can be checked - in runtime with the `JERRY_FEATURE_SYMBOL` feature enum value (as symbols are enabled in case of ES2015), +- This feature depends on build option (`JERRY_ESNEXT`) and can be checked + in runtime with the `JERRY_FEATURE_SYMBOL` feature enum value (as symbols are enabled in case of ES.next), see: [jerry_is_feature_enabled](#jerry_is_feature_enabled). -- If the ES2015 mode is not enabled this method will always return the "undefined" value. +- If the ES.next mode is not enabled this method will always return the "undefined" value. **Prototype** @@ -8050,7 +8050,7 @@ main (int argc, char** argv) # ArrayBuffer and TypedArray functions -These APIs all depend on the ES2015-subset profile. +These APIs all depend on the es.next profile. ## jerry_get_arraybuffer_byte_length diff --git a/docs/05.PORT-API.md b/docs/05.PORT-API.md index b25fe68ad..1f96482ee 100644 --- a/docs/05.PORT-API.md +++ b/docs/05.PORT-API.md @@ -83,7 +83,7 @@ information. void jerry_port_print_char (char c); ``` -### ES2015 Module system +### Jerry Module system The port API provides functions that can be used by the module system to open and close source files, and normalize file paths. @@ -135,7 +135,7 @@ jerry_port_normalize_path (const char *in_path_p, /**< input file path */ * Get the module object of a native module. * * Note: - * This port function is called by jerry-core when ES2015_MODULE_SYSTEM + * This port function is called by jerry-core when JERRY_MODULE_SYSTEM * is enabled. * * @param name String value of the module specifier. diff --git a/docs/15.MODULE-SYSTEM.md b/docs/15.MODULE-SYSTEM.md index 93ec443c7..1df02f0c1 100644 --- a/docs/15.MODULE-SYSTEM.md +++ b/docs/15.MODULE-SYSTEM.md @@ -2,7 +2,7 @@ The module system allows users to write import and export statements in scripts, which can be used to separate the logic of the application into custom modules. The standard's relevant part can be found [here](https://www.ecma-international.org/ecma-262/6.0/#sec-modules). -Embedders wishing to use native builtin modules with ES6 imports can use the [Port API](05.PORT-API.md#es2015-module-system) to do so. +Embedders wishing to use native builtin modules with ES6 imports can use the [Port API](05.PORT-API.md#jerry-module-system) to do so. ## General @@ -76,7 +76,7 @@ export var version = "1.0 (e92ae0fb)"; ```js // module_2.js -var featureName = "EcmaScript 2015 modules"; +var featureName = "EcmaScript modules"; var year = 2018; export function getFeatureDetails() { diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt index 92a65baf2..066c6f749 100644 --- a/jerry-core/CMakeLists.txt +++ b/jerry-core/CMakeLists.txt @@ -17,31 +17,31 @@ set(JERRY_CORE_NAME jerry-core) project (${JERRY_CORE_NAME} C) # Optional build settings -set(ENABLE_ALL_IN_ONE OFF CACHE BOOL "Enable all-in-one build?") +set(ENABLE_ALL_IN_ONE OFF CACHE BOOL "Enable all-in-one build?") # Optional features -set(JERRY_CPOINTER_32_BIT OFF CACHE BOOL "Enable 32 bit compressed pointers?") -set(JERRY_DEBUGGER OFF CACHE BOOL "Enable JerryScript debugger?") -set(JERRY_ERROR_MESSAGES OFF CACHE BOOL "Enable error messages?") -set(JERRY_EXTERNAL_CONTEXT OFF CACHE BOOL "Enable external context?") -set(JERRY_PARSER ON CACHE BOOL "Enable javascript-parser?") -set(JERRY_LINE_INFO OFF CACHE BOOL "Enable line info?") -set(JERRY_LOGGING OFF CACHE BOOL "Enable logging?") -set(JERRY_MEM_STATS OFF CACHE BOOL "Enable memory statistics?") -set(JERRY_MEM_GC_BEFORE_EACH_ALLOC OFF CACHE BOOL "Enable mem-stress test?") -set(JERRY_PARSER_DUMP_BYTE_CODE OFF CACHE BOOL "Enable parser byte-code dumps?") -set(JERRY_PROFILE "es5.1" CACHE STRING "Use default or other profile?") -set(JERRY_REGEXP_STRICT_MODE OFF CACHE BOOL "Enable regexp strict mode?") -set(JERRY_REGEXP_DUMP_BYTE_CODE OFF CACHE BOOL "Enable regexp byte-code dumps?") -set(JERRY_SNAPSHOT_EXEC OFF CACHE BOOL "Enable executing snapshot files?") -set(JERRY_SNAPSHOT_SAVE OFF CACHE BOOL "Enable saving snapshot files?") -set(JERRY_SYSTEM_ALLOCATOR OFF CACHE BOOL "Enable system allocator?") -set(JERRY_VALGRIND OFF CACHE BOOL "Enable Valgrind support?") -set(JERRY_VM_EXEC_STOP OFF CACHE BOOL "Enable VM execution stopping?") -set(JERRY_GLOBAL_HEAP_SIZE "(512)" CACHE STRING "Size of memory heap, in kilobytes") -set(JERRY_GC_LIMIT "(0)" CACHE STRING "Heap usage limit to trigger garbage collection") -set(JERRY_STACK_LIMIT "(0)" CACHE STRING "Maximum stack usage size, in kilobytes") -set(JERRY_GC_MARK_LIMIT "(8)" CACHE STRING "Maximum depth of recursion during GC mark phase") +set(JERRY_CPOINTER_32_BIT OFF CACHE BOOL "Enable 32 bit compressed pointers?") +set(JERRY_DEBUGGER OFF CACHE BOOL "Enable JerryScript debugger?") +set(JERRY_ERROR_MESSAGES OFF CACHE BOOL "Enable error messages?") +set(JERRY_EXTERNAL_CONTEXT OFF CACHE BOOL "Enable external context?") +set(JERRY_PARSER ON CACHE BOOL "Enable javascript-parser?") +set(JERRY_LINE_INFO OFF CACHE BOOL "Enable line info?") +set(JERRY_LOGGING OFF CACHE BOOL "Enable logging?") +set(JERRY_MEM_STATS OFF CACHE BOOL "Enable memory statistics?") +set(JERRY_MEM_GC_BEFORE_EACH_ALLOC OFF CACHE BOOL "Enable mem-stress test?") +set(JERRY_PARSER_DUMP_BYTE_CODE OFF CACHE BOOL "Enable parser byte-code dumps?") +set(JERRY_PROFILE "es.next" CACHE STRING "Use default or other profile?") +set(JERRY_REGEXP_STRICT_MODE OFF CACHE BOOL "Enable regexp strict mode?") +set(JERRY_REGEXP_DUMP_BYTE_CODE OFF CACHE BOOL "Enable regexp byte-code dumps?") +set(JERRY_SNAPSHOT_EXEC OFF CACHE BOOL "Enable executing snapshot files?") +set(JERRY_SNAPSHOT_SAVE OFF CACHE BOOL "Enable saving snapshot files?") +set(JERRY_SYSTEM_ALLOCATOR OFF CACHE BOOL "Enable system allocator?") +set(JERRY_VALGRIND OFF CACHE BOOL "Enable Valgrind support?") +set(JERRY_VM_EXEC_STOP OFF CACHE BOOL "Enable VM execution stopping?") +set(JERRY_GLOBAL_HEAP_SIZE "(512)" CACHE STRING "Size of memory heap, in kilobytes") +set(JERRY_GC_LIMIT "(0)" CACHE STRING "Heap usage limit to trigger garbage collection") +set(JERRY_STACK_LIMIT "(0)" CACHE STRING "Maximum stack usage size, in kilobytes") +set(JERRY_GC_MARK_LIMIT "(8)" CACHE STRING "Maximum depth of recursion during GC mark phase") # Option overrides if(USING_MSVC) @@ -254,6 +254,10 @@ jerry_add_define01(JERRY_MEM_GC_BEFORE_EACH_ALLOC) jerry_add_define01(JERRY_PARSER_DUMP_BYTE_CODE) # Profile +if (${JERRY_PROFILE} STREQUAL "es2015-subset") + message(DEPRECATION "'es2015-subset' profile is deprecated, please use 'es.next' instead.") +endif() + if (NOT IS_ABSOLUTE ${JERRY_PROFILE}) set(JERRY_PROFILE "${CMAKE_CURRENT_SOURCE_DIR}/profiles/${JERRY_PROFILE}.profile") endif() diff --git a/jerry-core/api/jerry-snapshot.c b/jerry-core/api/jerry-snapshot.c index 45cb45ec0..aef629335 100644 --- a/jerry-core/api/jerry-snapshot.c +++ b/jerry-core/api/jerry-snapshot.c @@ -45,9 +45,9 @@ snapshot_get_global_flags (bool has_regex, /**< regex literal is present */ #if ENABLED (JERRY_BUILTIN_REGEXP) flags |= (has_regex ? JERRY_SNAPSHOT_HAS_REGEX_LITERAL : 0); #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) flags |= (has_class ? JERRY_SNAPSHOT_HAS_CLASS_LITERAL : 0); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return flags; } /* snapshot_get_global_flags */ @@ -63,9 +63,9 @@ snapshot_check_global_flags (uint32_t global_flags) /**< global flags */ #if ENABLED (JERRY_BUILTIN_REGEXP) global_flags &= (uint32_t) ~JERRY_SNAPSHOT_HAS_REGEX_LITERAL; #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) global_flags &= (uint32_t) ~JERRY_SNAPSHOT_HAS_CLASS_LITERAL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return global_flags == snapshot_get_global_flags (false, false); } /* snapshot_check_global_flags */ @@ -160,7 +160,7 @@ snapshot_add_compiled_code (ecma_compiled_code_t *compiled_code_p, /**< compiled uint8_t *copied_code_start_p = snapshot_buffer_p + globals_p->snapshot_buffer_write_offset; ecma_compiled_code_t *copied_code_p = (ecma_compiled_code_t *) copied_code_start_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (compiled_code_p->status_flags & CBC_CODE_FLAG_HAS_TAGGED_LITERALS) { const char * const error_message_p = "Unsupported feature: tagged template literals."; @@ -172,7 +172,7 @@ snapshot_add_compiled_code (ecma_compiled_code_t *compiled_code_p, /**< compiled { globals_p->class_found = true; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_REGEXP) if (!(compiled_code_p->status_flags & CBC_CODE_FLAGS_FUNCTION)) @@ -618,7 +618,7 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th extra_bytes += (uint32_t) (argument_end * sizeof (ecma_value_t)); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* function name */ if (!(bytecode_p->status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR)) { @@ -630,7 +630,7 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th { extra_bytes += (uint32_t) sizeof (ecma_value_t); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_RESOURCE_NAME) /* resource name */ @@ -1000,12 +1000,12 @@ jerry_snapshot_result (const uint32_t *snapshot_p, /**< snapshot */ if (as_function) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (bytecode_p->status_flags & CBC_CODE_FLAGS_LEXICAL_BLOCK_NEEDED) { ecma_create_global_lexical_block (); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *lex_env_p = ecma_get_global_scope (); ecma_object_t *func_obj_p = ecma_op_create_simple_function_object (lex_env_p, bytecode_p); diff --git a/jerry-core/api/jerry.c b/jerry-core/api/jerry.c index dc93ebc6a..6c51147d1 100644 --- a/jerry-core/api/jerry.c +++ b/jerry-core/api/jerry.c @@ -74,12 +74,12 @@ JERRY_STATIC_ASSERT ((int) RE_FLAG_GLOBAL == (int) JERRY_REGEXP_FLAG_GLOBAL re_flags_t_must_be_equal_to_jerry_regexp_flags_t); #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) /* The internal ECMA_PROMISE_STATE_* values are "one byte away" from the API values */ JERRY_STATIC_ASSERT ((int) ECMA_PROMISE_IS_PENDING == (int) JERRY_PROMISE_STATE_PENDING && (int) ECMA_PROMISE_IS_FULFILLED == (int) JERRY_PROMISE_STATE_FULFILLED, promise_internal_state_matches_external); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ /** * Offset between internal and external arithmetic operator types @@ -232,9 +232,9 @@ jerry_cleanup (void) } } -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) ecma_free_all_enqueued_jobs (); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ ecma_finalize (); jerry_make_api_unavailable (); @@ -628,11 +628,11 @@ jerry_run_all_enqueued_jobs (void) { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) return ecma_process_all_enqueued_jobs (); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ return ECMA_VALUE_UNDEFINED; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ } /* jerry_run_all_enqueued_jobs */ /** @@ -796,13 +796,13 @@ bool jerry_value_is_promise (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) return (ecma_is_value_object (value) && ecma_is_promise (ecma_get_object_from_value (value))); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ } /* jerry_value_is_promise */ /** @@ -815,13 +815,13 @@ bool jerry_value_is_proxy (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) return (ecma_is_value_object (value) && ECMA_OBJECT_IS_PROXY (ecma_get_object_from_value (value))); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ } /* jerry_value_is_proxy */ /** @@ -849,12 +849,12 @@ jerry_value_is_symbol (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) return ecma_is_value_symbol (value); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* jerry_value_is_symbol */ /** @@ -908,12 +908,12 @@ jerry_value_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_TYPE_STRING; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LIT_MAGIC_STRING_SYMBOL: { return JERRY_TYPE_SYMBOL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LIT_MAGIC_STRING_FUNCTION: { return JERRY_TYPE_FUNCTION; @@ -975,21 +975,21 @@ jerry_is_feature_enabled (const jerry_feature_t feature) /**< feature to check * #if ENABLED (JERRY_BUILTIN_JSON) || feature == JERRY_FEATURE_JSON #endif /* ENABLED (JERRY_BUILTIN_JSON) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) || feature == JERRY_FEATURE_PROMISE -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#if ENABLED (JERRY_ESNEXT) || feature == JERRY_FEATURE_SYMBOL -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) || feature == JERRY_FEATURE_TYPEDARRAY -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#if ENABLED (JERRY_BUILTIN_DATAVIEW) || feature == JERRY_FEATURE_DATAVIEW -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#if ENABLED (JERRY_BUILTIN_PROXY) || feature == JERRY_FEATURE_PROXY -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ #if ENABLED (JERRY_BUILTIN_DATE) || feature == JERRY_FEATURE_DATE #endif /* ENABLED (JERRY_BUILTIN_DATE) */ @@ -1002,18 +1002,18 @@ jerry_is_feature_enabled (const jerry_feature_t feature) /**< feature to check * #if ENABLED (JERRY_LOGGING) || feature == JERRY_FEATURE_LOGGING #endif /* ENABLED (JERRY_LOGGING) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) || feature == JERRY_FEATURE_MAP -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#if ENABLED (JERRY_BUILTIN_SET) || feature == JERRY_FEATURE_SET -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#if ENABLED (JERRY_BUILTIN_WEAKMAP) || feature == JERRY_FEATURE_WEAKMAP -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#if ENABLED (JERRY_BUILTIN_WEAKSET) || feature == JERRY_FEATURE_WEAKSET -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ ); } /* jerry_is_feature_enabled */ @@ -1614,7 +1614,7 @@ jerry_create_promise (void) { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target); if (old_new_target_p == NULL) @@ -1626,9 +1626,9 @@ jerry_create_promise (void) JERRY_CONTEXT (current_new_target) = old_new_target_p; return promise_value; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Promise not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ } /* jerry_create_promise */ /** @@ -1651,12 +1651,12 @@ jerry_create_proxy (const jerry_value_t target, /**< target argument */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) ecma_object_t *proxy_p = ecma_proxy_create (target, handler); return jerry_return (proxy_p == NULL ? ECMA_VALUE_ERROR : ecma_make_object_value (proxy_p)); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Proxy is not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ } /* jerry_create_proxy */ /** @@ -1746,11 +1746,11 @@ jerry_create_symbol (const jerry_value_t value) /**< api value */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) return jerry_return (ecma_op_create_symbol (&value, 1)); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Symbol is not supported."))); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* jerry_create_symbol */ /** @@ -2109,7 +2109,7 @@ jerry_has_own_property (const jerry_value_t obj_val, /**< object value */ ecma_object_t *obj_p = ecma_get_object_from_value (obj_val); ecma_string_t *prop_name_p = ecma_get_prop_name_from_value (prop_name_val); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_property_descriptor_t prop_desc; @@ -2123,7 +2123,7 @@ jerry_has_own_property (const jerry_value_t obj_val, /**< object value */ return jerry_return (status); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ecma_make_boolean_value (ecma_op_ordinary_object_has_own_property (obj_p, prop_name_p)); } /* jerry_has_own_property */ @@ -2190,13 +2190,13 @@ jerry_delete_property (const jerry_value_t obj_val, /**< object value */ ecma_get_prop_name_from_value (prop_name_val), false); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (ret_value)) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ecma_is_value_true (ret_value); } /* jerry_delete_property */ @@ -2224,13 +2224,13 @@ jerry_delete_property_by_index (const jerry_value_t obj_val, /**< object value * false); ecma_deref_ecma_string (str_idx_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (ret_value)) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ecma_is_value_true (ret_value); } /* jerry_delete_property_by_index */ @@ -2678,13 +2678,13 @@ jerry_get_own_property_descriptor (const jerry_value_t obj_val, /**< object val ecma_get_prop_name_from_value (prop_name_val), &prop_desc); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (status)) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (!ecma_is_value_true (status)) { @@ -2927,12 +2927,12 @@ jerry_get_prototype (const jerry_value_t obj_val) /**< object value */ ecma_object_t *obj_p = ecma_get_object_from_value (obj_val); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { return jerry_return (ecma_proxy_object_get_prototype_of (obj_p)); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (obj_p->u2.prototype_cp == JMEM_CP_NULL) { @@ -2965,12 +2965,12 @@ jerry_set_prototype (const jerry_value_t obj_val, /**< object value */ } ecma_object_t *obj_p = ecma_get_object_from_value (obj_val); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { return jerry_return (ecma_proxy_object_set_prototype_of (obj_p, proto_obj_val)); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ecma_op_ordinary_object_set_prototype_of (obj_p, proto_obj_val); } /* jerry_set_prototype */ @@ -3201,14 +3201,14 @@ jerry_foreach_object_property (const jerry_value_t obj_val, /**< object value */ ecma_object_t *object_p = ecma_get_object_from_value (obj_val); ecma_collection_t *names_p = ecma_op_object_get_property_names (object_p, ECMA_LIST_ENUMERABLE_PROTOTYPE); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (names_p == NULL) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); return false; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t *buffer_p = names_p->buffer_p; @@ -3255,7 +3255,7 @@ jerry_resolve_or_reject_promise (jerry_value_t promise, /**< the promise value * { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) if (!ecma_is_value_object (promise) || !ecma_is_promise (ecma_get_object_from_value (promise))) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -3279,13 +3279,13 @@ jerry_resolve_or_reject_promise (jerry_value_t promise, /**< the promise value * ecma_free_value (function); return ret; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ JERRY_UNUSED (promise); JERRY_UNUSED (argument); JERRY_UNUSED (is_resolve); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Promise not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ } /* jerry_resolve_or_reject_promise */ /** @@ -3299,17 +3299,17 @@ jerry_get_promise_result (const jerry_value_t promise) /**< promise object to ge { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) if (!jerry_value_is_promise (promise)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); } return ecma_promise_get_result (ecma_get_object_from_value (promise)); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ JERRY_UNUSED (promise); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Promise not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ } /* jerry_get_promise_result */ /** @@ -3324,7 +3324,7 @@ jerry_get_promise_state (const jerry_value_t promise) /**< promise object to get { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) if (!jerry_value_is_promise (promise)) { return JERRY_PROMISE_STATE_NONE; @@ -3334,10 +3334,10 @@ jerry_get_promise_state (const jerry_value_t promise) /**< promise object to get flags &= (ECMA_PROMISE_IS_PENDING | ECMA_PROMISE_IS_FULFILLED); return (flags ? flags : JERRY_PROMISE_STATE_REJECTED); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ JERRY_UNUSED (promise); return JERRY_PROMISE_STATE_NONE; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ } /* jerry_get_promise_state */ /** @@ -3354,7 +3354,7 @@ jerry_get_symbol_descriptive_string (const jerry_value_t symbol) /**< symbol val { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!ecma_is_value_symbol (symbol)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -3362,11 +3362,11 @@ jerry_get_symbol_descriptive_string (const jerry_value_t symbol) /**< symbol val /* Note: This operation cannot throw an error */ return ecma_get_symbol_descriptive_string (symbol); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (symbol); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Symbol is not supported."))); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /** jerry_get_symbol_descriptive_string */ /** @@ -3589,7 +3589,7 @@ jerry_get_resource_name (const jerry_value_t value) /**< jerry api value */ jerry_value_t jerry_get_new_target (void) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_object_t *current_new_target = JERRY_CONTEXT (current_new_target); if (current_new_target == NULL) @@ -3599,9 +3599,9 @@ jerry_get_new_target (void) ecma_ref_object (current_new_target); return ecma_make_object_value (current_new_target); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ return jerry_create_undefined (); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* jerry_get_new_target */ /** @@ -3615,12 +3615,12 @@ jerry_value_is_arraybuffer (const jerry_value_t value) /**< value to check if it { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) return ecma_is_arraybuffer (value); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_value_is_arraybuffer */ /** @@ -3638,12 +3638,12 @@ jerry_create_arraybuffer (const jerry_length_t size) /**< size of the ArrayBuffe { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) return jerry_return (ecma_make_object_value (ecma_arraybuffer_new_object (size))); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (size); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_create_arraybuffer */ /** @@ -3664,7 +3664,7 @@ jerry_create_arraybuffer_external (const jerry_length_t size, /**< size of the b { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) ecma_object_t *arraybuffer; if (JERRY_UNLIKELY (size == 0 || buffer_p == NULL)) @@ -3679,12 +3679,12 @@ jerry_create_arraybuffer_external (const jerry_length_t size, /**< size of the b } return jerry_return (ecma_make_object_value (arraybuffer)); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (size); JERRY_UNUSED (buffer_p); JERRY_UNUSED (free_cb); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_create_arraybuffer_external */ /** @@ -3703,7 +3703,7 @@ jerry_arraybuffer_write (const jerry_value_t value, /**< target ArrayBuffer */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (!ecma_is_arraybuffer (value)) { return 0; @@ -3727,13 +3727,13 @@ jerry_arraybuffer_write (const jerry_value_t value, /**< target ArrayBuffer */ } return copy_count; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); JERRY_UNUSED (offset); JERRY_UNUSED (buf_p); JERRY_UNUSED (buf_size); return 0; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_arraybuffer_write */ /** @@ -3752,7 +3752,7 @@ jerry_arraybuffer_read (const jerry_value_t value, /**< ArrayBuffer to read from { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (!ecma_is_arraybuffer (value)) { return 0; @@ -3776,13 +3776,13 @@ jerry_arraybuffer_read (const jerry_value_t value, /**< ArrayBuffer to read from } return copy_count; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); JERRY_UNUSED (offset); JERRY_UNUSED (buf_p); JERRY_UNUSED (buf_size); return 0; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_arraybuffer_read */ /** @@ -3798,15 +3798,15 @@ jerry_get_arraybuffer_byte_length (const jerry_value_t value) /**< ArrayBuffer * { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_is_arraybuffer (value)) { ecma_object_t *buffer_p = ecma_get_object_from_value (value); return ecma_arraybuffer_get_length (buffer_p); } -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ return 0; } /* jerry_get_arraybuffer_byte_length */ @@ -3825,7 +3825,7 @@ jerry_get_arraybuffer_pointer (const jerry_value_t array_buffer) /**< Array Buff { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_is_value_error_reference (array_buffer) || !ecma_is_arraybuffer (array_buffer)) { @@ -3835,9 +3835,9 @@ jerry_get_arraybuffer_pointer (const jerry_value_t array_buffer) /**< Array Buff ecma_object_t *buffer_p = ecma_get_object_from_value (array_buffer); lit_utf8_byte_t *mem_buffer_p = ecma_arraybuffer_get_buffer (buffer_p); return (uint8_t *const) mem_buffer_p; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (array_buffer); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ return NULL; } /* jerry_get_arraybuffer_pointer */ @@ -3853,15 +3853,15 @@ jerry_is_arraybuffer_detachable (const jerry_value_t value) /**< ArrayBuffer */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_is_arraybuffer (value)) { ecma_object_t *buffer_p = ecma_get_object_from_value (value); return ecma_arraybuffer_is_detachable (buffer_p) ? ECMA_VALUE_TRUE : ECMA_VALUE_FALSE; } -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Expects an ArrayBuffer"))); } /* jerry_is_arraybuffer_detachable */ @@ -3878,7 +3878,7 @@ jerry_detach_arraybuffer (const jerry_value_t value) /**< ArrayBuffer */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_is_arraybuffer (value)) { ecma_object_t *buffer_p = ecma_get_object_from_value (value); @@ -3889,9 +3889,9 @@ jerry_detach_arraybuffer (const jerry_value_t value) /**< ArrayBuffer */ } return ECMA_VALUE_NULL; } -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Expects an ArrayBuffer"))); } /* jerry_detach_arraybuffer */ @@ -3916,7 +3916,7 @@ jerry_create_dataview (const jerry_value_t array_buffer, /**< arraybuffer to cre { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) if (ecma_is_value_error_reference (array_buffer)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -3930,12 +3930,12 @@ jerry_create_dataview (const jerry_value_t array_buffer, /**< arraybuffer to cre }; return jerry_return (ecma_op_dataview_create (arguments_p, 3)); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) */ +#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */ JERRY_UNUSED (array_buffer); JERRY_UNUSED (byte_offset); JERRY_UNUSED (byte_length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("DataView is not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ } /* jerry_create_dataview */ /** @@ -3949,12 +3949,12 @@ jerry_value_is_dataview (const jerry_value_t value) /**< value to check if it is { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) return ecma_is_dataview (value); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) */ +#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ } /* jerry_value_is_dataview */ /** @@ -3976,7 +3976,7 @@ jerry_get_dataview_buffer (const jerry_value_t value, /**< DataView to get the a { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) if (ecma_is_value_error_reference (value)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -4003,12 +4003,12 @@ jerry_get_dataview_buffer (const jerry_value_t value, /**< DataView to get the a ecma_ref_object (arraybuffer_p); return ecma_make_object_value (arraybuffer_p); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) */ +#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */ JERRY_UNUSED (value); JERRY_UNUSED (byte_offset); JERRY_UNUSED (byte_length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("DataView is not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ } /* jerry_get_dataview_buffer */ /** @@ -4026,15 +4026,15 @@ jerry_value_is_typedarray (jerry_value_t value) /**< value to check if it is a T { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) return ecma_is_typedarray (value); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_value_is_typedarray */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /** * TypedArray mapping type */ @@ -4101,7 +4101,7 @@ jerry_typedarray_find_by_type (jerry_typedarray_type_t type_name, /**< type of t return false; } /* jerry_typedarray_find_by_type */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ /** * Create a TypedArray object with a given type and length. @@ -4119,7 +4119,7 @@ jerry_create_typedarray (jerry_typedarray_type_t type_name, /**< type of TypedAr { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) ecma_builtin_id_t prototype_id = 0; ecma_typedarray_type_t id = 0; uint8_t element_size_shift = 0; @@ -4140,11 +4140,11 @@ jerry_create_typedarray (jerry_typedarray_type_t type_name, /**< type of TypedAr JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (array_value)); return array_value; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (type_name); JERRY_UNUSED (length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("TypedArray not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_create_typedarray */ /** @@ -4164,7 +4164,7 @@ jerry_create_typedarray_for_arraybuffer_sz (jerry_typedarray_type_t type_name, / { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_is_value_error_reference (arraybuffer)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_value_msg_p))); @@ -4197,13 +4197,13 @@ jerry_create_typedarray_for_arraybuffer_sz (jerry_typedarray_type_t type_name, / ecma_free_value (arguments_p[2]); return jerry_return (array_value); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (type_name); JERRY_UNUSED (arraybuffer); JERRY_UNUSED (byte_offset); JERRY_UNUSED (length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("TypedArray not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_create_typedarray_for_arraybuffer_sz */ /** @@ -4221,7 +4221,7 @@ jerry_create_typedarray_for_arraybuffer (jerry_typedarray_type_t type_name, /**< { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_is_value_error_reference (arraybuffer)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_value_msg_p))); @@ -4229,11 +4229,11 @@ jerry_create_typedarray_for_arraybuffer (jerry_typedarray_type_t type_name, /**< jerry_length_t byteLength = jerry_get_arraybuffer_byte_length (arraybuffer); return jerry_create_typedarray_for_arraybuffer_sz (type_name, arraybuffer, 0, byteLength); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (type_name); JERRY_UNUSED (arraybuffer); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("TypedArray not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_create_typedarray_for_arraybuffer */ /** @@ -4247,7 +4247,7 @@ jerry_get_typedarray_type (jerry_value_t value) /**< object to get the TypedArra { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (!ecma_is_typedarray (value)) { return JERRY_TYPEDARRAY_INVALID; @@ -4263,9 +4263,9 @@ jerry_get_typedarray_type (jerry_value_t value) /**< object to get the TypedArra return jerry_typedarray_mappings[i].api_type; } } -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ return JERRY_TYPEDARRAY_INVALID; } /* jerry_get_typedarray_type */ @@ -4280,15 +4280,15 @@ jerry_get_typedarray_length (jerry_value_t value) /**< TypedArray to query */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_is_typedarray (value)) { ecma_object_t *array_p = ecma_get_object_from_value (value); return ecma_typedarray_get_length (array_p); } -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ return 0; } /* jerry_get_typedarray_length */ @@ -4312,7 +4312,7 @@ jerry_get_typedarray_buffer (jerry_value_t value, /**< TypedArray to get the arr { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (!ecma_is_typedarray (value)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Object is not a TypedArray."))); @@ -4334,12 +4334,12 @@ jerry_get_typedarray_buffer (jerry_value_t value, /**< TypedArray to get the arr ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (array_p); ecma_ref_object (arraybuffer_p); return jerry_return (ecma_make_object_value (arraybuffer_p)); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_UNUSED (value); JERRY_UNUSED (byte_length); JERRY_UNUSED (byte_offset); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("TypedArray is not supported."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } /* jerry_get_typedarray_buffer */ /** @@ -4420,7 +4420,7 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) +#if ENABLED (JERRY_BUILTIN_CONTAINER) for (jerry_length_t i = 0; i < arguments_list_len; i++) { if (ecma_is_value_error_reference (arguments_list_p[i])) @@ -4435,7 +4435,7 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the switch (container_type) { -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) case JERRY_CONTAINER_TYPE_MAP: { lit_id = LIT_MAGIC_STRING_MAP_UL; @@ -4443,8 +4443,8 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_MAP; break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#if ENABLED (JERRY_BUILTIN_SET) case JERRY_CONTAINER_TYPE_SET: { lit_id = LIT_MAGIC_STRING_SET_UL; @@ -4452,8 +4452,8 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_SET; break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#if ENABLED (JERRY_BUILTIN_WEAKMAP) case JERRY_CONTAINER_TYPE_WEAKMAP: { lit_id = LIT_MAGIC_STRING_WEAKMAP_UL; @@ -4461,8 +4461,8 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_WEAKMAP; break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#if ENABLED (JERRY_BUILTIN_WEAKSET) case JERRY_CONTAINER_TYPE_WEAKSET: { lit_id = LIT_MAGIC_STRING_WEAKSET_UL; @@ -4470,7 +4470,7 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_WEAKSET; break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ default: { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Invalid container type."))); @@ -4490,12 +4490,12 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the JERRY_CONTEXT (current_new_target) = old_new_target_p; return container_value; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ +#else /* !ENABLED (JERRY_BUILTIN_CONTAINER) */ JERRY_UNUSED (arguments_list_p); JERRY_UNUSED (arguments_list_len); JERRY_UNUSED (container_type); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Containers are disabled."))); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ +#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ } /* jerry_create_container */ /** @@ -4508,7 +4508,7 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object * { jerry_assert_api_available (); -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) +#if ENABLED (JERRY_BUILTIN_CONTAINER) if (ecma_is_value_object (value)) { ecma_object_t *obj_p = ecma_get_object_from_value (value); @@ -4519,30 +4519,30 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object * switch (type) { -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) case LIT_MAGIC_STRING_MAP_UL: { return JERRY_CONTAINER_TYPE_MAP; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#if ENABLED (JERRY_BUILTIN_SET) case LIT_MAGIC_STRING_SET_UL: { return JERRY_CONTAINER_TYPE_SET; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#if ENABLED (JERRY_BUILTIN_WEAKMAP) case LIT_MAGIC_STRING_WEAKMAP_UL: { return JERRY_CONTAINER_TYPE_WEAKMAP; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#if ENABLED (JERRY_BUILTIN_WEAKSET) case LIT_MAGIC_STRING_WEAKSET_UL: { return JERRY_CONTAINER_TYPE_WEAKSET; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ default: { return JERRY_CONTAINER_TYPE_INVALID; @@ -4551,9 +4551,9 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object * } } -#else /* !ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ +#else /* !ENABLED (JERRY_BUILTIN_CONTAINER) */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ +#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ return JERRY_CONTAINER_TYPE_INVALID; } /* jerry_get_container_type */ diff --git a/jerry-core/config.h b/jerry-core/config.h index 2e806f78d..49efcd4f6 100644 --- a/jerry-core/config.h +++ b/jerry-core/config.h @@ -73,51 +73,51 @@ #endif /* !defined (JERRY_BUILTIN_STRING) */ /** - * ES2015 (a.k.a es6) related features, by default all of them are enabled. + * ES2015+ related features, by default all of them are enabled. */ -#ifndef JERRY_ES2015 -# define JERRY_ES2015 1 -#endif /* !defined (JERRY_ES2015) */ +#ifndef JERRY_ESNEXT +# define JERRY_ESNEXT 1 +#endif /* !defined (JERRY_ESNEXT) */ -#ifndef JERRY_ES2015_BUILTIN_DATAVIEW -# define JERRY_ES2015_BUILTIN_DATAVIEW JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_DATAVIEW) */ +#ifndef JERRY_BUILTIN_DATAVIEW +# define JERRY_BUILTIN_DATAVIEW JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_DATAVIEW) */ -#ifndef JERRY_ES2015_BUILTIN_MAP -# define JERRY_ES2015_BUILTIN_MAP JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_MAP) */ +#ifndef JERRY_BUILTIN_MAP +# define JERRY_BUILTIN_MAP JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_MAP) */ -#ifndef JERRY_ES2015_BUILTIN_SET -# define JERRY_ES2015_BUILTIN_SET JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_SET) */ +#ifndef JERRY_BUILTIN_SET +# define JERRY_BUILTIN_SET JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_SET) */ -#ifndef JERRY_ES2015_BUILTIN_WEAKMAP -# define JERRY_ES2015_BUILTIN_WEAKMAP JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#ifndef JERRY_BUILTIN_WEAKMAP +# define JERRY_BUILTIN_WEAKMAP JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_WEAKMAP) */ -#ifndef JERRY_ES2015_BUILTIN_WEAKSET -# define JERRY_ES2015_BUILTIN_WEAKSET JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_WEAKSET) */ +#ifndef JERRY_BUILTIN_WEAKSET +# define JERRY_BUILTIN_WEAKSET JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_WEAKSET) */ -#ifndef JERRY_ES2015_BUILTIN_PROMISE -# define JERRY_ES2015_BUILTIN_PROMISE JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_PROMISE) */ +#ifndef JERRY_BUILTIN_PROMISE +# define JERRY_BUILTIN_PROMISE JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_PROMISE) */ -#ifndef JERRY_ES2015_BUILTIN_PROXY -# define JERRY_ES2015_BUILTIN_PROXY JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_PROXY) */ +#ifndef JERRY_BUILTIN_PROXY +# define JERRY_BUILTIN_PROXY JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_PROXY) */ -#ifndef JERRY_ES2015_BUILTIN_REFLECT -# define JERRY_ES2015_BUILTIN_REFLECT JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_REFLECT) */ +#ifndef JERRY_BUILTIN_REFLECT +# define JERRY_BUILTIN_REFLECT JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_REFLECT) */ -#ifndef JERRY_ES2015_BUILTIN_TYPEDARRAY -# define JERRY_ES2015_BUILTIN_TYPEDARRAY JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#ifndef JERRY_BUILTIN_TYPEDARRAY +# define JERRY_BUILTIN_TYPEDARRAY JERRY_ESNEXT +#endif /* !defined (JERRY_BUILTIN_TYPEDARRAY) */ -#ifndef JERRY_ES2015_MODULE_SYSTEM -# define JERRY_ES2015_MODULE_SYSTEM JERRY_ES2015 -#endif /* !defined (JERRY_ES2015_MODULE_SYSTEM) */ +#ifndef JERRY_MODULE_SYSTEM +# define JERRY_MODULE_SYSTEM JERRY_ESNEXT +#endif /* !defined (JERRY_MODULE_SYSTEM) */ /** * Engine internal and misc configurations. @@ -513,51 +513,51 @@ #endif /** - * Check ES2015 features + * Check ES2015+ features */ -#if !defined (JERRY_ES2015) \ -|| ((JERRY_ES2015 != 0) && (JERRY_ES2015 != 1)) -# error "Invalid value for JERRY_ES2015 macro." +#if !defined (JERRY_ESNEXT) \ +|| ((JERRY_ESNEXT != 0) && (JERRY_ESNEXT != 1)) +# error "Invalid value for JERRY_ESNEXT macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_DATAVIEW) \ -|| ((JERRY_ES2015_BUILTIN_DATAVIEW != 0) && (JERRY_ES2015_BUILTIN_DATAVIEW != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_DATAVIEW macro." +#if !defined (JERRY_BUILTIN_DATAVIEW) \ +|| ((JERRY_BUILTIN_DATAVIEW != 0) && (JERRY_BUILTIN_DATAVIEW != 1)) +# error "Invalid value for JERRY_BUILTIN_DATAVIEW macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_MAP) \ -|| ((JERRY_ES2015_BUILTIN_MAP != 0) && (JERRY_ES2015_BUILTIN_MAP != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_MAP macro." +#if !defined (JERRY_BUILTIN_MAP) \ +|| ((JERRY_BUILTIN_MAP != 0) && (JERRY_BUILTIN_MAP != 1)) +# error "Invalid value for JERRY_BUILTIN_MAP macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_REFLECT) \ -|| ((JERRY_ES2015_BUILTIN_REFLECT != 0) && (JERRY_ES2015_BUILTIN_REFLECT != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_REFLECT macro." +#if !defined (JERRY_BUILTIN_REFLECT) \ +|| ((JERRY_BUILTIN_REFLECT != 0) && (JERRY_BUILTIN_REFLECT != 1)) +# error "Invalid value for JERRY_BUILTIN_REFLECT macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_SET) \ -|| ((JERRY_ES2015_BUILTIN_SET != 0) && (JERRY_ES2015_BUILTIN_SET != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_SET macro." +#if !defined (JERRY_BUILTIN_SET) \ +|| ((JERRY_BUILTIN_SET != 0) && (JERRY_BUILTIN_SET != 1)) +# error "Invalid value for JERRY_BUILTIN_SET macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_WEAKMAP) \ -|| ((JERRY_ES2015_BUILTIN_WEAKMAP != 0) && (JERRY_ES2015_BUILTIN_WEAKMAP != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_WEAKMAP macro." +#if !defined (JERRY_BUILTIN_WEAKMAP) \ +|| ((JERRY_BUILTIN_WEAKMAP != 0) && (JERRY_BUILTIN_WEAKMAP != 1)) +# error "Invalid value for JERRY_BUILTIN_WEAKMAP macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_WEAKSET) \ -|| ((JERRY_ES2015_BUILTIN_WEAKSET != 0) && (JERRY_ES2015_BUILTIN_WEAKSET != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_WEAKSET macro." +#if !defined (JERRY_BUILTIN_WEAKSET) \ +|| ((JERRY_BUILTIN_WEAKSET != 0) && (JERRY_BUILTIN_WEAKSET != 1)) +# error "Invalid value for JERRY_BUILTIN_WEAKSET macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_PROMISE) \ -|| ((JERRY_ES2015_BUILTIN_PROMISE != 0) && (JERRY_ES2015_BUILTIN_PROMISE != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_PROMISE macro." +#if !defined (JERRY_BUILTIN_PROMISE) \ +|| ((JERRY_BUILTIN_PROMISE != 0) && (JERRY_BUILTIN_PROMISE != 1)) +# error "Invalid value for JERRY_BUILTIN_PROMISE macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_PROXY) \ -|| ((JERRY_ES2015_BUILTIN_PROXY != 0) && (JERRY_ES2015_BUILTIN_PROXY != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_PROXY macro." +#if !defined (JERRY_BUILTIN_PROXY) \ +|| ((JERRY_BUILTIN_PROXY != 0) && (JERRY_BUILTIN_PROXY != 1)) +# error "Invalid value for JERRY_BUILTIN_PROXY macro." #endif -#if !defined (JERRY_ES2015_BUILTIN_TYPEDARRAY) \ -|| ((JERRY_ES2015_BUILTIN_TYPEDARRAY != 0) && (JERRY_ES2015_BUILTIN_TYPEDARRAY != 1)) -# error "Invalid value for JERRY_ES2015_BUILTIN_TYPEDARRAY macro." +#if !defined (JERRY_BUILTIN_TYPEDARRAY) \ +|| ((JERRY_BUILTIN_TYPEDARRAY != 0) && (JERRY_BUILTIN_TYPEDARRAY != 1)) +# error "Invalid value for JERRY_BUILTIN_TYPEDARRAY macro." #endif -#if !defined (JERRY_ES2015_MODULE_SYSTEM) \ -|| ((JERRY_ES2015_MODULE_SYSTEM != 0) && (JERRY_ES2015_MODULE_SYSTEM != 1)) -# error "Invalid value for JERRY_ES2015_MODULE_SYSTEM macro." +#if !defined (JERRY_MODULE_SYSTEM) \ +|| ((JERRY_MODULE_SYSTEM != 0) && (JERRY_MODULE_SYSTEM != 1)) +# error "Invalid value for JERRY_MODULE_SYSTEM macro." #endif /** @@ -677,17 +677,17 @@ /** * Wrap container types into a single guard */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) || ENABLED (JERRY_ES2015_BUILTIN_SET) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) -# define JERRY_ES2015_BUILTIN_CONTAINER 1 +#if ENABLED (JERRY_BUILTIN_MAP) || ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) +# define JERRY_BUILTIN_CONTAINER 1 #else -# define JERRY_ES2015_BUILTIN_CONTAINER 0 +# define JERRY_BUILTIN_CONTAINER 0 #endif /** * Resource name relatey types into a single guard */ -#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ERROR_MESSAGES) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ERROR_MESSAGES) || ENABLED (JERRY_MODULE_SYSTEM) # define JERRY_RESOURCE_NAME 1 #else # define JERRY_RESOURCE_NAME 0 diff --git a/jerry-core/ecma/base/ecma-gc.c b/jerry-core/ecma/base/ecma-gc.c index 118297a0f..de61fbb53 100644 --- a/jerry-core/ecma/base/ecma-gc.c +++ b/jerry-core/ecma/base/ecma-gc.c @@ -35,12 +35,12 @@ #include "vm-defines.h" #include "vm-stack.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #include "ecma-typedarray-object.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#if ENABLED (JERRY_BUILTIN_PROMISE) #include "ecma-promise-object.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ /* TODO: Extract GC to a separate component */ @@ -249,7 +249,7 @@ ecma_gc_mark_bound_function_object (ecma_object_t *object_p) /**< bound function } } /* ecma_gc_mark_bound_function_object */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) /** * Mark objects referenced by Promise built-in. */ @@ -292,9 +292,9 @@ ecma_gc_mark_promise_object (ecma_extended_object_t *ext_object_p) /**< extended } } /* ecma_gc_mark_promise_object */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /** * Mark objects referenced by Map built-in. */ @@ -329,9 +329,9 @@ ecma_gc_mark_map_object (ecma_object_t *object_p) /**< object */ } } } /* ecma_gc_mark_map_object */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) /** * Mark objects referenced by WeakMap built-in. */ @@ -361,9 +361,9 @@ ecma_gc_mark_weakmap_object (ecma_object_t *object_p) /**< object */ } } } /* ecma_gc_mark_weakmap_object */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) /** * Mark objects referenced by Set built-in. */ @@ -393,9 +393,9 @@ ecma_gc_mark_set_object (ecma_object_t *object_p) /**< object */ } } } /* ecma_gc_mark_set_object */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Mark objects referenced by inactive generator functions, async functions, etc. */ @@ -465,9 +465,9 @@ ecma_gc_mark_executable_object (ecma_object_t *object_p) /**< object */ } } /* ecma_gc_mark_executable_object */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) /** * Mark the objects referenced by a proxy object */ @@ -488,7 +488,7 @@ ecma_gc_mark_proxy_object (ecma_object_t *object_p) /**< proxy object */ ecma_gc_set_object_visited (ecma_get_object_from_value (proxy_p->handler)); } } /* ecma_gc_mark_proxy_object */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /** * Mark objects as visited starting from specified object as root @@ -533,57 +533,57 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ switch (ext_object_p->u.class_prop.class_id) { -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) case LIT_MAGIC_STRING_PROMISE_UL: { ecma_gc_mark_promise_object (ext_object_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#if ENABLED (JERRY_BUILTIN_DATAVIEW) case LIT_MAGIC_STRING_DATAVIEW_UL: { ecma_dataview_object_t *dataview_p = (ecma_dataview_object_t *) object_p; ecma_gc_set_object_visited (dataview_p->buffer_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) */ -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#if ENABLED (JERRY_BUILTIN_CONTAINER) +#if ENABLED (JERRY_BUILTIN_WEAKSET) case LIT_MAGIC_STRING_WEAKSET_UL: { break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#if ENABLED (JERRY_BUILTIN_SET) case LIT_MAGIC_STRING_SET_UL: { ecma_gc_mark_set_object (object_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#if ENABLED (JERRY_BUILTIN_WEAKMAP) case LIT_MAGIC_STRING_WEAKMAP_UL: { ecma_gc_mark_weakmap_object (object_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#if ENABLED (JERRY_BUILTIN_MAP) case LIT_MAGIC_STRING_MAP_UL: { ecma_gc_mark_map_object (object_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#if ENABLED (JERRY_ESNEXT) case LIT_MAGIC_STRING_GENERATOR_UL: { ecma_gc_mark_executable_object (object_p); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { break; @@ -598,15 +598,15 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ switch (ext_object_p->u.pseudo_array.type) { -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) case ECMA_PSEUDO_ARRAY_TYPEDARRAY: case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO: { ecma_gc_set_object_visited (ecma_typedarray_get_arraybuffer (object_p)); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#if ENABLED (JERRY_ESNEXT) case ECMA_PSEUDO_ARRAY_ITERATOR: case ECMA_PSEUDO_SET_ITERATOR: case ECMA_PSEUDO_MAP_ITERATOR: @@ -622,7 +622,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ { break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS); @@ -660,13 +660,13 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ } break; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) case ECMA_OBJECT_TYPE_PROXY: { ecma_gc_mark_proxy_object (object_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ case ECMA_OBJECT_TYPE_BOUND_FUNCTION: { ecma_gc_mark_bound_function_object (object_p); @@ -680,7 +680,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ ecma_gc_set_object_visited (ECMA_GET_NON_NULL_POINTER_FROM_POINTER_TAG (ecma_object_t, ext_func_p->u.function.scope_cp)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const ecma_compiled_code_t *byte_code_p = ecma_op_function_get_compiled_code (ext_func_p); if (byte_code_p->status_flags & CBC_CODE_FLAGS_ARROW_FUNCTION) @@ -697,11 +697,11 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ ecma_gc_set_object_visited (ecma_get_object_from_value (arrow_func_p->new_target)); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION: { ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; @@ -717,7 +717,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ } break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { break; @@ -809,7 +809,7 @@ ecma_free_fast_access_array (ecma_object_t *object_p) /**< fast access mode arra ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t)); } /* ecma_free_fast_access_array */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Free non-objects referenced by inactive generator functions, async functions, etc. @@ -901,7 +901,7 @@ ecma_gc_free_executable_object (ecma_object_t *object_p) /**< object */ return size; } /* ecma_gc_free_executable_object */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Free properties of an object @@ -947,7 +947,7 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ { ecma_gc_free_native_pointer (property_p); } -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) else if (JERRY_UNLIKELY (name_cp == LIT_INTERNAL_MAGIC_STRING_WEAK_REFS)) { ecma_collection_t *refs_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, @@ -966,7 +966,7 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ ecma_collection_destroy (refs_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ } if (prop_iter_p->types[i] != ECMA_PROPERTY_TYPE_DELETED) @@ -1050,14 +1050,14 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ } case ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; if (ext_func_p->u.external_handler_cb == ecma_proxy_revoke_cb) { ext_object_size = sizeof (ecma_revocable_proxy_object_t); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } case ECMA_OBJECT_TYPE_CLASS: @@ -1066,9 +1066,9 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ switch (ext_object_p->u.class_prop.class_id) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LIT_MAGIC_STRING_SYMBOL_UL: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LIT_MAGIC_STRING_STRING_UL: case LIT_MAGIC_STRING_NUMBER_UL: { @@ -1092,7 +1092,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) case LIT_MAGIC_STRING_ARRAY_BUFFER_UL: { ecma_length_t arraybuffer_length = ext_object_p->u.class_prop.u.length; @@ -1117,8 +1117,8 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#if ENABLED (JERRY_BUILTIN_PROMISE) case LIT_MAGIC_STRING_PROMISE_UL: { ecma_free_value_if_not_object (ext_object_p->u.class_prop.u.value); @@ -1129,20 +1129,20 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ext_object_size = sizeof (ecma_promise_object_t); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#if ENABLED (JERRY_BUILTIN_CONTAINER) +#if ENABLED (JERRY_BUILTIN_MAP) case LIT_MAGIC_STRING_MAP_UL: -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#if ENABLED (JERRY_BUILTIN_SET) case LIT_MAGIC_STRING_SET_UL: -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#if ENABLED (JERRY_BUILTIN_WEAKMAP) case LIT_MAGIC_STRING_WEAKMAP_UL: -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#if ENABLED (JERRY_BUILTIN_WEAKSET) case LIT_MAGIC_STRING_WEAKSET_UL: -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ { ecma_extended_object_t *map_object_p = (ecma_extended_object_t *) object_p; ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, @@ -1152,21 +1152,21 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#if ENABLED (JERRY_BUILTIN_DATAVIEW) case LIT_MAGIC_STRING_DATAVIEW_UL: { ext_object_size = sizeof (ecma_dataview_object_t); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#if ENABLED (JERRY_ESNEXT) case LIT_MAGIC_STRING_GENERATOR_UL: { ext_object_size = ecma_gc_free_executable_object (object_p); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { /* The undefined id represents an uninitialized class. */ @@ -1181,13 +1181,13 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) case ECMA_OBJECT_TYPE_PROXY: { ext_object_size = sizeof (ecma_proxy_object_t); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ case ECMA_OBJECT_TYPE_FUNCTION: { /* Function with byte-code (not a built-in function). */ @@ -1200,14 +1200,14 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ecma_compiled_code_t *byte_code_p = (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ext_func_p->u.function.bytecode_cp)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (byte_code_p->status_flags & CBC_CODE_FLAGS_ARROW_FUNCTION) { ecma_free_value_if_not_object (((ecma_arrow_function_t *) object_p)->this_binding); ecma_free_value_if_not_object (((ecma_arrow_function_t *) object_p)->new_target); ext_object_size = sizeof (ecma_arrow_function_t); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_bytecode_deref (byte_code_p); #if ENABLED (JERRY_SNAPSHOT_EXEC) @@ -1245,14 +1245,14 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ext_object_size += formal_params_size; break; } -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO: { ext_object_size = sizeof (ecma_extended_typedarray_object_t); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#if ENABLED (JERRY_ESNEXT) case ECMA_PSEUDO_STRING_ITERATOR: { ecma_value_t iterated_value = ext_object_p->u.pseudo_array.u2.iterated_value; @@ -1264,7 +1264,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_TYPEDARRAY diff --git a/jerry-core/ecma/base/ecma-globals.h b/jerry-core/ecma/base/ecma-globals.h index c6569d52d..667920341 100644 --- a/jerry-core/ecma/base/ecma-globals.h +++ b/jerry-core/ecma/base/ecma-globals.h @@ -346,10 +346,10 @@ typedef enum * that are not indices */ ECMA_LIST_ENUMERABLE = (1 << 1), /**< exclude non-enumerable properties */ ECMA_LIST_PROTOTYPE = (1 << 2), /**< list properties from prototype chain */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_LIST_SYMBOLS = (1 << 3), /**< list symbol properties */ ECMA_LIST_SYMBOLS_ONLY = (1 << 4), /**< list symbol properties only */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ECMA_LIST_CONVERT_FAST_ARRAYS = (1 << 5), /**< after listing the properties convert * the fast access mode array back to normal array */ } ecma_list_properties_options_t; @@ -413,11 +413,11 @@ typedef enum /** * Default flag of length property. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_PROPERTY_FLAG_DEFAULT_LENGTH ECMA_PROPERTY_FLAG_CONFIGURABLE -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ #define ECMA_PROPERTY_FLAG_DEFAULT_LENGTH ECMA_PROPERTY_FIXED -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Shift for property name part. @@ -677,7 +677,7 @@ typedef enum ECMA_LEXICAL_ENVIRONMENT_TYPE__MAX = ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND /**< maximum value */ } ecma_lexical_environment_type_t; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Types of array iterators. @@ -689,7 +689,7 @@ typedef enum ECMA_ITERATOR_KEYS_VALUES, /**< List key indices and values */ } ecma_array_iterator_type_t; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Offset for JERRY_CONTEXT (status_flags) top 8 bits. @@ -975,9 +975,9 @@ typedef struct typedef struct { ecma_extended_object_t header; /**< extended object header */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_integer_value_t target_length; /**< length of target function */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } ecma_bound_function_t; #if ENABLED (JERRY_SNAPSHOT_EXEC) @@ -993,7 +993,7 @@ typedef struct #endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Description of arrow function objects. @@ -1018,9 +1018,9 @@ typedef struct #endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) +#if ENABLED (JERRY_BUILTIN_CONTAINER) /** * Flags for container objects */ @@ -1073,7 +1073,7 @@ typedef struct #define ECMA_CONTAINER_START(collection_p) \ (collection_p->buffer_p + 1) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ +#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ typedef enum { @@ -1765,7 +1765,7 @@ typedef struct #endif /* ENABLED (JERRY_LCACHE) */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /** * Function callback descriptor of a %TypedArray% object getter @@ -1849,9 +1849,9 @@ typedef struct uint8_t element_size; /**< element size based on [[TypedArrayName]] in Table 49 */ } ecma_typedarray_info_t; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Executable (e.g. generator, async) object flags. @@ -1870,9 +1870,9 @@ typedef enum #define ECMA_EXECUTABLE_OBJECT_IS_SUSPENDED(extra_info) \ (!((extra_info) & (ECMA_EXECUTABLE_OBJECT_COMPLETED | ECMA_EXECUTABLE_OBJECT_RUNNING))) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) /** * Description of DataView objects. */ @@ -1882,7 +1882,7 @@ typedef struct ecma_object_t *buffer_p; /**< [[ViewedArrayBuffer]] internal slot */ uint32_t byte_offset; /**< [[ByteOffset]] internal slot */ } ecma_dataview_object_t; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ /** * Flag for indicating whether the symbol is a well known symbol @@ -1927,7 +1927,7 @@ do \ */ #define ECMA_OBJECT_POINTER_ERROR ((ecma_object_t *) 0x01) -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) /** * Description of Proxy objects. */ @@ -1946,7 +1946,7 @@ typedef struct ecma_extended_object_t header; /**< header part */ ecma_value_t proxy; /**< [[RevocableProxy]] internal slot */ } ecma_revocable_proxy_object_t; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /** * @} diff --git a/jerry-core/ecma/base/ecma-helpers-conversion.c b/jerry-core/ecma/base/ecma-helpers-conversion.c index aa037133d..80232f7a5 100644 --- a/jerry-core/ecma/base/ecma-helpers-conversion.c +++ b/jerry-core/ecma/base/ecma-helpers-conversion.c @@ -298,7 +298,7 @@ ecma_utf8_string_to_number_by_radix (const lit_utf8_byte_t *str_p, /**< utf-8 st JERRY_ASSERT (radix == 2 || radix == 8 || radix == 16); ecma_number_t num = ECMA_NUMBER_ZERO; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (radix <= 8) { lit_code_point_t upper_limit = LIT_CHAR_0 + radix; @@ -321,7 +321,7 @@ ecma_utf8_string_to_number_by_radix (const lit_utf8_byte_t *str_p, /**< utf-8 st return num; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ for (const lit_utf8_byte_t * iter_p = str_p; iter_p <= end_p; iter_p++) { diff --git a/jerry-core/ecma/base/ecma-helpers-string.c b/jerry-core/ecma/base/ecma-helpers-string.c index 4c94038d2..457fd7fe9 100644 --- a/jerry-core/ecma/base/ecma-helpers-string.c +++ b/jerry-core/ecma/base/ecma-helpers-string.c @@ -204,7 +204,7 @@ ecma_new_ecma_string_from_magic_string_ex_id (lit_magic_string_ex_id_t id) /**< return string_desc_p; } /* ecma_new_ecma_string_from_magic_string_ex_id */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Allocate new ecma-string and fill it with reference to the symbol descriptor * @@ -238,7 +238,7 @@ ecma_prop_name_is_symbol (ecma_string_t *string_p) /**< ecma-string */ return (!ECMA_IS_DIRECT_STRING (string_p) && ECMA_STRING_GET_CONTAINER (string_p) == ECMA_STRING_CONTAINER_SYMBOL); } /* ecma_prop_name_is_symbol */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Allocate new UTF8 ecma-string and fill it with characters from the given utf8 buffer @@ -457,7 +457,7 @@ ecma_new_ecma_string_from_code_unit (ecma_char_t code_unit) /**< code unit */ return ecma_new_ecma_string_from_utf8 (lit_utf8_bytes, bytes_size); } /* ecma_new_ecma_string_from_code_unit */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Allocate new ecma-string and fill it with cesu-8 character which represents specified code units @@ -475,7 +475,7 @@ ecma_new_ecma_string_from_code_units (ecma_char_t first_code_unit, /**< code uni return ecma_new_ecma_string_from_utf8 (lit_utf8_bytes, bytes_size); } /* ecma_new_ecma_string_from_code_units */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Allocate new ecma-string and fill it with ecma-number @@ -845,7 +845,7 @@ ecma_destroy_ecma_string (ecma_string_t *string_p) /**< ecma-string */ ((ecma_ascii_string_t *) string_p)->size + sizeof (ecma_ascii_string_t)); return; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_STRING_CONTAINER_SYMBOL: { ecma_extended_string_t * symbol_p = (ecma_extended_string_t *) string_p; @@ -853,7 +853,7 @@ ecma_destroy_ecma_string (ecma_string_t *string_p) /**< ecma-string */ ecma_dealloc_extended_string (symbol_p); return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (ECMA_STRING_GET_CONTAINER (string_p) == ECMA_STRING_CONTAINER_UINT32_IN_DESC @@ -1735,12 +1735,12 @@ ecma_compare_ecma_strings (const ecma_string_t *string1_p, /**< ecma-string */ return true; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (string1_container == ECMA_STRING_CONTAINER_SYMBOL) { return false; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_compare_ecma_strings_longpath (string1_p, string2_p); } /* ecma_compare_ecma_strings */ @@ -1781,12 +1781,12 @@ ecma_compare_ecma_non_direct_strings (const ecma_string_t *string1_p, /**< ecma- return true; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (string1_container == ECMA_STRING_CONTAINER_SYMBOL) { return false; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_compare_ecma_strings_longpath (string1_p, string2_p); } /* ecma_compare_ecma_non_direct_strings */ @@ -2730,7 +2730,7 @@ ecma_stringbuilder_destroy (ecma_stringbuilder_t *builder_p) /**< string builder #endif /* ENABLED (JERRY_MEM_STATS) */ } /* ecma_stringbuilder_destroy */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * AdvanceStringIndex operation * @@ -2780,7 +2780,7 @@ ecma_op_advance_string_index (ecma_string_t *str_p, /**< input string */ return next_index + 1; } /* ecma_op_advance_string_index */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/base/ecma-helpers-value.c b/jerry-core/ecma/base/ecma-helpers-value.c index 25babda2b..cf3b1d10d 100644 --- a/jerry-core/ecma/base/ecma-helpers-value.c +++ b/jerry-core/ecma/base/ecma-helpers-value.c @@ -316,7 +316,7 @@ ecma_is_value_string (ecma_value_t value) /**< ecma value */ return ((value & (ECMA_VALUE_TYPE_MASK - 0x4)) == ECMA_TYPE_STRING); } /* ecma_is_value_string */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Check if the value is symbol. * @@ -328,7 +328,7 @@ ecma_is_value_symbol (ecma_value_t value) /**< ecma value */ { return (ecma_get_value_type_field (value) == ECMA_TYPE_SYMBOL); } /* ecma_is_value_symbol */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Check if the value can be property name. @@ -339,11 +339,11 @@ ecma_is_value_symbol (ecma_value_t value) /**< ecma value */ inline bool JERRY_ATTR_CONST JERRY_ATTR_ALWAYS_INLINE ecma_is_value_prop_name (ecma_value_t value) /**< ecma value */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) return ecma_is_value_string (value) || ecma_is_value_symbol (value); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ return ecma_is_value_string (value); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_is_value_prop_name */ /** @@ -431,7 +431,7 @@ ecma_is_value_array (ecma_value_t arg) /**< argument */ return ECMA_VALUE_TRUE; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (arg_obj_p)) { ecma_proxy_object_t *proxy_obj_p = (ecma_proxy_object_t *) arg_obj_p; @@ -444,7 +444,7 @@ ecma_is_value_array (ecma_value_t arg) /**< argument */ return ecma_is_value_array (proxy_obj_p->target); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ECMA_VALUE_FALSE; } /* ecma_is_value_array */ @@ -591,9 +591,9 @@ inline ecma_value_t JERRY_ATTR_PURE JERRY_ATTR_ALWAYS_INLINE ecma_make_string_value (const ecma_string_t *ecma_string_p) /**< string to reference in value */ { JERRY_ASSERT (ecma_string_p != NULL); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (!ecma_prop_name_is_symbol ((ecma_string_t *) ecma_string_p)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if ((((uintptr_t) ecma_string_p) & ECMA_VALUE_TYPE_MASK) != 0) { @@ -603,7 +603,7 @@ ecma_make_string_value (const ecma_string_t *ecma_string_p) /**< string to refer return ecma_pointer_to_ecma_value (ecma_string_p) | ECMA_TYPE_STRING; } /* ecma_make_string_value */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Symbol value constructor * @@ -617,7 +617,7 @@ ecma_make_symbol_value (const ecma_string_t *ecma_symbol_p) /**< symbol to refer return ecma_pointer_to_ecma_value (ecma_symbol_p) | ECMA_TYPE_SYMBOL; } /* ecma_make_symbol_value */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Property-name value constructor @@ -629,12 +629,12 @@ ecma_make_prop_name_value (const ecma_string_t *ecma_prop_name_p) /**< property { JERRY_ASSERT (ecma_prop_name_p != NULL); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_prop_name_is_symbol ((ecma_string_t *) ecma_prop_name_p)) { return ecma_make_symbol_value (ecma_prop_name_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_make_string_value (ecma_prop_name_p); } /* ecma_make_prop_name_value */ @@ -749,7 +749,7 @@ ecma_get_string_from_value (ecma_value_t value) /**< ecma value */ return (ecma_string_t *) ecma_get_pointer_from_ecma_value (value); } /* ecma_get_string_from_value */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Get pointer to ecma-string from ecma value * @@ -762,7 +762,7 @@ ecma_get_symbol_from_value (ecma_value_t value) /**< ecma value */ return (ecma_string_t *) ecma_get_pointer_from_ecma_value (value); } /* ecma_get_symbol_from_value */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Get pointer to a property name from ecma value @@ -842,13 +842,13 @@ ecma_copy_value (ecma_value_t value) /**< value description */ ecma_ref_ecma_string (ecma_get_string_from_value (value)); return value; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_TYPE_SYMBOL: { ecma_ref_ecma_string (ecma_get_symbol_from_value (value)); return value; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case ECMA_TYPE_OBJECT: { ecma_ref_object (ecma_get_object_from_value (value)); @@ -1063,13 +1063,13 @@ ecma_free_value (ecma_value_t value) /**< value description */ ecma_deref_ecma_string (string_p); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_TYPE_SYMBOL: { ecma_deref_ecma_string (ecma_get_symbol_from_value (value)); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case ECMA_TYPE_OBJECT: { ecma_deref_object (ecma_get_object_from_value (value)); @@ -1169,12 +1169,12 @@ ecma_get_typeof_lit_id (ecma_value_t value) /**< input ecma value */ { ret_value = LIT_MAGIC_STRING_STRING; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_is_value_symbol (value)) { ret_value = LIT_MAGIC_STRING_SYMBOL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { JERRY_ASSERT (ecma_is_value_object (value)); diff --git a/jerry-core/ecma/base/ecma-helpers.c b/jerry-core/ecma/base/ecma-helpers.c index f187430cd..dba8066d2 100644 --- a/jerry-core/ecma/base/ecma-helpers.c +++ b/jerry-core/ecma/base/ecma-helpers.c @@ -139,12 +139,12 @@ ecma_create_object_lex_env (ecma_object_t *outer_lexical_environment_p, /**< out ecma_object_t *binding_obj_p, /**< binding object */ ecma_lexical_environment_type_t type) /**< type of the new lexical environment */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND || type == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (binding_obj_p != NULL && !ecma_is_lexical_environment (binding_obj_p)); @@ -286,12 +286,12 @@ ecma_get_lex_env_binding_object (const ecma_object_t *object_p) /**< object-boun { JERRY_ASSERT (object_p != NULL); JERRY_ASSERT (ecma_is_lexical_environment (object_p)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (ecma_get_lex_env_type (object_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND || ecma_get_lex_env_type (object_p) == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_get_lex_env_type (object_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ECMA_GET_NON_NULL_POINTER (ecma_object_t, object_p->u1.bound_object_cp); } /* ecma_get_lex_env_binding_object */ @@ -1438,7 +1438,7 @@ ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p) /**< byte code pointer */ } #endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (bytecode_p->status_flags & CBC_CODE_FLAG_HAS_TAGGED_LITERALS) { ecma_collection_t *collection_p = ecma_compiled_code_get_tagged_template_collection (bytecode_p); @@ -1448,7 +1448,7 @@ ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p) /**< byte code pointer */ JERRY_CONTEXT (ecma_gc_new_objects) += collection_p->item_count; ecma_collection_free (collection_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_MEM_STATS) jmem_stats_free_byte_code_bytes (((size_t) bytecode_p->size) << JMEM_ALIGNMENT_LOG); @@ -1467,7 +1467,7 @@ ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p) /**< byte code pointer */ ((size_t) bytecode_p->size) << JMEM_ALIGNMENT_LOG); } /* ecma_bytecode_deref */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Get the tagged template collection of the compiled code * @@ -1487,9 +1487,9 @@ ecma_compiled_code_get_tagged_template_collection (const ecma_compiled_code_t *b return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, base_p[-1]); } /* ecma_compiled_code_get_tagged_template_collection */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ESNEXT) /** * Get the number of formal parameters of the compiled code * @@ -1538,16 +1538,16 @@ ecma_compiled_code_resolve_function_name (const ecma_compiled_code_t *bytecode_h JERRY_ASSERT (bytecode_header_p != NULL); ecma_value_t *base_p = ecma_compiled_code_resolve_arguments_start (bytecode_header_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(bytecode_header_p->status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR)) { base_p--; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return base_p; } /* ecma_compiled_code_resolve_function_name */ -#endif /* ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ESNEXT) */ #if (JERRY_STACK_LIMIT != 0) /** diff --git a/jerry-core/ecma/base/ecma-helpers.h b/jerry-core/ecma/base/ecma-helpers.h index 7de545186..98d901b39 100644 --- a/jerry-core/ecma/base/ecma-helpers.h +++ b/jerry-core/ecma/base/ecma-helpers.h @@ -180,17 +180,17 @@ typedef enum */ #define ECMA_BOOL_TO_BITFIELD(x) ((x) ? 1 : 0) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * JERRY_ASSERT compatible macro for checking whether the given ecma-value is symbol */ #define ECMA_ASSERT_VALUE_IS_SYMBOL(value) (ecma_is_value_symbol ((value))) -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /** * JERRY_ASSERT compatible macro for checking whether the given ecma-value is symbol */ #define ECMA_ASSERT_VALUE_IS_SYMBOL(value) (false) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Check whether the given type is ECMA_OBJECT_TYPE_PROXY @@ -204,11 +204,11 @@ typedef enum * * @param obj_p ecma-object */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) #define ECMA_OBJECT_IS_PROXY(obj_p) (ECMA_OBJECT_TYPE_IS_PROXY (ecma_get_object_type ((obj_p)))) -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ #define ECMA_OBJECT_IS_PROXY(obj_p) (false) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /* ecma-helpers-value.c */ ecma_type_t JERRY_ATTR_CONST ecma_get_value_type_field (ecma_value_t value); @@ -228,9 +228,9 @@ bool JERRY_ATTR_CONST ecma_are_values_integer_numbers (ecma_value_t first_value, bool JERRY_ATTR_CONST ecma_is_value_float_number (ecma_value_t value); bool JERRY_ATTR_CONST ecma_is_value_number (ecma_value_t value); bool JERRY_ATTR_CONST ecma_is_value_string (ecma_value_t value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool JERRY_ATTR_CONST ecma_is_value_symbol (ecma_value_t value); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ bool JERRY_ATTR_CONST ecma_is_value_prop_name (ecma_value_t value); bool JERRY_ATTR_CONST ecma_is_value_direct_string (ecma_value_t value); bool JERRY_ATTR_CONST ecma_is_value_non_direct_string (ecma_value_t value); @@ -248,9 +248,9 @@ ecma_value_t ecma_make_number_value (ecma_number_t ecma_number); ecma_value_t ecma_make_int32_value (int32_t int32_number); ecma_value_t ecma_make_uint32_value (uint32_t uint32_number); ecma_value_t JERRY_ATTR_PURE ecma_make_string_value (const ecma_string_t *ecma_string_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t JERRY_ATTR_PURE ecma_make_symbol_value (const ecma_string_t *ecma_symbol_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t JERRY_ATTR_PURE ecma_make_prop_name_value (const ecma_string_t *ecma_prop_name_p); ecma_value_t JERRY_ATTR_PURE ecma_make_magic_string_value (lit_magic_string_id_t id); ecma_value_t JERRY_ATTR_PURE ecma_make_object_value (const ecma_object_t *object_p); @@ -260,9 +260,9 @@ ecma_number_t JERRY_ATTR_PURE ecma_get_float_from_value (ecma_value_t value); ecma_number_t * ecma_get_pointer_from_float_value (ecma_value_t value); ecma_number_t JERRY_ATTR_PURE ecma_get_number_from_value (ecma_value_t value); ecma_string_t JERRY_ATTR_PURE *ecma_get_string_from_value (ecma_value_t value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_string_t JERRY_ATTR_PURE *ecma_get_symbol_from_value (ecma_value_t value); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_string_t JERRY_ATTR_PURE *ecma_get_prop_name_from_value (ecma_value_t value); ecma_object_t JERRY_ATTR_PURE *ecma_get_object_from_value (ecma_value_t value); ecma_error_reference_t JERRY_ATTR_PURE *ecma_get_error_reference_from_value (ecma_value_t value); @@ -282,22 +282,22 @@ void ecma_free_number (ecma_value_t value); lit_magic_string_id_t ecma_get_typeof_lit_id (ecma_value_t value); /* ecma-helpers-string.c */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_string_t *ecma_new_symbol_from_descriptor_string (ecma_value_t string_desc); bool ecma_prop_name_is_symbol (ecma_string_t *string_p); uint32_t ecma_op_advance_string_index (ecma_string_t *str_p, uint32_t index, bool is_unicode); -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) || ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_BUILTIN_MAP) || ENABLED (JERRY_BUILTIN_SET) ecma_string_t *ecma_new_map_key_string (ecma_value_t value); bool ecma_prop_name_is_map_key (ecma_string_t *string_p); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) || ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) || ENABLED (JERRY_BUILTIN_SET) */ ecma_string_t *ecma_new_ecma_string_from_utf8 (const lit_utf8_byte_t *string_p, lit_utf8_size_t string_size); ecma_string_t *ecma_new_ecma_string_from_utf8_converted_to_cesu8 (const lit_utf8_byte_t *string_p, lit_utf8_size_t string_size); ecma_string_t *ecma_new_ecma_string_from_code_unit (ecma_char_t code_unit); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_string_t *ecma_new_ecma_string_from_code_units (ecma_char_t first_code_unit, ecma_char_t second_code_unit); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_string_t *ecma_new_ecma_string_from_uint32 (uint32_t uint32_number); ecma_string_t *ecma_new_non_direct_string_from_uint32 (uint32_t uint32_number); ecma_string_t *ecma_get_ecma_string_from_uint32 (uint32_t uint32_number); @@ -485,14 +485,14 @@ void ecma_raise_error_from_error_reference (ecma_value_t value); void ecma_bytecode_ref (ecma_compiled_code_t *bytecode_p); void ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_collection_t *ecma_compiled_code_get_tagged_template_collection (const ecma_compiled_code_t *bytecode_header_p); -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ESNEXT) ecma_length_t ecma_compiled_code_get_formal_params (const ecma_compiled_code_t *bytecode_p); ecma_value_t *ecma_compiled_code_resolve_arguments_start (const ecma_compiled_code_t *bytecode_header_p); ecma_value_t *ecma_compiled_code_resolve_function_name (const ecma_compiled_code_t *bytecode_header_p); -#endif /* ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_RESOURCE_NAME) || ENABLED (JERRY_ESNEXT) */ #if (JERRY_STACK_LIMIT != 0) uintptr_t ecma_get_current_stack_usage (void); #endif /* (JERRY_STACK_LIMIT != 0) */ diff --git a/jerry-core/ecma/base/ecma-init-finalize.c b/jerry-core/ecma/base/ecma-init-finalize.c index 7717bb911..f5e6e3781 100644 --- a/jerry-core/ecma/base/ecma-init-finalize.c +++ b/jerry-core/ecma/base/ecma-init-finalize.c @@ -56,14 +56,14 @@ ecma_init (void) JERRY_CONTEXT (stack_base) = (uintptr_t) &sp; #endif /* (JERRY_STACK_LIMIT != 0) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) ecma_job_queue_init (); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_CONTEXT (current_new_target) = NULL; JERRY_CONTEXT (current_function_obj_p) = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_init */ /** @@ -72,10 +72,10 @@ ecma_init (void) void ecma_finalize (void) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (JERRY_CONTEXT (current_new_target) == NULL); JERRY_ASSERT (JERRY_CONTEXT (current_function_obj_p) == NULL); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_finalize_global_environment (); uint8_t runs = 0; diff --git a/jerry-core/ecma/base/ecma-literal-storage.c b/jerry-core/ecma/base/ecma-literal-storage.c index 33888959c..0f761d762 100644 --- a/jerry-core/ecma/base/ecma-literal-storage.c +++ b/jerry-core/ecma/base/ecma-literal-storage.c @@ -25,7 +25,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Free symbol list */ @@ -53,7 +53,7 @@ ecma_free_symbol_list (jmem_cpointer_t symbol_list_cp) /**< symbol list */ symbol_list_cp = next_item_cp; } } /* ecma_free_symbol_list */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Free string list @@ -115,9 +115,9 @@ ecma_free_number_list (jmem_cpointer_t number_list_cp) /**< string list */ void ecma_finalize_lit_storage (void) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_free_symbol_list (JERRY_CONTEXT (symbol_list_first_cp)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_free_string_list (JERRY_CONTEXT (string_list_first_cp)); ecma_free_number_list (JERRY_CONTEXT (number_list_first_cp)); } /* ecma_finalize_lit_storage */ @@ -542,7 +542,7 @@ ecma_snapshot_get_literal (const uint8_t *literal_base_p, /**< literal start */ * Compute the start of the serializable ecma-values of the bytecode * Related values: * - function argument names, if CBC_CODE_FLAGS_MAPPED_ARGUMENTS_NEEDED is present - * - function name, if CBC_CODE_FLAGS_CLASS_CONSTRUCTOR is not present and ES2015 profile is enabled + * - function name, if CBC_CODE_FLAGS_CLASS_CONSTRUCTOR is not present and ES.next profile is enabled * - resource name, if JERRY_RESOURCE_NAME is enabled * * @return pointer to the beginning of the serializable ecma-values @@ -568,13 +568,13 @@ ecma_snapshot_resolve_serializable_values (ecma_compiled_code_t *compiled_code_p base_p -= argument_end; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* function name */ if (!(compiled_code_p->status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR)) { base_p--; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_RESOURCE_NAME) /* resource name */ diff --git a/jerry-core/ecma/base/ecma-module.c b/jerry-core/ecma/base/ecma-module.c index 424f8c8ae..6e8bbe47d 100644 --- a/jerry-core/ecma/base/ecma-module.c +++ b/jerry-core/ecma/base/ecma-module.c @@ -27,7 +27,7 @@ #include "lit-char-helpers.h" #include "vm.h" -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) /** * Takes a ModuleSpecifier and applies path normalization to it. @@ -695,12 +695,12 @@ ecma_module_connect_imports (void) ecma_value_t status = ecma_op_has_binding (lex_env_p, import_names_p->local_name_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (status)) { return status; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_true (status)) { @@ -1076,4 +1076,4 @@ ecma_module_cleanup (void) JERRY_CONTEXT (module_top_context_p) = NULL; } /* ecma_module_cleanup */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ diff --git a/jerry-core/ecma/base/ecma-module.h b/jerry-core/ecma/base/ecma-module.h index 230a6ded3..3a564bf22 100644 --- a/jerry-core/ecma/base/ecma-module.h +++ b/jerry-core/ecma/base/ecma-module.h @@ -16,7 +16,7 @@ #ifndef ECMA_MODULE_H #define ECMA_MODULE_H -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) #include "common.h" #include "ecma-globals.h" @@ -139,6 +139,6 @@ ecma_value_t ecma_module_check_indirect_exports (void); void ecma_module_release_module_nodes (ecma_module_node_t *module_node_p); void ecma_module_cleanup (void); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ #endif /* !ECMA_MODULE_H */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c index 4c41fddd3..b362eb648 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c @@ -18,7 +18,7 @@ #include "ecma-iterator-object.h" #include "ecma-typedarray-object.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -172,4 +172,4 @@ ecma_builtin_array_iterator_prototype_object_next (ecma_value_t this_val) /**< t * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h index 38606a8da..09f47daac 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ARRAY_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_array_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c index 12d826e1a..ba2045257 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c @@ -16,7 +16,7 @@ #include "ecma-builtin-helpers.h" #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -25,4 +25,4 @@ #define BUILTIN_UNDERSCORED_ID array_prototype_unscopables #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h index 4410c50c7..3397c2794 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SIMPLE_VALUE (LIT_MAGIC_STRING_COPY_WITHIN, ECMA_VALUE_TRUE, @@ -49,6 +49,6 @@ SIMPLE_VALUE (LIT_MAGIC_STRING_VALUES, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c index 1faa25d0c..c451a7242 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c @@ -221,17 +221,17 @@ ecma_builtin_array_prototype_object_concat (const ecma_value_t args[], /**< argu ecma_object_t *obj_p) /**< array object */ { /* 2. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t new_array = ecma_op_array_species_create (obj_p, 0); if (ECMA_IS_VALUE_ERROR (new_array)) { return new_array; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t new_array = ecma_op_create_array_object (NULL, 0, false); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (new_array)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *new_array_p = ecma_get_object_from_value (new_array); uint32_t new_length = 0; @@ -576,18 +576,18 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar ecma_string_t *lower_str_p = ecma_new_ecma_string_from_uint32 (lower); ecma_string_t *upper_str_p = ecma_new_ecma_string_from_uint32 (upper); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t lower_value = ECMA_VALUE_EMPTY; ecma_value_t upper_value = ECMA_VALUE_EMPTY; ecma_value_t has_lower = ecma_op_object_has_property (obj_p, lower_str_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (has_lower)) { goto clean_up; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ bool lower_exist = ecma_is_value_true (has_lower); @@ -603,12 +603,12 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar ecma_value_t has_upper = ecma_op_object_has_property (obj_p, upper_str_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (has_upper)) { goto clean_up; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ bool upper_exist = ecma_is_value_true (has_upper); @@ -621,7 +621,7 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar goto clean_up; } } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t lower_value = ecma_op_object_get (obj_p, lower_str_p); if (ECMA_IS_VALUE_ERROR (lower_value)) @@ -643,7 +643,7 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar bool lower_exist = ecma_is_value_true (has_lower); bool upper_exist = ecma_is_value_true (has_upper); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (lower_exist && upper_exist) { @@ -867,7 +867,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ bool use_fast_path = ecma_op_object_is_fast_array (obj_p); uint32_t copied_length = (end > start) ? end - start : 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t new_array = ecma_op_array_species_create (obj_p, copied_length); if (ECMA_IS_VALUE_ERROR (new_array)) @@ -875,10 +875,10 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ return new_array; } use_fast_path &= ecma_op_object_is_fast_array (ecma_get_object_from_value (new_array)); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t new_array = ecma_op_create_array_object (NULL, 0, false); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (new_array)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *new_array_p = ecma_get_object_from_value (new_array); @@ -902,7 +902,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ecma_extended_object_t *ext_to_obj_p = (ecma_extended_object_t *) new_array_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint32_t target_length = ext_to_obj_p->u.array.length; ecma_value_t *to_buffer_p; if (copied_length == target_length) @@ -918,17 +918,17 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ecma_delete_fast_array_properties (new_array_p, copied_length); to_buffer_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, new_array_p->u1.property_list_cp); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t *to_buffer_p = ecma_fast_array_extend (new_array_p, copied_length); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t *from_buffer_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, obj_p->u1.property_list_cp); for (uint32_t k = start; k < end; k++, n++) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_free_value_if_not_object (to_buffer_p[n]); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ to_buffer_p[n] = ecma_copy_value_if_not_object (from_buffer_p[k]); } @@ -959,19 +959,19 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); ecma_free_value (get_value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_deref_object (new_array_p); return put_comp; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t set_length_value = ecma_builtin_array_prototype_helper_set_length (new_array_p, ((ecma_number_t) n)); if (ECMA_IS_VALUE_ERROR (set_length_value)) @@ -979,7 +979,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ecma_deref_object (new_array_p); return set_length_value; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return new_array; } /* ecma_builtin_array_prototype_object_slice */ @@ -1117,12 +1117,12 @@ ecma_builtin_array_prototype_object_sort (ecma_value_t this_arg, /**< this argum ecma_collection_t *array_index_props_p = ecma_op_object_get_property_names (obj_p, ECMA_LIST_ARRAY_INDICES); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (array_index_props_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ uint32_t defined_prop_count = 0; @@ -1262,17 +1262,17 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu ecma_object_t *obj_p, /**< array object */ uint32_t len) /**< array object's length */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t new_array = ecma_op_array_species_create (obj_p, 0); if (ECMA_IS_VALUE_ERROR (new_array)) { return new_array; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t new_array = ecma_op_create_array_object (NULL, 0, false); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (new_array)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *new_array_p = ecma_get_object_from_value (new_array); @@ -1355,19 +1355,19 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu get_value, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); ecma_free_value (get_value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_deref_object (new_array_p); return put_comp; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t new_set_length_value = ecma_builtin_array_prototype_helper_set_length (new_array_p, ((ecma_number_t) delete_count)); @@ -1376,7 +1376,7 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu ecma_deref_object (new_array_p); return new_set_length_value; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 11. */ ecma_length_t item_count; @@ -1956,19 +1956,19 @@ ecma_builtin_array_prototype_object_map (ecma_value_t arg1, /**< callbackfn */ } /* 6. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t new_array = ecma_op_array_species_create (obj_p, len); if (ECMA_IS_VALUE_ERROR (new_array)) { return new_array; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t length_value = ecma_make_number_value (len); ecma_value_t new_array = ecma_op_create_array_object (&length_value, 1, true); ecma_free_value (length_value); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (new_array)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *new_array_p = ecma_get_object_from_value (new_array); @@ -2012,15 +2012,15 @@ ecma_builtin_array_prototype_object_map (ecma_value_t arg1, /**< callbackfn */ ecma_free_value (mapped_value); ecma_free_value (current_value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_deref_object (new_array_p); return put_comp; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } } @@ -2049,17 +2049,17 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * } /* 6. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t new_array = ecma_op_array_species_create (obj_p, 0); if (ECMA_IS_VALUE_ERROR (new_array)) { return new_array; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t new_array = ecma_op_create_array_object (NULL, 0, false); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (new_array)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *new_array_p = ecma_get_object_from_value (new_array); @@ -2106,7 +2106,7 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * new_array_index, get_value, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_free_value (call_value); @@ -2115,9 +2115,9 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * return put_comp; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ new_array_index++; } @@ -2253,7 +2253,7 @@ ecma_builtin_array_reduce_from (const ecma_value_t args_p[], /**< routine's argu return accumulator; } /* ecma_builtin_array_reduce_from */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Array.prototype object's 'fill' routine @@ -2579,7 +2579,7 @@ ecma_builtin_array_prototype_object_copy_within (const ecma_value_t args[], /**< return ecma_copy_value (ecma_make_object_value (obj_p)); } /* ecma_builtin_array_prototype_object_copy_within */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Dispatcher of the built-in's routines @@ -2624,7 +2624,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint16_t builtin_routine_id, /**< return ret_value; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (builtin_routine_id >= ECMA_ARRAY_PROTOTYPE_ENTRIES && builtin_routine_id <= ECMA_ARRAY_PROTOTYPE_KEYS)) { @@ -2643,7 +2643,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint16_t builtin_routine_id, /**< ecma_deref_object (obj_p); return ret_value; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t length; ecma_value_t len_value = ecma_op_object_get_length (obj_p, &length); @@ -2770,7 +2770,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint16_t builtin_routine_id, /**< length); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_ARRAY_PROTOTYPE_COPY_WITHIN: { ret_value = ecma_builtin_array_prototype_object_copy_within (arguments_list_p, @@ -2798,7 +2798,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint16_t builtin_routine_id, /**< length); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (builtin_routine_id == ECMA_ARRAY_PROTOTYPE_FILTER); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h index 04a3f15ca..8c746bfb1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h @@ -29,12 +29,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 22.1.3.31 */ OBJECT_VALUE (LIT_GLOBAL_SYMBOL_UNSCOPABLES, ECMA_BUILTIN_ID_ARRAY_PROTOTYPE_UNSCOPABLES, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Number properties: * (property name, object pointer getter) */ @@ -69,7 +69,7 @@ ROUTINE (LIT_MAGIC_STRING_FILTER, ECMA_ARRAY_PROTOTYPE_FILTER, 2, 1) /* Note these 2 routines must be in this order */ ROUTINE (LIT_MAGIC_STRING_REDUCE, ECMA_ARRAY_PROTOTYPE_REDUCE, 2, 1) ROUTINE (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, ECMA_ARRAY_PROTOTYPE_REDUCE_RIGHT, 2, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_FIND, ECMA_ARRAY_PROTOTYPE_FIND, 2, 1) ROUTINE (LIT_MAGIC_STRING_FIND_INDEX, ECMA_ARRAY_PROTOTYPE_FIND_INDEX, 2, 1) ROUTINE (LIT_MAGIC_STRING_FILL, ECMA_ARRAY_PROTOTYPE_FILL, 3, 1) @@ -80,7 +80,7 @@ INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, LIT_INTERNAL_MAGIC_STRING_ARRAY_PRO ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c index d676b7980..5f97712b2 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c @@ -65,7 +65,7 @@ ecma_builtin_array_object_is_array (ecma_value_t this_arg, /**< 'this' argument return ecma_is_value_array (arg); } /* ecma_builtin_array_object_is_array */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Array object's 'from' routine * @@ -473,7 +473,7 @@ ecma_builtin_array_species_get (ecma_value_t this_value) /**< This Value */ { return ecma_copy_value (this_value); } /* ecma_builtin_array_species_get */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Handle calling [[Call]] of built-in Array object @@ -500,9 +500,9 @@ ecma_builtin_array_dispatch_construct (const ecma_value_t *arguments_list_p, /** { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) return ecma_op_create_array_object (arguments_list_p, arguments_list_len, true); -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target), ECMA_BUILTIN_ID_ARRAY_PROTOTYPE); @@ -523,7 +523,7 @@ ecma_builtin_array_dispatch_construct (const ecma_value_t *arguments_list_p, /** ECMA_SET_NON_NULL_POINTER (object_p->u2.prototype_cp, proto_p); ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_builtin_array_dispatch_construct */ /** diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h index f9cc9a4b4..a8ed20435 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h @@ -36,16 +36,16 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ARRAY_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_IS_ARRAY_UL, ecma_builtin_array_object_is_array, 1, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_FROM, ecma_builtin_array_object_from, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_OF, ecma_builtin_array_object_of, NON_FIXED, 0) @@ -53,7 +53,7 @@ ROUTINE (LIT_MAGIC_STRING_OF, ecma_builtin_array_object_of, NON_FIXED, 0) ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_array_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* !(ENABLED (JERRY_BUILTIN_ARRAY)) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c index 2256d38ed..2f37da0a5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c @@ -24,7 +24,7 @@ #include "jrt.h" #include "jrt-libc-includes.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -150,4 +150,4 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h index 6753cac6f..ed3725f49 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /* Object properties: * (property name, object pointer getter) */ @@ -33,17 +33,17 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_LENGTH_UL, ecma_builtin_arraybuffer_prototype_bytelength_getter, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 24.1.4.4 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_SLICE, ecma_builtin_arraybuffer_prototype_object_slice, 2, 2) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c index 460e410d4..0289d27dd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c @@ -24,7 +24,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -111,4 +111,4 @@ ecma_builtin_arraybuffer_species_get (ecma_value_t this_value) /**< This Value * * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h index f76e7298d..3cfaba7b6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -50,6 +50,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_arraybuffer_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h index 5b4c756b6..b94956a13 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h @@ -36,11 +36,11 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_BOOLEAN_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c index 8f2240e0c..6de2cec15 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c @@ -18,11 +18,11 @@ #include "ecma-dataview-object.h" #include "ecma-gc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) -#ifdef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN +#if !ENABLED (JERRY_BUILTIN_TYPEDARRAY) #error "DataView builtin requires ES2015 TypedArray builtin" -#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */ +#endif /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -208,4 +208,4 @@ ecma_builtin_dataview_prototype_dispatch_routine (uint16_t builtin_routine_id, / * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h index 03b9a703c..1b301ba7e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) /* Object properties: * (property name, object pointer getter) */ @@ -29,12 +29,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_DATAVIEW, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 23.2.4.21 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_DATAVIEW_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -74,6 +74,6 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_OFFSET_UL, ECMA_DATAVIEW_PROTOTYPE_BYTE_OFFSET_GETTER, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c index f77787ab0..f153324f9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-dataview-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -68,4 +68,4 @@ ecma_builtin_dataview_dispatch_construct (const ecma_value_t *arguments_list_p, * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h index 0732f6c65..59f3ceaa4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c index d80d15f1a..fb11bf834 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c @@ -100,9 +100,9 @@ enum ECMA_DATE_PROTOTYPE_SET_TIME, /* ECMA-262 v5, 15.9.5.27 */ ECMA_DATE_PROTOTYPE_TO_JSON, /* ECMA-262 v5, 15.9.5.44 */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_DATE_PROTOTYPE_TO_PRIMITIVE, /* ECMA-262 v6 20.3.4.45 */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-date-prototype.inc.h" @@ -184,7 +184,7 @@ ecma_builtin_date_prototype_to_json (ecma_value_t this_arg) /**< this argument * return ret_value; } /* ecma_builtin_date_prototype_to_json */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Date.prototype object's toPrimitive routine * @@ -222,7 +222,7 @@ ecma_builtin_date_prototype_to_primitive (ecma_value_t this_arg, /**< this argum return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid argument type in toPrimitive.")); } /* ecma_builtin_date_prototype_to_primitive */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Dispatch get date functions @@ -605,13 +605,13 @@ ecma_builtin_date_prototype_dispatch_routine (uint16_t builtin_routine_id, /**< return ecma_builtin_date_prototype_to_json (this_arg); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (builtin_routine_id == ECMA_DATE_PROTOTYPE_TO_PRIMITIVE)) { ecma_value_t argument = arguments_number > 0 ? arguments_list[0] : ECMA_VALUE_UNDEFINED; return ecma_builtin_date_prototype_to_primitive (this_arg, argument); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (!ecma_is_value_object (this_arg) || !ecma_object_class_is (ecma_get_object_from_value (this_arg), LIT_MAGIC_STRING_DATE_UL)) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h index 765fe4b63..bca0e4cef 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h @@ -68,9 +68,9 @@ ROUTINE (LIT_MAGIC_STRING_SET_UTC_FULL_YEAR_UL, ECMA_DATE_PROTOTYPE_SET_UTC_FULL ROUTINE (LIT_MAGIC_STRING_TO_UTC_STRING_UL, ECMA_DATE_PROTOTYPE_TO_UTC_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_TO_ISO_STRING_UL, ECMA_DATE_PROTOTYPE_TO_ISO_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_TO_JSON_UL, ECMA_DATE_PROTOTYPE_TO_JSON, 1, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE_CONFIGURABLE_ONLY (LIT_GLOBAL_SYMBOL_TO_PRIMITIVE, ECMA_DATE_PROTOTYPE_TO_PRIMITIVE, 1, 1) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_ANNEXB) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c index e04eea781..38c3cd06f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c @@ -736,7 +736,7 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< ecma_number_t prim_value_num = ECMA_NUMBER_ZERO; ecma_object_t *prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_DATE_PROTOTYPE); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_CONTEXT (current_new_target)) { prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target), @@ -746,7 +746,7 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< return ECMA_VALUE_ERROR; } } -#endif /* !(ENABLED (JERRY_ES2015) */ +#endif /* !(ENABLED (JERRY_ESNEXT) */ ecma_object_t *obj_p = ecma_create_object (prototype_obj_p, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS); @@ -823,12 +823,12 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< JERRY_ASSERT (ECMA_IS_VALUE_ERROR (ret_value)); ecma_deref_object (obj_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_CONTEXT (current_new_target)) { ecma_deref_object (prototype_obj_p); } -#endif /* !(ENABLED (JERRY_ES2015) */ +#endif /* !(ENABLED (JERRY_ESNEXT) */ return ret_value; } /* ecma_builtin_date_dispatch_construct */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h index 715fb446e..f22f6893c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h @@ -34,11 +34,11 @@ ROUTINE (LIT_MAGIC_STRING_PARSE, ecma_builtin_date_parse, 1, 1) ROUTINE (LIT_MAGIC_STRING_UTC_U, ecma_builtin_date_utc, NON_FIXED, 7) ROUTINE (LIT_MAGIC_STRING_NOW, ecma_builtin_date_now, 0, 0) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_DATE_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_DATE) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h index 854a687ff..a7f01cba4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h @@ -34,10 +34,10 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h index ceeb2e1d3..4a61d5ce1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h @@ -36,11 +36,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_EVAL_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c index 94636b05f..0d7846fa1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c @@ -46,9 +46,9 @@ enum ECMA_FUNCTION_PROTOTYPE_CALL, ECMA_FUNCTION_PROTOTYPE_APPLY, ECMA_FUNCTION_PROTOTYPE_BIND, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_FUNCTION_PROTOTYPE_SYMBOL_HAS_INSTANCE, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-function-prototype.inc.h" @@ -211,10 +211,10 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** /* 4. 11. 18. */ ecma_object_t *prototype_obj_p; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE); -#else /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#else /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (this_arg_obj_p)) { ecma_value_t proto = ecma_proxy_object_get_prototype_of (this_arg_obj_p); @@ -227,7 +227,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (this_arg_obj_p); if (proto_cp != JMEM_CP_NULL) { @@ -238,10 +238,10 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** { prototype_obj_p = NULL; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ ecma_object_t *function_p; ecma_bound_function_t *bound_func_p; @@ -296,7 +296,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** bound_func_p->header.u.bound_function.args_len_or_this = args_len_or_this; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (prototype_obj_p != NULL) { ecma_deref_object (prototype_obj_p); @@ -309,13 +309,13 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** len_string, &prop_desc); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (status)) { ecma_deref_object (function_p); return status; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_true (status)) { @@ -371,7 +371,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** NULL); name_prop_value_p->value = bound_function_name; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* * [[Class]] property is not stored explicitly for objects of ECMA_OBJECT_TYPE_FUNCTION type. @@ -427,12 +427,12 @@ ecma_builtin_function_prototype_dispatch_routine (uint16_t builtin_routine_id, / { if (!ecma_op_is_callable (this_arg)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (builtin_routine_id == ECMA_FUNCTION_PROTOTYPE_SYMBOL_HAS_INSTANCE)) { return ECMA_VALUE_FALSE; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a function.")); } @@ -459,12 +459,12 @@ ecma_builtin_function_prototype_dispatch_routine (uint16_t builtin_routine_id, / { return ecma_builtin_function_prototype_object_bind (func_obj_p, arguments_list_p, arguments_number); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_FUNCTION_PROTOTYPE_SYMBOL_HAS_INSTANCE: { return ecma_op_object_has_instance (func_obj_p, arguments_list_p[0]); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_UNREACHABLE (); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h index e59b047b9..0f855780f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h @@ -34,11 +34,11 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -47,7 +47,7 @@ ROUTINE (LIT_MAGIC_STRING_APPLY, ECMA_FUNCTION_PROTOTYPE_APPLY, 2, 2) ROUTINE (LIT_MAGIC_STRING_CALL, ECMA_FUNCTION_PROTOTYPE_CALL, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_BIND, ECMA_FUNCTION_PROTOTYPE_BIND, NON_FIXED, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * ECMA-262 v6.0 19.2.3.6 @@hasInstance * the property attributes are: { [[Writable]]: false, [[Enumerable]]: false, [[Configurable]]: false }. @@ -61,6 +61,6 @@ ACCESSOR_BUILTIN_FUNCTION (LIT_MAGIC_STRING_CALLER, ECMA_BUILTIN_ID_TYPE_ERROR_THROWER, ECMA_BUILTIN_ID_TYPE_ERROR_THROWER, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h index 597af8e52..844d3ade7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h @@ -34,10 +34,10 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c index 258ce9b80..0d92ed166 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -69,4 +69,4 @@ ecma_builtin_generator_function_dispatch_construct (const ecma_value_t *argument * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h index d4e8c4bc6..de3b7e35d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 25.2.2 */ STRING_VALUE (LIT_MAGIC_STRING_NAME, @@ -36,6 +36,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_GENERATOR, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c index a09deba35..07876a99b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c @@ -23,7 +23,7 @@ #include "opcodes.h" #include "vm-defines.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -247,4 +247,4 @@ ecma_builtin_generator_prototype_object_throw (ecma_value_t this_arg, /**< this * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h index e21878fef..03b6eb34d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Object properties: * (property name, object pointer getter) */ @@ -40,6 +40,6 @@ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_generator_prototype_object_next, 1, ROUTINE (LIT_MAGIC_STRING_RETURN, ecma_builtin_generator_prototype_object_return, 1, 1) ROUTINE (LIT_MAGIC_STRING_THROW, ecma_builtin_generator_prototype_object_throw, 1, 1) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c index 663659b2e..e0ed3be00 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h index 8d38bc0c7..0b24e411d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 25.3.2.3.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, @@ -36,6 +36,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.c b/jerry-core/ecma/builtin-objects/ecma-builtin-global.c index 76f5de376..fa4542c57 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.c @@ -100,12 +100,12 @@ ecma_builtin_global_object_eval (ecma_value_t x) /**< routine's first argument * parse_opts |= ECMA_PARSE_STRICT_MODE; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (vm_is_direct_eval_form_call ()) { parse_opts |= ECMA_GET_LOCAL_PARSE_OPTS (); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* steps 2 to 8 */ return ecma_op_eval (ecma_get_string_from_value (x), parse_opts); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h index 2d58eb1eb..9dba86472 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h @@ -139,12 +139,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_MATH_UL, ECMA_BUILTIN_ID_MATH, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* ENABLED (JERRY_BUILTIN_MATH) */ -#if ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_REFLECT) /* ECMA-262 v6, 26.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_REFLECT_UL, ECMA_BUILTIN_ID_REFLECT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_REFLECT) */ +#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ #if ENABLED (JERRY_BUILTIN_JSON) /* ECMA-262 v5, 15.1.5.2 */ @@ -153,7 +153,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) #endif /* ENABLED (JERRY_BUILTIN_JSON) */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_BUILTIN_ID_ARRAYBUFFER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) @@ -196,62 +196,62 @@ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL, ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL, ECMA_BUILTIN_ID_PROMISE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_MAP_UL, ECMA_BUILTIN_ID_MAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_SET_UL, ECMA_BUILTIN_ID_SET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_WEAKMAP_UL, ECMA_BUILTIN_ID_WEAKMAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_WEAKSET_UL, ECMA_BUILTIN_ID_WEAKSET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 19.4.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_SYMBOL_UL, ECMA_BUILTIN_ID_SYMBOL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_DATAVIEW_UL, ECMA_BUILTIN_ID_DATAVIEW, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) /* ECMA-262 v6, 26.2.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_PROXY_UL, ECMA_BUILTIN_ID_PROXY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -263,14 +263,14 @@ ROUTINE (LIT_MAGIC_STRING_DECODE_URI, ECMA_GLOBAL_DECODE_URI, 1, 1) ROUTINE (LIT_MAGIC_STRING_DECODE_URI_COMPONENT, ECMA_GLOBAL_DECODE_URI_COMPONENT, 1, 1) ROUTINE (LIT_MAGIC_STRING_ENCODE_URI, ECMA_GLOBAL_ENCODE_URI, 1, 1) ROUTINE (LIT_MAGIC_STRING_ENCODE_URI_COMPONENT, ECMA_GLOBAL_ENCODE_URI_COMPONENT, 1, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_FLOAT, LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_INT, LIT_MAGIC_STRING_PARSE_INT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ROUTINE (LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_GLOBAL_PARSE_FLOAT, 1, 1) ROUTINE (LIT_MAGIC_STRING_PARSE_INT, ECMA_GLOBAL_PARSE_INT, 2, 2) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_ANNEXB) ROUTINE (LIT_MAGIC_STRING_ESCAPE, ECMA_GLOBAL_ESCAPE, 1, 1) ROUTINE (LIT_MAGIC_STRING_UNESCAPE, ECMA_GLOBAL_UNESCAPE, 1, 1) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-defines.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-defines.inc.h index 40afcf958..cd618b138 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-defines.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-defines.inc.h @@ -25,7 +25,7 @@ #define STRING_VALUE(name, magic_string_id, prop_attributes) #endif /* !STRING_VALUE */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #ifndef SYMBOL_VALUE #define SYMBOL_VALUE(symbol, desc_magic_string_id) #endif /* !SYMBOL_VALUE */ @@ -37,7 +37,7 @@ #ifndef ACCESSOR_BUILTIN_FUNCTION_OBJECT #define ACCESSOR_BUILTIN_FUNCTION_OBJECT(name, getter_builtin_id, setter_builtin_id, prop_attributes) #endif /* !ACCESSOR_BUILTIN_FUNCTION_OBJECT */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #ifndef OBJECT_VALUE #define OBJECT_VALUE(name, obj_builtin_id, prop_attributes) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-undefs.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-undefs.inc.h index 21616666e..72cd7a401 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-undefs.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-undefs.inc.h @@ -16,11 +16,11 @@ #undef SIMPLE_VALUE #undef NUMBER_VALUE #undef STRING_VALUE -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #undef SYMBOL_VALUE #undef INTRINSIC_PROPERTY #undef ACCESSOR_BUILTIN_FUNCTION_OBJECT -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #undef OBJECT_VALUE #undef ROUTINE #undef ROUTINE_CONFIGURABLE_ONLY diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c index eea19bf1e..cb058e049 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c @@ -37,7 +37,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Helper function for Object.prototype.toString routine when * the @@toStringTag property is present @@ -98,7 +98,7 @@ ecma_builtin_helper_object_to_string_tag_helper (ecma_value_t tag_value) /**< st return ecma_make_string_value (ret_string_p); } /* ecma_builtin_helper_object_to_string_tag_helper */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Common implementation of the Object.prototype.toString routine @@ -142,7 +142,7 @@ ecma_builtin_helper_object_to_string (const ecma_value_t this_arg) /**< this arg type_string = ecma_object_get_class_name (obj_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t tag_value = ecma_op_object_get_by_symbol_id (obj_p, LIT_GLOBAL_SYMBOL_TO_STRING_TAG); if (ECMA_IS_VALUE_ERROR (tag_value)) @@ -158,7 +158,7 @@ ecma_builtin_helper_object_to_string (const ecma_value_t this_arg) /**< this arg } ecma_free_value (tag_value); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_deref_object (obj_p); } @@ -283,12 +283,12 @@ ecma_builtin_helper_object_get_properties (ecma_object_t *obj_p, /**< object */ ecma_collection_t *props_p = ecma_op_object_get_property_names (obj_p, opts); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (props_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (props_p->item_count == 0) { @@ -368,7 +368,7 @@ ecma_builtin_helper_array_concat_value (ecma_object_t *array_obj_p, /**< array * ecma_value_t value) /**< value to concat */ { /* 5.b */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t is_spreadable = ecma_op_is_concat_spreadable (value); if (ECMA_IS_VALUE_ERROR (is_spreadable)) @@ -377,15 +377,15 @@ ecma_builtin_helper_array_concat_value (ecma_object_t *array_obj_p, /**< array * } bool spread_object = is_spreadable == ECMA_VALUE_TRUE; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ bool spread_object = ecma_is_value_true (ecma_is_value_array (value)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (spread_object) { ecma_object_t *obj_p = ecma_get_object_from_value (value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint32_t arg_len; ecma_value_t error = ecma_op_object_get_length (obj_p, &arg_len); @@ -393,10 +393,10 @@ ecma_builtin_helper_array_concat_value (ecma_object_t *array_obj_p, /**< array * { return error; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* 5.b.ii */ uint32_t arg_len = ecma_array_get_length (obj_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 5.b.iii */ for (uint32_t array_index = 0; array_index < arg_len; array_index++) { @@ -519,7 +519,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st /* 5 (indexOf) -- 6 (lastIndexOf) */ const ecma_length_t original_len = ecma_string_get_length (original_str_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* 4, 6 (startsWith, includes, endsWith) */ if (mode >= ECMA_STRING_STARTS_WITH) { @@ -536,7 +536,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st return ecma_raise_type_error (ECMA_ERR_MSG ("Search string can't be of type: RegExp")); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 7, 8 */ ecma_string_t *search_str_p = ecma_op_to_string (arg1); @@ -549,18 +549,18 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st /* 4 (indexOf, lastIndexOf), 9 (startsWith, includes), 10 (endsWith) */ ecma_number_t pos_num; ecma_value_t ret_value; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (mode > ECMA_STRING_LAST_INDEX_OF) { ret_value = ecma_op_to_integer (arg2, &pos_num); } else { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ret_value = ecma_get_number (arg2, &pos_num); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 10 (startsWith, includes), 11 (endsWith) */ if (ECMA_IS_VALUE_ERROR (ret_value)) @@ -582,7 +582,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st switch (mode) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_STRING_STARTS_WITH: { const ecma_length_t search_len = ecma_string_get_length (search_str_p); @@ -635,7 +635,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st } break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case ECMA_STRING_INDEX_OF: case ECMA_STRING_LAST_INDEX_OF: @@ -883,7 +883,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con } case LIT_CHAR_AMPERSAND: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (ctx_p->matched_p == NULL)) { JERRY_ASSERT (ctx_p->capture_count == 0); @@ -895,7 +895,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con ecma_stringbuilder_append (&(ctx_p->builder), ecma_get_string_from_value (match_value)); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ctx_p->matched_p != NULL); ecma_stringbuilder_append_raw (&(ctx_p->builder), ctx_p->matched_p, ctx_p->matched_size); @@ -908,7 +908,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con } case LIT_CHAR_SINGLE_QUOTE: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (ctx_p->matched_p == NULL)) { JERRY_ASSERT (ctx_p->capture_count == 0); @@ -926,7 +926,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con (lit_utf8_size_t) (ctx_p->string_p + ctx_p->string_size - begin_p)); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ctx_p->matched_p != NULL); ecma_stringbuilder_append_raw (&(ctx_p->builder), @@ -941,12 +941,12 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con if (lit_char_is_decimal_digit (c)) { uint32_t capture_count = ctx_p->capture_count; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (capture_count == 0 && ctx_p->u.collection_p != NULL) { capture_count = ctx_p->u.collection_p->item_count; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint8_t idx = (uint8_t) (c - LIT_CHAR_0); if (curr_p < replace_end_p && lit_char_is_decimal_digit (*(curr_p))) @@ -977,7 +977,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con break; #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ctx_p->u.collection_p != NULL) { const ecma_value_t capture_value = ctx_p->u.collection_p->buffer_p[idx]; @@ -988,7 +988,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } } diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h index e9f815b3d..339a27c17 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h @@ -96,10 +96,10 @@ typedef struct void ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool ecma_builtin_is_regexp_exec (ecma_extended_object_t *obj_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_DATE) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h index ec082e8f2..63a91b962 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h @@ -189,7 +189,7 @@ const ecma_builtin_property_descriptor_t PROPERTY_DESCRIPTOR_LIST_NAME[] = prop_attributes, \ magic_string_id \ }, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define SYMBOL_VALUE(symbol, desc_magic_string_id) \ { \ symbol, \ @@ -211,7 +211,7 @@ const ecma_builtin_property_descriptor_t PROPERTY_DESCRIPTOR_LIST_NAME[] = prop_attributes, \ ECMA_ACCESSOR_READ_WRITE (getter_builtin_id, setter_builtin_id) \ }, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include BUILTIN_INC_HEADER_NAME { LIT_MAGIC_STRING__COUNT, diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c index bd73ec77d..1c92b6877 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c @@ -18,7 +18,7 @@ #include "ecma-gc.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -140,4 +140,4 @@ ecma_builtin_intrinsic_dispatch_routine (uint16_t builtin_routine_id, /**< built * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h index 8fb9152d9..edc06c633 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 19.4.2.2 */ SYMBOL_VALUE (LIT_GLOBAL_SYMBOL_HAS_INSTANCE, @@ -69,5 +69,5 @@ SYMBOL_VALUE (LIT_GLOBAL_SYMBOL_UNSCOPABLES, ROUTINE (LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_INTRINSIC_PARSE_FLOAT, 1, 1) ROUTINE (LIT_MAGIC_STRING_PARSE_INT, ECMA_INTRINSIC_PARSE_INT, 2, 2) ROUTINE (LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES, ECMA_INTRINSIC_ARRAY_PROTOTYPE_VALUES, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c index b50b348ad..143b366ef 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-iterator-object.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -60,4 +60,4 @@ ecma_builtin_iterator_prototype_object_iterator (ecma_value_t this_val) /**< thi * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h index 8ae27b9f6..7dba9fb71 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h @@ -19,12 +19,12 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_GLOBAL_SYMBOL_ITERATOR, ecma_builtin_iterator_prototype_object_iterator, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c index 15350baef..7e4033902 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c @@ -900,12 +900,12 @@ ecma_builtin_json_serialize_object (ecma_json_stringify_context_t *context_p, /* { property_keys_p = ecma_op_object_get_property_names (obj_p, ECMA_LIST_ENUMERABLE); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (property_keys_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ } /* 8. */ @@ -1029,7 +1029,7 @@ ecma_builtin_json_serialize_array (ecma_json_stringify_context_t *context_p, /** /* 6. */ uint32_t array_length; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t length_value = ecma_op_object_get_length (obj_p, &array_length); @@ -1040,7 +1040,7 @@ ecma_builtin_json_serialize_array (ecma_json_stringify_context_t *context_p, /** } } else -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ { array_length = ((ecma_extended_object_t *) obj_p)->u.array.length; } @@ -1278,13 +1278,13 @@ ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, { ecma_value_t is_array = ecma_is_value_array (value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ECMA_IS_VALUE_ERROR (is_array)) { ecma_free_value (value); return is_array; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *obj_p = ecma_get_object_from_value (value); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h index bc1a21e1d..5ef6b66d3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h @@ -21,12 +21,12 @@ #if ENABLED (JERRY_BUILTIN_JSON) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 24.3.3 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_JSON_U, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c index b2e893210..cc7126692 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -60,4 +60,4 @@ ecma_builtin_map_iterator_prototype_object_next (ecma_value_t this_val) /**< thi * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h index 8f3b326e8..65591abcf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MAP_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_map_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c index 20f7429b1..ec0b808ef 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -147,7 +147,7 @@ ecma_builtin_map_prototype_object_size_getter (ecma_value_t this_arg) /**< this return ecma_op_container_size (this_arg, LIT_MAGIC_STRING_MAP_UL); } /* ecma_builtin_map_prototype_object_size_getter */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Map.prototype object's 'entries' routine @@ -206,7 +206,7 @@ ecma_builtin_map_prototype_object_values (ecma_value_t this_arg) /**< this argum ECMA_PSEUDO_MAP_ITERATOR); } /* ecma_builtin_map_prototype_object_values */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} @@ -214,4 +214,4 @@ ecma_builtin_map_prototype_object_values (ecma_value_t this_arg) /**< this argum * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h index a8c25e141..253ffb846 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /* Object properties: * (property name, object pointer getter) */ @@ -29,12 +29,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_MAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 23.1.3.13 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MAP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -44,18 +44,18 @@ ROUTINE (LIT_MAGIC_STRING_FOR_EACH_UL, ecma_builtin_map_prototype_object_foreach ROUTINE (LIT_MAGIC_STRING_GET, ecma_builtin_map_prototype_object_get, 1, 1) ROUTINE (LIT_MAGIC_STRING_HAS, ecma_builtin_map_prototype_object_has, 1, 1) ROUTINE (LIT_MAGIC_STRING_SET, ecma_builtin_map_prototype_object_set, 2, 2) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_ENTRIES, ecma_builtin_map_prototype_object_entries, 0, 0) ROUTINE (LIT_MAGIC_STRING_VALUES, ecma_builtin_map_prototype_object_values, 0, 0) ROUTINE (LIT_MAGIC_STRING_KEYS, ecma_builtin_map_prototype_object_keys, 0, 0) ROUTINE (LIT_GLOBAL_SYMBOL_ITERATOR, ecma_builtin_map_prototype_object_entries, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* ECMA-262 v6, 23.1.3.10 */ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, ecma_builtin_map_prototype_object_size_getter, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c index 33b5fb575..25d3da300 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -83,4 +83,4 @@ ecma_builtin_map_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h index 2b09c9c08..cf8cfb2b8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -47,6 +47,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_map_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-math.c b/jerry-core/ecma/builtin-objects/ecma-builtin-math.c index 649f9f77e..76b26b924 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-math.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-math.c @@ -63,7 +63,7 @@ enum ECMA_MATH_OBJECT_SIN, /* ECMA-262 v5, 15.8.2.16 */ ECMA_MATH_OBJECT_SQRT, /* ECMA-262 v5, 15.8.2.17 */ ECMA_MATH_OBJECT_TAN, /* ECMA-262 v5, 15.8.2.18 */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_MATH_OBJECT_ACOSH, /* ECMA-262 v6, 20.2.2.3 */ ECMA_MATH_OBJECT_ASINH, /* ECMA-262 v6, 20.2.2.5 */ ECMA_MATH_OBJECT_ATANH, /* ECMA-262 v6, 20.2.2.7 */ @@ -79,17 +79,17 @@ enum ECMA_MATH_OBJECT_SINH, /* ECMA-262 v6, 20.2.2.31 */ ECMA_MATH_OBJECT_TANH, /* ECMA-262 v6, 20.2.2.34 */ ECMA_MATH_OBJECT_TRUNC, /* ECMA-262 v6, 20.2.2.35 */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ECMA_MATH_OBJECT_ATAN2, /* ECMA-262 v5, 15.8.2.5 */ /* first routine with 2 arguments */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_MATH_OBJECT_IMUL, /* ECMA-262 v6, 20.2.2.19 */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ECMA_MATH_OBJECT_POW, /* ECMA-262 v5, 15.8.2.13 */ /* last routine with 1 or 2 arguments*/ ECMA_MATH_OBJECT_MAX, /* ECMA-262 v5, 15.8.2.11 */ ECMA_MATH_OBJECT_MIN, /* ECMA-262 v5, 15.8.2.12 */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_MATH_OBJECT_HYPOT, /* ECMA-262 v6, 20.2.2.18 */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ECMA_MATH_OBJECT_RANDOM, /* ECMA-262 v5, 15.8.2.14 */ }; @@ -183,7 +183,7 @@ ecma_builtin_math_object_max_min (bool is_max, /**< 'max' or 'min' operation */ return ecma_make_number_value (result_num); } /* ecma_builtin_math_object_max_min */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Math object's 'hypot' routine * @@ -308,7 +308,7 @@ ecma_builtin_math_object_sign (ecma_number_t arg) return (ecma_number_t) 1.0; } /* ecma_builtin_math_object_sign */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * The Math object's 'random' routine. @@ -439,7 +439,7 @@ ecma_builtin_math_dispatch_routine (uint16_t builtin_routine_id, /**< built-in w x = DOUBLE_TO_ECMA_NUMBER_T (log (x)); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_MATH_OBJECT_TRUNC: { x = ecma_builtin_math_object_trunc (x); @@ -450,7 +450,7 @@ ecma_builtin_math_dispatch_routine (uint16_t builtin_routine_id, /**< built-in w x = ecma_builtin_math_object_sign (x); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case ECMA_MATH_OBJECT_ROUND: { if (ecma_number_is_nan (x) @@ -508,7 +508,7 @@ ecma_builtin_math_dispatch_routine (uint16_t builtin_routine_id, /**< built-in w x = ecma_number_pow (x, y); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_MATH_OBJECT_ACOSH: { x = DOUBLE_TO_ECMA_NUMBER_T (acosh (x)); @@ -595,7 +595,7 @@ ecma_builtin_math_dispatch_routine (uint16_t builtin_routine_id, /**< built-in w x = (int32_t) (ecma_number_to_uint32 (x) * ecma_number_to_uint32 (y)); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } return ecma_make_number_value (x); } /* if (builtin_routine_id <= ECMA_MATH_OBJECT_POW) */ @@ -607,12 +607,12 @@ ecma_builtin_math_dispatch_routine (uint16_t builtin_routine_id, /**< built-in w arguments_number); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (builtin_routine_id == ECMA_MATH_OBJECT_HYPOT) { return ecma_builtin_math_object_hypot (arguments_list, arguments_number); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (builtin_routine_id == ECMA_MATH_OBJECT_RANDOM); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h index e49bf1d90..0fc77462e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h @@ -64,12 +64,12 @@ NUMBER_VALUE (LIT_MAGIC_STRING_SQRT2_U, ECMA_BUILTIN_NUMBER_SQRT2, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 20.2.1.9 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MATH_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -91,7 +91,7 @@ ROUTINE (LIT_MAGIC_STRING_ROUND, ECMA_MATH_OBJECT_ROUND, 1, 1) ROUTINE (LIT_MAGIC_STRING_SIN, ECMA_MATH_OBJECT_SIN, 1, 1) ROUTINE (LIT_MAGIC_STRING_SQRT, ECMA_MATH_OBJECT_SQRT, 1, 1) ROUTINE (LIT_MAGIC_STRING_TAN, ECMA_MATH_OBJECT_TAN, 1, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_ACOSH, ECMA_MATH_OBJECT_ACOSH, 1, 1) ROUTINE (LIT_MAGIC_STRING_ASINH, ECMA_MATH_OBJECT_ASINH, 1, 1) ROUTINE (LIT_MAGIC_STRING_ATANH, ECMA_MATH_OBJECT_ATANH, 1, 1) @@ -109,7 +109,7 @@ ROUTINE (LIT_MAGIC_STRING_SIGN, ECMA_MATH_OBJECT_SIGN, 1, 1) ROUTINE (LIT_MAGIC_STRING_SINH, ECMA_MATH_OBJECT_SINH, 1, 1) ROUTINE (LIT_MAGIC_STRING_TANH, ECMA_MATH_OBJECT_TANH, 1, 1) ROUTINE (LIT_MAGIC_STRING_TRUNC, ECMA_MATH_OBJECT_TRUNC, 1, 1) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_MATH) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number.c b/jerry-core/ecma/builtin-objects/ecma-builtin-number.c index ad1478d8d..5808972ac 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number.c @@ -93,7 +93,7 @@ ecma_builtin_number_dispatch_construct (const ecma_value_t *arguments_list_p, /* } } /* ecma_builtin_number_dispatch_construct */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Number object 'isFinite' routine @@ -222,7 +222,7 @@ ecma_builtin_number_object_is_safe_integer (ecma_value_t this_arg, /**< this arg return ECMA_VALUE_FALSE; } /* ecma_builtin_number_object_is_safe_integer */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h index 73dbc8a71..1cfe69224 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h @@ -53,7 +53,7 @@ NUMBER_VALUE (LIT_MAGIC_STRING_NEGATIVE_INFINITY_U, ECMA_BUILTIN_NUMBER_NEGATIVE_INFINITY, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 20.1.2.1 */ NUMBER_VALUE (LIT_MAGIC_STRING_EPSILON_U, @@ -73,7 +73,7 @@ NUMBER_VALUE (LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U, STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_NUMBER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Object properties: * (property name, object pointer getter) */ @@ -87,12 +87,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_IS_FINITE, ecma_builtin_number_object_is_finite, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_NAN, ecma_builtin_number_object_is_nan, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_INTEGER, ecma_builtin_number_object_is_integer, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_SAFE_INTEGER, ecma_builtin_number_object_is_safe_integer, 1, 1) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_FLOAT, LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_INT, LIT_MAGIC_STRING_PARSE_INT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c index 86f70e1da..c15202016 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c @@ -147,7 +147,7 @@ static ecma_value_t ecma_builtin_object_prototype_object_has_own_property (ecma_object_t *obj_p, /**< this argument */ ecma_string_t *prop_name_p) /**< first argument */ { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_property_descriptor_t prop_desc; @@ -161,7 +161,7 @@ ecma_builtin_object_prototype_object_has_own_property (ecma_object_t *obj_p, /** return status; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ecma_make_boolean_value (ecma_op_ordinary_object_has_own_property (obj_p, prop_name_p)); } /* ecma_builtin_object_prototype_object_has_own_property */ @@ -280,12 +280,12 @@ ecma_builtin_object_prototype_dispatch_routine (uint16_t builtin_routine_id, /** ret_value = ecma_builtin_object_prototype_object_is_prototype_of (obj_p, arguments_list_p[0]); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (builtin_routine_id == ECMA_OBJECT_PROTOTYPE_GET_PROTO) { ret_value = ecma_builtin_object_object_get_prototype_of (obj_p); } -#endif /* ENABLED (JERRY_ES2015)*/ +#endif /* ENABLED (JERRY_ESNEXT)*/ else { @@ -299,12 +299,12 @@ ecma_builtin_object_prototype_dispatch_routine (uint16_t builtin_routine_id, /** JERRY_ASSERT (builtin_routine_id >= ECMA_OBJECT_PROTOTYPE_HAS_OWN_PROPERTY); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (builtin_routine_id == ECMA_OBJECT_PROTOTYPE_SET_PROTO) { return ecma_builtin_object_object_set_proto (this_arg, arguments_list_p[0]); } -#endif /* ENABLED (JERRY_ES2015)*/ +#endif /* ENABLED (JERRY_ESNEXT)*/ ecma_string_t *prop_name_p = ecma_op_to_prop_name (arguments_list_p[0]); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c index 249ea287c..8fdf8dd78 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c @@ -137,12 +137,12 @@ ecma_builtin_object_dispatch_construct (const ecma_value_t *arguments_list_p, /* ecma_value_t ecma_builtin_object_object_get_prototype_of (ecma_object_t *obj_p) /**< routine's argument */ { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_get_prototype_of (obj_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (obj_p); @@ -156,7 +156,7 @@ ecma_builtin_object_object_get_prototype_of (ecma_object_t *obj_p) /**< routine' return ECMA_VALUE_NULL; } /* ecma_builtin_object_object_get_prototype_of */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Object object's 'setPrototypeOf' routine * @@ -192,7 +192,7 @@ ecma_builtin_object_object_set_prototype_of (ecma_value_t arg1, /**< routine's f ecma_value_t status; /* 5. */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { status = ecma_proxy_object_set_prototype_of (obj_p, arg2); @@ -204,11 +204,11 @@ ecma_builtin_object_object_set_prototype_of (ecma_value_t arg1, /**< routine's f } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ status = ecma_op_ordinary_object_set_prototype_of (obj_p, arg2); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_false (status)) { @@ -256,7 +256,7 @@ ecma_builtin_object_object_set_proto (ecma_value_t arg1, /**< routine's first ar ecma_value_t status; /* 5. */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { status = ecma_proxy_object_set_prototype_of (obj_p, arg2); @@ -268,11 +268,11 @@ ecma_builtin_object_object_set_proto (ecma_value_t arg1, /**< routine's first ar } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ status = ecma_op_ordinary_object_set_prototype_of (obj_p, arg2); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_false (status)) { @@ -283,7 +283,7 @@ ecma_builtin_object_object_set_proto (ecma_value_t arg1, /**< routine's first ar return ECMA_VALUE_UNDEFINED; } /* ecma_builtin_object_object_set_proto */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * The Object object's 'getOwnPropertyNames' routine @@ -300,7 +300,7 @@ ecma_builtin_object_object_get_own_property_names (ecma_object_t *obj_p) /**< ro return ecma_builtin_helper_object_get_properties (obj_p, ECMA_LIST_NO_OPTS); } /* ecma_builtin_object_object_get_own_property_names */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Object object's 'getOwnPropertySymbols' routine @@ -317,7 +317,7 @@ ecma_builtin_object_object_get_own_property_symbols (ecma_object_t *obj_p) /**< return ecma_builtin_helper_object_get_properties (obj_p, ECMA_LIST_SYMBOLS_ONLY); } /* ecma_builtin_object_object_get_own_property_symbols */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * SetIntegrityLevel operation @@ -334,7 +334,7 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ * false - set "frozen" */ { /* 3. */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t status = ecma_proxy_object_prevent_extensions (obj_p); @@ -346,26 +346,26 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_op_ordinary_object_prevent_extensions (obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /* 6. */ uint32_t opts = ECMA_LIST_CONVERT_FAST_ARRAYS; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) opts |= ECMA_LIST_SYMBOLS; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_collection_t *props_p = ecma_op_object_get_property_names (obj_p, opts); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (props_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t *buffer_p = props_p->buffer_p; @@ -379,12 +379,12 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (status)) { break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_false (status)) { @@ -422,12 +422,12 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (status)) { break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_false (status)) { @@ -487,12 +487,12 @@ ecma_builtin_object_object_seal (ecma_object_t *obj_p) /**< routine's argument * return status; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ecma_is_value_false (status)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Object cannot be sealed.")); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /* 4. */ ecma_ref_object (obj_p); @@ -518,12 +518,12 @@ ecma_builtin_object_object_freeze (ecma_object_t *obj_p) /**< routine's argument return status; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ecma_is_value_false (status)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Object cannot be frozen.")); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /* 4. */ ecma_ref_object (obj_p); @@ -542,7 +542,7 @@ ecma_builtin_object_object_freeze (ecma_object_t *obj_p) /**< routine's argument ecma_value_t ecma_builtin_object_object_prevent_extensions (ecma_object_t *obj_p) /**< routine's argument */ { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t status = ecma_proxy_object_prevent_extensions (obj_p); @@ -561,11 +561,11 @@ ecma_builtin_object_object_prevent_extensions (ecma_object_t *obj_p) /**< routin } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_op_ordinary_object_prevent_extensions (obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_ref_object (obj_p); return ecma_make_object_value (obj_p); @@ -589,7 +589,7 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a /* 3. */ bool is_extensible; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t status = ecma_proxy_object_is_extensible (obj_p); @@ -603,11 +603,11 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ is_extensible = ecma_op_ordinary_object_is_extensible (obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (is_extensible) { @@ -620,12 +620,12 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a /* 2. */ ecma_collection_t *props_p = ecma_op_object_get_property_names (obj_p, ECMA_LIST_NO_OPTS); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (props_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t *buffer_p = props_p->buffer_p; @@ -637,13 +637,13 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (status)) { ret_value = status; break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_false (status)) { @@ -683,12 +683,12 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a ecma_value_t ecma_builtin_object_object_is_extensible (ecma_object_t *obj_p) /**< routine's argument */ { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_is_extensible (obj_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ecma_make_boolean_value (ecma_op_ordinary_object_is_extensible (obj_p)); } /* ecma_builtin_object_object_is_extensible */ @@ -726,12 +726,12 @@ ecma_builtin_object_object_get_own_property_descriptor (ecma_object_t *obj_p, /* ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, name_str_p, &prop_desc); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (status)) { return status; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_true (status)) { @@ -773,13 +773,13 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine | ECMA_LIST_ENUMERABLE); ecma_value_t ret_value = ECMA_VALUE_ERROR; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (prop_names_p == NULL) { ecma_deref_object (props_p); return ret_value; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t *buffer_p = prop_names_p->buffer_p; @@ -941,7 +941,7 @@ ecma_builtin_object_object_define_property (ecma_object_t *obj_p, /**< routine's return ecma_make_object_value (obj_p); } /* ecma_builtin_object_object_define_property */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Object object's 'assign' routine @@ -981,13 +981,13 @@ ecma_builtin_object_object_assign (ecma_object_t *target_p, /**< target object * ecma_collection_t *props_p = ecma_op_object_get_property_names (from_obj_p, ECMA_LIST_CONVERT_FAST_ARRAYS | ECMA_LIST_ENUMERABLE | ECMA_LIST_SYMBOLS); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (props_p == NULL) { ecma_deref_object (from_obj_p); return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t *buffer_p = props_p->buffer_p; @@ -999,13 +999,13 @@ ecma_builtin_object_object_assign (ecma_object_t *target_p, /**< target object * ecma_property_descriptor_t prop_desc; ecma_value_t desc_status = ecma_op_object_get_own_property_descriptor (from_obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (desc_status)) { ret_value = desc_status; break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_false (desc_status)) { @@ -1072,7 +1072,7 @@ ecma_builtin_object_object_is (ecma_value_t arg1, /**< routine's first argument return ecma_op_same_value (arg1, arg2) ? ECMA_VALUE_TRUE : ECMA_VALUE_FALSE; } /* ecma_builtin_object_object_is */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Dispatcher of the built-in's routines @@ -1102,7 +1102,7 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in { return ecma_builtin_object_object_create (arg1, arg2); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_OBJECT_ROUTINE_SET_PROTOTYPE_OF: { return ecma_builtin_object_object_set_prototype_of (arg1, arg2); @@ -1111,7 +1111,7 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in { return ecma_builtin_object_object_is (arg1, arg2); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { break; @@ -1119,21 +1119,21 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in } ecma_object_t *obj_p; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) if (!ecma_is_value_object (arg1)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object.")); } -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ if (builtin_routine_id <= ECMA_OBJECT_ROUTINE_DEFINE_PROPERTIES) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!ecma_is_value_object (arg1)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ obj_p = ecma_get_object_from_value (arg1); @@ -1157,7 +1157,7 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in } else if (builtin_routine_id <= ECMA_OBJECT_ROUTINE_KEYS) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t object = ecma_op_to_object (arg1); if (ECMA_IS_VALUE_ERROR (object)) { @@ -1165,9 +1165,9 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in } obj_p = ecma_get_object_from_value (object); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ obj_p = ecma_get_object_from_value (arg1); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t result; switch (builtin_routine_id) @@ -1182,7 +1182,7 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in result = ecma_builtin_object_object_get_own_property_names (obj_p); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_OBJECT_ROUTINE_ASSIGN: { result = ecma_builtin_object_object_assign (obj_p, arguments_list_p + 1, arguments_number - 1); @@ -1193,7 +1193,7 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in result = ecma_builtin_object_object_get_own_property_symbols (obj_p); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case ECMA_OBJECT_ROUTINE_KEYS: { result = ecma_builtin_object_object_keys (obj_p); @@ -1219,19 +1219,19 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_deref_object (obj_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return result; } else if (builtin_routine_id <= ECMA_OBJECT_ROUTINE_SEAL) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!ecma_is_value_object (arg1)) { return ecma_copy_value (arg1); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ obj_p = ecma_get_object_from_value (arg1); switch (builtin_routine_id) @@ -1257,12 +1257,12 @@ ecma_builtin_object_dispatch_routine (uint16_t builtin_routine_id, /**< built-in else { JERRY_ASSERT (builtin_routine_id <= ECMA_OBJECT_ROUTINE_IS_SEALED); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!ecma_is_value_object (arg1)) { return ecma_make_boolean_value (builtin_routine_id != ECMA_OBJECT_ROUTINE_IS_EXTENSIBLE); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ obj_p = ecma_get_object_from_value (arg1); switch (builtin_routine_id) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h index 63f6d346c..e5aeb0e54 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h @@ -34,19 +34,19 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_OBJECT_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_GET_PROTOTYPE_OF_UL, ECMA_OBJECT_ROUTINE_GET_PROTOTYPE_OF, 1, 1) ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_NAMES_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_NAMES, 1, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_SYMBOLS, 1, 1) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ROUTINE (LIT_MAGIC_STRING_SEAL, ECMA_OBJECT_ROUTINE_SEAL, 1, 1) ROUTINE (LIT_MAGIC_STRING_FREEZE, ECMA_OBJECT_ROUTINE_FREEZE, 1, 1) ROUTINE (LIT_MAGIC_STRING_PREVENT_EXTENSIONS_UL, ECMA_OBJECT_ROUTINE_PREVENT_EXTENSIONS, 1, 1) @@ -59,10 +59,10 @@ ROUTINE (LIT_MAGIC_STRING_CREATE, ECMA_OBJECT_ROUTINE_CREATE, 2, 2) ROUTINE (LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL, ECMA_OBJECT_ROUTINE_DEFINE_PROPERTIES, 2, 2) ROUTINE (LIT_MAGIC_STRING_DEFINE_PROPERTY_UL, ECMA_OBJECT_ROUTINE_DEFINE_PROPERTY, 3, 3) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_SET_PROTOTYPE_OF_UL, ECMA_OBJECT_ROUTINE_SET_PROTOTYPE_OF, 2, 2) ROUTINE (LIT_MAGIC_STRING_ASSIGN, ECMA_OBJECT_ROUTINE_ASSIGN, NON_FIXED, 2) ROUTINE (LIT_MAGIC_STRING_IS, ECMA_OBJECT_ROUTINE_IS, 2, 2) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c index 766935d84..09d00c3c3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c @@ -16,7 +16,7 @@ #include "ecma-globals.h" #include "ecma-promise-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -76,4 +76,4 @@ ecma_builtin_promise_prototype_catch (ecma_value_t this_arg, /**< this argument * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h index 555caf644..e4715482c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h @@ -15,7 +15,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) /* Object properties: * (property name, object pointer getter) */ @@ -24,16 +24,16 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_PROMISE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 25.4.5.4 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_PROMISE_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ROUTINE (LIT_MAGIC_STRING_THEN, ecma_builtin_promise_prototype_then, 2, 2) ROUTINE (LIT_MAGIC_STRING_CATCH, ecma_builtin_promise_prototype_catch, 1, 1) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c index ca9e56753..8cfa2b43f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c @@ -24,7 +24,7 @@ #include "ecma-promise-object.h" #include "jcontext.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -654,4 +654,4 @@ ecma_builtin_promise_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h index 5c55c7f3f..33bfeb88a 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -51,6 +51,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_promise_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c index 73875eab0..239720992 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c @@ -21,7 +21,7 @@ #include "ecma-proxy-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -117,4 +117,4 @@ ecma_builtin_proxy_dispatch_construct (const ecma_value_t *arguments_list_p, /** * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h index dc4b61654..d7e7daff3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -37,6 +37,6 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME, ROUTINE (LIT_MAGIC_STRING_REVOCABLE, ecma_builtin_proxy_object_revocable, 2, 2) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h index d2fd0dba5..cc907526e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h @@ -36,11 +36,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_RANGE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h index 2fdd1e453..ea517de58 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h @@ -36,11 +36,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_REFERENCE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c index 9758b69c3..af55073fc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c @@ -25,7 +25,7 @@ #include "ecma-proxy-object.h" #include "jcontext.h" -#if ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_REFLECT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -236,13 +236,13 @@ ecma_builtin_reflect_dispatch_routine (uint16_t builtin_routine_id, /**< built-i ecma_object_t *obj_p = ecma_get_object_from_value (arguments_list[0]); ecma_value_t status; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { status = ecma_proxy_object_set_prototype_of (obj_p, arguments_list[1]); } else -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ { status = ecma_op_ordinary_object_set_prototype_of (obj_p, arguments_list[1]); } @@ -318,12 +318,12 @@ ecma_builtin_reflect_dispatch_routine (uint16_t builtin_routine_id, /**< built-i JERRY_ASSERT (builtin_routine_id == ECMA_REFLECT_OBJECT_PREVENT_EXTENSIONS); ecma_object_t *obj_p = ecma_get_object_from_value (arguments_list[0]); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_prevent_extensions (obj_p); } -#endif /* !ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* !ENABLED (JERRY_BUILTIN_PROXY) */ ecma_op_ordinary_object_prevent_extensions (obj_p); @@ -338,4 +338,4 @@ ecma_builtin_reflect_dispatch_routine (uint16_t builtin_routine_id, /**< built-i * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_REFLECT) */ +#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h index 3527b0ee8..f67206c6f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h @@ -15,7 +15,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_REFLECT) /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -33,6 +33,6 @@ ROUTINE (LIT_MAGIC_STRING_IS_EXTENSIBLE, ECMA_REFLECT_OBJECT_IS_EXTENSIBLE, 1, 1 ROUTINE (LIT_MAGIC_STRING_PREVENT_EXTENSIONS_UL, ECMA_REFLECT_OBJECT_PREVENT_EXTENSIONS, 1, 1) ROUTINE (LIT_MAGIC_STRING_SET_PROTOTYPE_OF_UL, ECMA_REFLECT_OBJECT_SET_PROTOTYPE_OF, 2, 2) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_REFLECT) */ +#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c index a78d72a4a..9fc43453b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c @@ -49,7 +49,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Helper function to retrieve the flags associated with a RegExp object * @@ -352,7 +352,7 @@ ecma_builtin_regexp_prototype_get_unicode (ecma_value_t this_arg) /**< this argu return ecma_make_boolean_value (flags & RE_FLAG_UNICODE); } /* ecma_builtin_regexp_prototype_get_unicode */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_ANNEXB) @@ -373,9 +373,9 @@ ecma_builtin_regexp_prototype_compile (ecma_value_t this_arg, /**< this argument ecma_value_t flags_arg) /**< flags */ { if (!ecma_object_is_regexp_object (this_arg) -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) || ecma_get_object_from_value (this_arg) == ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE) -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ ) { return ecma_raise_type_error (ECMA_ERR_MSG ("'this' is not a RegExp object")); @@ -481,7 +481,7 @@ static ecma_value_t ecma_builtin_regexp_prototype_test (ecma_value_t this_arg, /**< this argument */ ecma_value_t arg) /**< routine's argument */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!ecma_is_value_object (this_arg)) { return ecma_raise_type_error (ECMA_ERR_MSG ("'this' value is not an object")); @@ -502,14 +502,14 @@ ecma_builtin_regexp_prototype_test (ecma_value_t this_arg, /**< this argument */ { return result; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t result = ecma_builtin_regexp_prototype_exec (this_arg, arg); if (ECMA_IS_VALUE_ERROR (result)) { return result; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ret_value = ecma_make_boolean_value (!ecma_is_value_null (result)); ecma_free_value (result); @@ -529,7 +529,7 @@ ecma_builtin_regexp_prototype_test (ecma_value_t this_arg, /**< this argument */ static ecma_value_t ecma_builtin_regexp_prototype_to_string (ecma_value_t this_arg) /**< this argument */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!ecma_is_value_object (this_arg)) { return ecma_raise_type_error (ECMA_ERR_MSG ("'this' value is not an object.")); @@ -577,7 +577,7 @@ ecma_builtin_regexp_prototype_to_string (ecma_value_t this_arg) /**< this argume ecma_deref_ecma_string (flags_p); return ecma_make_string_value (ecma_stringbuilder_finalize (&builder)); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (!ecma_object_is_regexp_object (this_arg)) { return ecma_raise_type_error (ECMA_ERR_MSG ("'this' value is not a RegExp object.")); @@ -613,10 +613,10 @@ ecma_builtin_regexp_prototype_to_string (ecma_value_t this_arg) /**< this argume } return ecma_make_string_value (ecma_stringbuilder_finalize (&result)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_builtin_regexp_prototype_to_string */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Helper function to determine if method is the builtin exec method * @@ -695,7 +695,7 @@ ecma_builtin_regexp_prototype_symbol_match (ecma_value_t this_arg, /**< this arg { return ecma_regexp_match_helper (this_arg, string_arg); } /* ecma_builtin_regexp_prototype_symbol_match */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h index ead2be393..e02eb0a96 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h @@ -26,7 +26,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_REGEXP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_FLAGS, ecma_builtin_regexp_prototype_get_flags, ECMA_PROPERTY_FLAG_CONFIGURABLE) @@ -59,7 +59,7 @@ ROUTINE (LIT_GLOBAL_SYMBOL_REPLACE, ecma_builtin_regexp_prototype_symbol_replace ROUTINE (LIT_GLOBAL_SYMBOL_SEARCH, ecma_builtin_regexp_prototype_symbol_search, 1, 1) ROUTINE (LIT_GLOBAL_SYMBOL_SPLIT, ecma_builtin_regexp_prototype_symbol_split, 2, 2) ROUTINE (LIT_GLOBAL_SYMBOL_MATCH, ecma_builtin_regexp_prototype_symbol_match, 1, 1) -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* ECMA-262 v5, 15.10.7.1 */ STRING_VALUE (LIT_MAGIC_STRING_SOURCE, LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP, @@ -84,7 +84,7 @@ SIMPLE_VALUE (LIT_MAGIC_STRING_MULTILINE, NUMBER_VALUE (LIT_MAGIC_STRING_LASTINDEX_UL, 0, ECMA_PROPERTY_FLAG_WRITABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_ANNEXB) ROUTINE (LIT_MAGIC_STRING_COMPILE, ecma_builtin_regexp_prototype_compile, 2, 1) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c index 5c6ed1257..734c05f89 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c @@ -49,13 +49,13 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< { ecma_value_t pattern_value = ECMA_VALUE_UNDEFINED; ecma_value_t flags_value = ECMA_VALUE_UNDEFINED; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool create_regexp_from_bc = false; bool free_arguments = false; ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_object_t *new_target_p = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (arguments_list_len > 0) { @@ -68,7 +68,7 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t regexp_value = ecma_op_is_regexp (pattern_value); if (ECMA_IS_VALUE_ERROR (regexp_value)) @@ -145,7 +145,7 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< free_arguments = true; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (ecma_object_is_regexp_object (pattern_value)) { if (ecma_is_value_undefined (flags_value)) @@ -155,21 +155,21 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid argument of RegExp call.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ret_value = ECMA_VALUE_ERROR; ecma_object_t *new_target_obj_p = ecma_op_regexp_alloc (new_target_p); if (JERRY_LIKELY (new_target_obj_p != NULL)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (create_regexp_from_bc) { ret_value = ecma_op_create_regexp_from_bytecode (new_target_obj_p, bc_p); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (ret_value)); } else -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { ret_value = ecma_op_create_regexp_from_pattern (new_target_obj_p, pattern_value, flags_value); @@ -180,13 +180,13 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (free_arguments) { ecma_free_value (pattern_value); ecma_free_value (flags_value); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ret_value; } /* ecma_builtin_regexp_dispatch_helper */ @@ -219,7 +219,7 @@ ecma_builtin_regexp_dispatch_construct (const ecma_value_t *arguments_list_p, /* arguments_list_len); } /* ecma_builtin_regexp_dispatch_construct */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * 21.2.4.2 get RegExp [ @@species ] accessor * @@ -231,7 +231,7 @@ ecma_builtin_regexp_species_get (ecma_value_t this_value) /**< This Value */ { return ecma_copy_value (this_value); } /* ecma_builtin_regexp_species_get */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h index 0c01f06a9..2cdfc4db7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h @@ -30,7 +30,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_REGEXP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) @@ -39,7 +39,7 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME, ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_regexp_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c index b629771b2..eadf2e0b7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -60,4 +60,4 @@ ecma_builtin_set_iterator_prototype_object_next (ecma_value_t this_val) /**< thi * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h index a19399163..559d833c8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SET_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_set_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c index 038916b5e..ed392c8c3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -130,7 +130,7 @@ ecma_builtin_set_prototype_object_size_getter (ecma_value_t this_arg) /**< this return ecma_op_container_size (this_arg, LIT_MAGIC_STRING_SET_UL); } /* ecma_builtin_set_prototype_object_size_getter */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Set.prototype object's 'entries' routine @@ -189,7 +189,7 @@ ecma_builtin_set_prototype_object_values (ecma_value_t this_arg) /**< this argum ECMA_PSEUDO_SET_ITERATOR); } /* ecma_builtin_set_prototype_object_values */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} @@ -197,4 +197,4 @@ ecma_builtin_set_prototype_object_values (ecma_value_t this_arg) /**< this argum * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h index 9e070503e..edb56e6fe 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) /* Object properties: * (property name, object pointer getter) */ @@ -29,12 +29,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_SET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 23.1.3.13 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SET_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -43,17 +43,17 @@ ROUTINE (LIT_MAGIC_STRING_CLEAR, ecma_builtin_set_prototype_object_clear, 0, 0) ROUTINE (LIT_MAGIC_STRING_DELETE, ecma_builtin_set_prototype_object_delete, 1, 1) ROUTINE (LIT_MAGIC_STRING_FOR_EACH_UL, ecma_builtin_set_prototype_object_foreach, 2, 1) ROUTINE (LIT_MAGIC_STRING_HAS, ecma_builtin_set_prototype_object_has, 1, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_ENTRIES, ecma_builtin_set_prototype_object_entries, 0, 0) ROUTINE (LIT_MAGIC_STRING_VALUES, ecma_builtin_set_prototype_object_values, 0, 0) ROUTINE (LIT_MAGIC_STRING_KEYS, ecma_builtin_set_prototype_object_keys, 0, 0) ROUTINE (LIT_GLOBAL_SYMBOL_ITERATOR, ecma_builtin_set_prototype_object_values, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, ecma_builtin_set_prototype_object_size_getter, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c index e6f9f9dfc..abbd92062 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -83,4 +83,4 @@ ecma_builtin_set_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h index dc63bd692..e4167abe6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -47,6 +47,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_set_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c index 6ce4d272e..277718e28 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-iterator-object.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -144,4 +144,4 @@ ecma_builtin_string_iterator_prototype_object_next (ecma_value_t this_val) /**< * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h index def35bd1f..4344e860b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_STRING_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_string_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c index 815fd8255..eaada4290 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c @@ -286,7 +286,7 @@ static ecma_value_t ecma_builtin_string_prototype_object_match (ecma_value_t this_argument, /**< this argument */ ecma_value_t regexp_arg) /**< routine's argument */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* 3. */ if (!(ecma_is_value_undefined (regexp_arg) || ecma_is_value_null (regexp_arg))) { @@ -348,7 +348,7 @@ ecma_builtin_string_prototype_object_match (ecma_value_t this_argument, /**< thi return ret_value; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (ecma_object_is_regexp_object (regexp_arg)) { return ecma_regexp_match_helper (regexp_arg, this_argument); @@ -374,7 +374,7 @@ ecma_builtin_string_prototype_object_match (ecma_value_t this_argument, /**< thi ecma_free_value (new_regexp); return result; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_builtin_string_prototype_object_match */ /** @@ -392,7 +392,7 @@ ecma_builtin_string_prototype_object_replace (ecma_value_t this_value, /**< this ecma_value_t search_value, /**< routine's first argument */ ecma_value_t replace_value) /**< routine's second argument */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(ecma_is_value_undefined (search_value) || ecma_is_value_null (search_value))) { ecma_object_t *obj_p = ecma_get_object_from_value (ecma_op_to_object (search_value)); @@ -421,12 +421,12 @@ ecma_builtin_string_prototype_object_replace (ecma_value_t this_value, /**< this return replace_result; } } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (ecma_object_is_regexp_object (search_value)) { return ecma_regexp_replace_helper (search_value, this_value, replace_value); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_string_t *input_str_p = ecma_get_string_from_value (this_value); @@ -581,7 +581,7 @@ static ecma_value_t ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this argument */ ecma_value_t regexp_value) /**< routine's argument */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(ecma_is_value_undefined (regexp_value) || ecma_is_value_null (regexp_value))) { ecma_object_t *obj_p = ecma_get_object_from_value (ecma_op_to_object (regexp_value)); @@ -608,12 +608,12 @@ ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this return search_result; } } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (ecma_object_is_regexp_object (regexp_value)) { return ecma_regexp_search_helper (regexp_value, this_value); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t result = ECMA_VALUE_ERROR; @@ -650,10 +650,10 @@ ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this goto cleanup_string; } -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) result = ecma_regexp_search_helper (new_regexp, ecma_make_string_value (string_p)); ecma_deref_object (ecma_get_object_from_value (new_regexp)); -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *regexp_obj_p = ecma_get_object_from_value (new_regexp); ecma_value_t search_symbol = ecma_op_object_get_by_symbol_id (regexp_obj_p, LIT_GLOBAL_SYMBOL_SEARCH); if (ECMA_IS_VALUE_ERROR (search_symbol)) @@ -674,7 +674,7 @@ ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this cleanup_regexp: ecma_deref_object (regexp_obj_p); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ cleanup_string: ecma_deref_ecma_string (string_p); @@ -746,7 +746,7 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a ecma_value_t separator_value, /**< separator */ ecma_value_t limit_value) /**< limit */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(ecma_is_value_undefined (separator_value) || ecma_is_value_null (separator_value))) { ecma_object_t *obj_p = ecma_get_object_from_value (ecma_op_to_object (separator_value)); @@ -775,12 +775,12 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a return split_result; } } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (ecma_object_is_regexp_object (separator_value)) { return ecma_regexp_split_helper (separator_value, this_value, limit_value); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t result = ECMA_VALUE_ERROR; @@ -1110,7 +1110,7 @@ ecma_builtin_string_prototype_object_trim (ecma_string_t *original_string_p) /** return ecma_make_string_value (trimmed_string_p); } /* ecma_builtin_string_prototype_object_trim */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The String.prototype object's 'repeat' routine @@ -1226,7 +1226,7 @@ ecma_builtin_string_prototype_object_code_point_at (ecma_string_t *this_string_p return ecma_make_uint32_value (lit_convert_surrogate_pair_to_code_point (first, second)); } /* ecma_builtin_string_prototype_object_code_point_at */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_ANNEXB) @@ -1291,7 +1291,7 @@ ecma_builtin_string_prototype_object_substr (ecma_string_t *this_string_p, /**< #endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The String.prototype object's @@iterator routine @@ -1311,7 +1311,7 @@ ecma_builtin_string_prototype_object_iterator (ecma_value_t to_string) /**< this 0); } /* ecma_builtin_string_prototype_object_iterator */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Dispatcher of the built-in's routines @@ -1380,11 +1380,11 @@ ecma_builtin_string_prototype_dispatch_routine (uint16_t builtin_routine_id, /** } case ECMA_STRING_PROTOTYPE_LAST_INDEX_OF: case ECMA_STRING_PROTOTYPE_INDEX_OF: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_STRING_PROTOTYPE_STARTS_WITH: case ECMA_STRING_PROTOTYPE_INCLUDES: case ECMA_STRING_PROTOTYPE_ENDS_WITH: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { ecma_string_index_of_mode_t mode; mode = (ecma_string_index_of_mode_t) (builtin_routine_id - ECMA_STRING_PROTOTYPE_LAST_INDEX_OF); @@ -1439,7 +1439,7 @@ ecma_builtin_string_prototype_dispatch_routine (uint16_t builtin_routine_id, /** break; } #endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_STRING_PROTOTYPE_REPEAT: { ret_value = ecma_builtin_string_prototype_object_repeat (string_p, arg1); @@ -1455,7 +1455,7 @@ ecma_builtin_string_prototype_dispatch_routine (uint16_t builtin_routine_id, /** ret_value = ecma_builtin_string_prototype_object_iterator (to_string_val); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_UNREACHABLE (); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h index 785be7b37..ad0f1fca8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h @@ -67,14 +67,14 @@ ROUTINE (LIT_MAGIC_STRING_TRIM, ECMA_STRING_PROTOTYPE_TRIM, 0, 0) ROUTINE (LIT_MAGIC_STRING_SUBSTR, ECMA_STRING_PROTOTYPE_SUBSTR, 2, 2) #endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_REPEAT, ECMA_STRING_PROTOTYPE_REPEAT, 1, 1) ROUTINE (LIT_MAGIC_STRING_STARTS_WITH, ECMA_STRING_PROTOTYPE_STARTS_WITH, 2, 1) ROUTINE (LIT_MAGIC_STRING_INCLUDES, ECMA_STRING_PROTOTYPE_INCLUDES, 2, 1) ROUTINE (LIT_MAGIC_STRING_ENDS_WITH, ECMA_STRING_PROTOTYPE_ENDS_WITH, 2, 1) ROUTINE (LIT_MAGIC_STRING_CODE_POINT_AT, ECMA_STRING_PROTOTYPE_CODE_POINT_AT, 1, 1) ROUTINE (LIT_GLOBAL_SYMBOL_ITERATOR, ECMA_STRING_PROTOTYPE_ITERATOR, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_STRING) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string.c index 7537fa937..e1ca46727 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string.c @@ -23,9 +23,9 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #include "ecma-symbol-object.h" -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-try-catch-macro.h" #include "jrt.h" @@ -110,7 +110,7 @@ ecma_builtin_string_object_from_char_code (ecma_value_t this_arg, /**< 'this' ar return ret_value; } /* ecma_builtin_string_object_from_char_code */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The String object's 'raw' routine @@ -333,7 +333,7 @@ ecma_builtin_string_object_from_code_point (ecma_value_t this_arg, /**< 'this' a return ecma_make_string_value (ret_str_p); } /* ecma_builtin_string_object_from_code_point */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Handle calling [[Call]] of built-in String object @@ -356,13 +356,13 @@ ecma_builtin_string_dispatch_call (const ecma_value_t *arguments_list_p, /**< ar { ret_value = ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* 2.a */ else if (ecma_is_value_symbol (arguments_list_p[0])) { ret_value = ecma_get_symbol_descriptive_string (arguments_list_p[0]); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 2.b */ else { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h index 1250e1c23..7d1b6fdc5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h @@ -36,20 +36,20 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_STRING_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_STRING_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_FROM_CHAR_CODE_UL, ecma_builtin_string_object_from_char_code, NON_FIXED, 1) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_FROM_CODE_POINT_UL, ecma_builtin_string_object_from_code_point, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_RAW, ecma_builtin_string_object_raw, NON_FIXED, 1) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_STRING) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c index 6ed001634..1ac623d1c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c @@ -25,7 +25,7 @@ #include "ecma-try-catch-macro.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -95,4 +95,4 @@ ecma_builtin_symbol_prototype_object_to_primitive (ecma_value_t this_arg) /**< t * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h index a3a5b4e65..fcab7cf6d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Object properties: * (property name, object pointer getter) */ @@ -40,6 +40,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SYMBOL_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c index 6c5681193..17875eab9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c @@ -27,7 +27,7 @@ #include "jcontext.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -241,4 +241,4 @@ ecma_builtin_symbol_key_for (ecma_value_t this_arg, /**< this argument */ * @} */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h index b27bbcf95..06808ff36 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -101,6 +101,6 @@ INTRINSIC_PROPERTY (LIT_MAGIC_STRING_UNSCOPABLES, ROUTINE (LIT_MAGIC_STRING_FOR, ecma_builtin_symbol_for, 1, 1) ROUTINE (LIT_MAGIC_STRING_KEY_FOR, ecma_builtin_symbol_key_for, 1, 1) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h index ed1bd4ccf..2e80ad495 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h @@ -36,11 +36,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SYNTAX_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h index 0d352c2aa..828428bb3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h @@ -36,11 +36,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SYNTAX_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h index 2dc7296cb..f17fc2579 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h @@ -36,11 +36,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_URI_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c index 720b5dfae..d60377fc8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -105,4 +105,4 @@ ecma_builtin_weakmap_prototype_object_set (ecma_value_t this_arg, /**< this argu * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h index a2db2edf0..6eecaf4e4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) /* Object properties: * (property name, object pointer getter) */ @@ -41,6 +41,6 @@ ROUTINE (LIT_MAGIC_STRING_GET, ecma_builtin_weakmap_prototype_object_get, 1, 1) ROUTINE (LIT_MAGIC_STRING_HAS, ecma_builtin_weakmap_prototype_object_has, 1, 1) ROUTINE (LIT_MAGIC_STRING_SET, ecma_builtin_weakmap_prototype_object_set, 2, 2) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c index 8a94940bd..b4d2bc3f3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -71,4 +71,4 @@ ecma_builtin_weakmap_dispatch_construct (const ecma_value_t *arguments_list_p, / * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h index a27be6bcb..c6e25a635 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c index 476489d44..238124fea 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -88,4 +88,4 @@ ecma_builtin_weakset_prototype_object_has (ecma_value_t this_arg, /**< this argu * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h index 9ee89842e..417a9c2cc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) /* Object properties: * (property name, object pointer getter) */ @@ -40,6 +40,6 @@ ROUTINE (LIT_MAGIC_STRING_ADD, ecma_builtin_weakset_prototype_object_add, 1, 1) ROUTINE (LIT_MAGIC_STRING_DELETE, ecma_builtin_weakset_prototype_object_delete, 1, 1) ROUTINE (LIT_MAGIC_STRING_HAS, ecma_builtin_weakset_prototype_object_has, 1, 1) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c index 823abde8a..af9d44ec7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -71,4 +71,4 @@ ecma_builtin_weakset_dispatch_construct (const ecma_value_t *arguments_list_p, / * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h index 6fc3a749c..9d70c3878 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h b/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h index aca0f317e..970feb78a 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h @@ -31,12 +31,12 @@ typedef enum ECMA_BUILTIN_PROPERTY_SIMPLE, /**< simple value property */ ECMA_BUILTIN_PROPERTY_NUMBER, /**< number value property */ ECMA_BUILTIN_PROPERTY_STRING, /**< string value property */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_BUILTIN_PROPERTY_SYMBOL, /**< symbol value property */ ECMA_BUILTIN_PROPERTY_INTRINSIC_PROPERTY, /**< intrinsic routine property */ ECMA_BUILTIN_PROPERTY_ACCESSOR_BUILTIN_FUNCTION, /**< full accessor property with builtin function object getter/setter pair */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ECMA_BUILTIN_PROPERTY_OBJECT, /**< builtin object property */ ECMA_BUILTIN_PROPERTY_ROUTINE, /**< routine property */ ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_WRITE, /**< full accessor property */ @@ -51,11 +51,11 @@ typedef enum { ECMA_BUILTIN_NUMBER_MAX = 256, /**< value of ECMA_NUMBER_MAX_VALUE */ ECMA_BUILTIN_NUMBER_MIN, /**< value of ECMA_NUMBER_MIN_VALUE */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_BUILTIN_NUMBER_EPSILON, /**< value of ECMA_NUMBER_EPSILON */ ECMA_BUILTIN_NUMBER_MAX_SAFE_INTEGER, /**< value of ECMA_NUMBER_MAX_SAFE_INTEGER */ ECMA_BUILTIN_NUMBER_MIN_SAFE_INTEGER, /**< value of ECMA_NUMBER_MIN_SAFE_INTEGER */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ECMA_BUILTIN_NUMBER_E, /**< value of ECMA_NUMBER_E */ ECMA_BUILTIN_NUMBER_PI, /**< value of ECMA_NUMBER_PI */ ECMA_BUILTIN_NUMBER_LN10, /**< value of ECMA_NUMBER_LN10 */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.c b/jerry-core/ecma/builtin-objects/ecma-builtins.c index 479f35e3d..035bf462e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.c @@ -446,7 +446,7 @@ ecma_instantiate_builtin (ecma_builtin_id_t obj_builtin_id) /**< built-in id */ } #endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) #if ENABLED (JERRY_BUILTIN_STRING) case ECMA_BUILTIN_ID_STRING_PROTOTYPE: { @@ -516,7 +516,7 @@ ecma_instantiate_builtin (ecma_builtin_id_t obj_builtin_id) /**< built-in id */ break; } #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (obj_type != ECMA_OBJECT_TYPE_CLASS); @@ -542,7 +542,7 @@ ecma_finalize_builtins (void) ecma_object_t *obj_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, JERRY_CONTEXT (ecma_builtin_objects)[id]); ecma_deref_object (obj_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Note: In ES2015 a function object may contain tagged template literal collection. Whenever this function is assigned to a builtin function or function routine during the GC it may cause unresolvable circle since one part of the circle is a weak reference (marked by GC) and the other part is hard reference @@ -553,7 +553,7 @@ ecma_finalize_builtins (void) ecma_gc_free_properties (obj_p); obj_p->u1.property_list_cp = JMEM_CP_NULL; obj_p->u2.prototype_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_CONTEXT (ecma_builtin_objects)[id] = JMEM_CP_NULL; } @@ -661,7 +661,7 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< ecma_property_t *len_prop_p; ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t *bitset_p = &ext_func_p->u.built_in.u.builtin_routine.bitset; if (*bitset_p & ECMA_BUILTIN_ROUTINE_LENGTH_INITIALIZED) { @@ -675,14 +675,14 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< string_p, ECMA_PROPERTY_FLAG_CONFIGURABLE, &len_prop_p); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* We don't need to mark that the property was already lazy instantiated, * as it is non-configurable and so can't be deleted (ECMA-262 v5, 13.2.5) */ ecma_property_value_t *len_prop_value_p = ecma_create_named_data_property (object_p, string_p, ECMA_PROPERTY_FIXED, &len_prop_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint8_t length = ext_func_p->u.built_in.length_and_bitset_size; JERRY_ASSERT (length < (1 << ECMA_BUILT_IN_BITSET_SHIFT)); @@ -692,7 +692,7 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< return len_prop_p; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* * Lazy instantiation of 'name' property */ @@ -754,7 +754,7 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< return name_prop_p; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return NULL; } /* ecma_builtin_routine_try_to_instantiate_property */ @@ -775,7 +775,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * lit_magic_string_id_t magic_string_id = ecma_get_string_magic (string_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (ecma_prop_name_is_symbol (string_p))) { if (string_p->u.hash & ECMA_GLOBAL_SYMBOL_FLAG) @@ -783,7 +783,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * magic_string_id = (string_p->u.hash >> ECMA_GLOBAL_SYMBOL_SHIFT); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (magic_string_id == LIT_MAGIC_STRING__COUNT) { @@ -861,11 +861,11 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * { ECMA_NUMBER_MAX_VALUE, ECMA_NUMBER_MIN_VALUE, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_NUMBER_EPSILON, ECMA_NUMBER_MAX_SAFE_INTEGER, ECMA_NUMBER_MIN_SAFE_INTEGER, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ECMA_NUMBER_E, ECMA_NUMBER_PI, ECMA_NUMBER_LN10, @@ -910,7 +910,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * value = ecma_make_magic_string_value ((lit_magic_string_id_t) curr_property_p->value); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_BUILTIN_PROPERTY_SYMBOL: { ecma_stringbuilder_t builder = ecma_stringbuilder_create_raw ((lit_utf8_byte_t *) "Symbol.", 7); @@ -945,7 +945,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * ecma_ref_object (setter_p); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case ECMA_BUILTIN_PROPERTY_OBJECT: { ecma_object_t *builtin_object_p = ecma_builtin_get ((ecma_builtin_id_t) curr_property_p->value); @@ -1055,7 +1055,7 @@ ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, /**< a b if (!is_array_indices_only) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; if (!(ext_func_p->u.built_in.u.builtin_routine.bitset & ECMA_BUILTIN_ROUTINE_LENGTH_INITIALIZED)) { @@ -1067,10 +1067,10 @@ ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, /**< a b /* Unintialized 'name' property is non-enumerable (ECMA-262 v6, 19.2.4.2) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_NAME)); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* 'length' property is non-enumerable (ECMA-262 v5, 15) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } } /* ecma_builtin_routine_list_lazy_property_names */ @@ -1128,14 +1128,14 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in index = 0; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Builtin symbol properties are internal magic strings which must not be listed */ if (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT) { curr_property_p++; continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_string_t *name_p = ecma_get_magic_string ((lit_magic_string_id_t) curr_property_p->magic_string_id); @@ -1151,13 +1151,13 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in { ecma_value_t name = ecma_make_magic_string_value ((lit_magic_string_id_t) curr_property_p->magic_string_id); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (curr_property_p->attributes & ECMA_PROPERTY_FLAG_ENUMERABLE) { ecma_collection_push_back (main_collection_p, name); } else -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { ecma_collection_push_back (for_non_enumerable_p, name); } @@ -1265,18 +1265,18 @@ ecma_builtin_dispatch_construct (ecma_object_t *obj_p, /**< built-in object */ ecma_builtin_id_t builtin_object_id = ext_obj_p->u.built_in.id; JERRY_ASSERT (builtin_object_id < sizeof (ecma_builtin_construct_functions) / sizeof (ecma_builtin_dispatch_call_t)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_object_t *old_new_target = JERRY_CONTEXT (current_new_target); JERRY_CONTEXT (current_new_target) = new_target_p; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (new_target_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ret_value = ecma_builtin_construct_functions[builtin_object_id] (arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_CONTEXT (current_new_target) = old_new_target; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ret_value; } /* ecma_builtin_dispatch_construct */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h index b2597aa16..0944817cc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h @@ -46,7 +46,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_ARRAY, array) #endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) # if ENABLED (JERRY_BUILTIN_STRING) /* The String.prototype object (21.1.3) */ BUILTIN (ECMA_BUILTIN_ID_STRING_PROTOTYPE, @@ -91,7 +91,7 @@ BUILTIN (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, true, regexp_prototype) # endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ # if ENABLED (JERRY_BUILTIN_STRING) /* The String.prototype object (15.5.4) */ BUILTIN (ECMA_BUILTIN_ID_STRING_PROTOTYPE, @@ -136,7 +136,7 @@ BUILTIN (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, true, regexp_prototype) # endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_STRING) /* The String object (15.5.1) */ @@ -188,7 +188,7 @@ BUILTIN (ECMA_BUILTIN_ID_MATH, math) #endif /* ENABLED (JERRY_BUILTIN_MATH) */ -#if ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_REFLECT) /* The Reflect object (26.1) */ BUILTIN (ECMA_BUILTIN_ID_REFLECT, @@ -196,7 +196,7 @@ BUILTIN (ECMA_BUILTIN_ID_REFLECT, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, reflect) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_REFLECT) */ +#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ #if ENABLED (JERRY_BUILTIN_JSON) /* The JSON object (15.12) */ @@ -225,11 +225,11 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_REGEXP, regexp) #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define ECMA_BUILTIN_NATIVE_ERROR_PROTOTYPE_ID ECMA_BUILTIN_ID_ERROR -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ #define ECMA_BUILTIN_NATIVE_ERROR_PROTOTYPE_ID ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE -#endif /* ENABLED (JERRY_ES2015 */ +#endif /* ENABLED (JERRY_ESNEXT */ /* The Error object (15.11.1) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_ERROR, @@ -338,7 +338,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER, false, type_error_thrower) -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /* The ArrayBuffer.prototype object (ES2015 24.1.4) */ BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE, @@ -480,9 +480,9 @@ BUILTIN (ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE, true, float64array_prototype) #endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) BUILTIN (ECMA_BUILTIN_ID_PROMISE_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, @@ -496,9 +496,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_PROMISE, true, promise) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /* The Map prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_MAP_PROTOTYPE, @@ -514,9 +514,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_MAP, true, map) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) /* The Set prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_SET_PROTOTYPE, @@ -532,9 +532,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_SET, true, set) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) /* The WeakMap prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE, @@ -550,9 +550,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_WEAKMAP, true, weakmap) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) /* The WeakSet prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE, @@ -568,18 +568,18 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_WEAKSET, true, weakset) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) /* The Proxy routine (ECMA-262 v6, 26.2.1) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_PROXY, ECMA_OBJECT_TYPE_FUNCTION, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, proxy) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Intrinsic hidden builtin object */ BUILTIN (ECMA_BUILTIN_ID_INTRINSIC_OBJECT, @@ -651,26 +651,26 @@ BUILTIN (ECMA_BUILTIN_ID_GENERATOR_PROTOTYPE, true, generator_prototype) -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) /* The %SetIteratorPrototype% object (ECMA-262 v6, 23.2.5.2) */ BUILTIN (ECMA_BUILTIN_ID_SET_ITERATOR_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE, true, set_iterator_prototype) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /* The %MapIteratorPrototype% object (ECMA-262 v6, 23.1.5.2) */ BUILTIN (ECMA_BUILTIN_ID_MAP_ITERATOR_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE, true, map_iterator_prototype) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) /* The DataView prototype object (ECMA-262 v6, 24.2.3.1) */ BUILTIN (ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, @@ -684,7 +684,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_DATAVIEW, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, dataview) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ /* The Global object (15.1) */ BUILTIN (ECMA_BUILTIN_ID_GLOBAL, diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c index aaab7463d..79bc5002e 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h index 5ad673d65..efe795444 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h @@ -17,10 +17,10 @@ * Float32Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c index 5a08a8755..87f5fe255 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_float32array_dispatch_construct (const ecma_value_t *arguments_list * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h index 7ba4130cf..dfd321989 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h @@ -17,11 +17,11 @@ * Float32Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_FLOAT32_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c index a12905866..152b392b4 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) #define ECMA_BUILTINS_INTERNAL @@ -42,4 +42,4 @@ */ #endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h index e3528d333..2a575cc98 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h @@ -17,7 +17,7 @@ * Float64Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) #define TYPEDARRAY_BYTES_PER_ELEMENT 8 @@ -25,4 +25,4 @@ #include "ecma-builtin-typedarray-prototype-template.inc.h" #endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c index 8eef1959f..434bdb69f 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) #define ECMA_BUILTINS_INTERNAL @@ -77,4 +77,4 @@ ecma_builtin_float64array_dispatch_construct (const ecma_value_t *arguments_list */ #endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h index 76f6d7340..d36755d0a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h @@ -17,7 +17,7 @@ * Float64Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) #define TYPEDARRAY_BYTES_PER_ELEMENT 8 @@ -26,4 +26,4 @@ #include "ecma-builtin-typedarray-template.inc.h" #endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c index a957143bb..5d6745046 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h index 0d70bd56d..b9df1d592 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h @@ -17,10 +17,10 @@ * Int16Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c index d2b838a1b..683b98d88 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_int16array_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h index 7522b80ec..b8eb51762 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h @@ -17,11 +17,11 @@ * Int16Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT16_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c index 7b874db97..d73bb940f 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h index ca15f6e7a..c09bf7aa1 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h @@ -17,10 +17,10 @@ * Int32Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c index 6348829b0..847e0bf5c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_int32array_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h index 8319f8438..b32819d38 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h @@ -17,11 +17,11 @@ * Int32Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT32_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c index 2fcf1099b..675f6cb67 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h index c96e557f4..c701f16de 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h @@ -17,10 +17,10 @@ * Int8Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c index 25ee07ad8..0dcf79642 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_int8array_dispatch_construct (const ecma_value_t *arguments_list_p, * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h index 07a3800d5..f9e74d3f2 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h @@ -17,11 +17,11 @@ * Int8Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT8_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c index d8906a691..7f909fc40 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c @@ -15,7 +15,7 @@ #include "ecma-builtin-typedarray-helpers.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #include "ecma-builtins.h" #include "ecma-gc.h" @@ -48,4 +48,4 @@ ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p, return val; } /* ecma_typedarray_helper_dispatch_construct */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h index 7ddee8e31..9d021e86a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h @@ -17,7 +17,7 @@ #define ECMA_TYPEDARRAY_HELPERS_H #include "ecma-globals.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /** \addtogroup ecma ECMA * @{ @@ -36,5 +36,5 @@ ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p, * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #endif /* !ECMA_TYPEDARRAY_HELPERS_H */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h index 18615ec93..b28f23352 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h @@ -13,7 +13,7 @@ * limitations under the License. */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #ifndef TYPEDARRAY_BYTES_PER_ELEMENT # error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" @@ -40,4 +40,4 @@ NUMBER_VALUE (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, #undef TYPEDARRAY_BUILTIN_ID #undef TYPEDARRAY_BYTES_PER_ELEMENT -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c index f4dd0d949..c03317db1 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c @@ -37,7 +37,7 @@ #include "jrt.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -147,7 +147,7 @@ ecma_builtin_typedarray_prototype_length_getter (ecma_value_t this_arg) /**< thi return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a TypedArray.")); } /* ecma_builtin_typedarray_prototype_length_getter */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The %TypedArray%.prototype[Symbol.toStringTag] accessor * @@ -167,7 +167,7 @@ ecma_builtin_typedarray_prototype_to_string_tag_getter (ecma_value_t this_arg) / return ecma_make_magic_string_value (ecma_object_get_class_name (ecma_get_object_from_value (this_arg))); } /* ecma_builtin_typedarray_prototype_to_string_tag_getter */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Type of routine. @@ -332,7 +332,7 @@ ecma_builtin_typedarray_prototype_for_each (ecma_value_t this_arg, /**< this arg TYPEDARRAY_ROUTINE_FOREACH); } /* ecma_builtin_typedarray_prototype_for_each */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Helper function for typedArray.prototype object's {'keys', 'values', 'entries', '@@iterator'} @@ -415,7 +415,7 @@ ecma_builtin_typedarray_prototype_entries (ecma_value_t this_arg) /**< this argu return ecma_builtin_typedarray_iterators_helper (this_arg, ECMA_ITERATOR_KEYS_VALUES); } /* ecma_builtin_typedarray_prototype_entries */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * The %TypedArray%.prototype object's 'map' routine @@ -2135,4 +2135,4 @@ ecma_builtin_typedarray_prototype_to_locale_string (ecma_value_t this_arg) /**< * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h index 954a60956..1057cb5af 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /* ES2015 22.2.3.4 */ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, @@ -45,12 +45,12 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_LENGTH, ecma_builtin_typedarray_prototype_length_getter, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMA-262 v6, 23.1.3.13 */ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, ecma_builtin_typedarray_prototype_to_string_tag_getter, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -76,15 +76,15 @@ ROUTINE (LIT_MAGIC_STRING_COPY_WITHIN, ecma_builtin_typedarray_prototype_copy_wi ROUTINE (LIT_MAGIC_STRING_SLICE, ecma_builtin_typedarray_prototype_slice, NON_FIXED, 2) ROUTINE (LIT_MAGIC_STRING_TO_LOCALE_STRING_UL, ecma_builtin_typedarray_prototype_to_locale_string, 0, 0) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ROUTINE (LIT_MAGIC_STRING_KEYS, ecma_builtin_typedarray_prototype_keys, 0, 0) ROUTINE (LIT_MAGIC_STRING_VALUES, ecma_builtin_typedarray_prototype_values, 0, 0) ROUTINE (LIT_MAGIC_STRING_ENTRIES, ecma_builtin_typedarray_prototype_entries, 0, 0) ROUTINE (LIT_GLOBAL_SYMBOL_ITERATOR, ecma_builtin_typedarray_prototype_values, 0, 0) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h index f4e161276..89e834e6a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h @@ -13,7 +13,7 @@ * limitations under the License. */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #ifndef TYPEDARRAY_BYTES_PER_ELEMENT # error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" @@ -55,4 +55,4 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, #undef TYPEDARRAY_MAGIC_STRING_ID #undef TYPEDARRAY_BYTES_PER_ELEMENT -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c index d30c0104c..bb1f90f9b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c @@ -24,7 +24,7 @@ #include "ecma-function-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -234,4 +234,4 @@ ecma_builtin_typedarray_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h index e46a1852b..eb4ef674f 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /* ES2015 22.2.2 */ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, @@ -50,6 +50,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_typedarray_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c index e300da6a5..ea61fe8ac 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h index cacee6525..50f18f71c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h @@ -17,10 +17,10 @@ * Uint16Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c index 9a8abf5d0..6ea64b151 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_uint16array_dispatch_construct (const ecma_value_t *arguments_list_ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h index 90c3dd931..8dc3258a2 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h @@ -17,11 +17,11 @@ * Uint16Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT16_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c index 451fb33c6..1f8b089b1 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h index 4d75dea12..dcdb595be 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h @@ -17,10 +17,10 @@ * Uint32Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c index acba99c91..e663b3c2d 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -77,4 +77,4 @@ ecma_builtin_uint32array_dispatch_construct (const ecma_value_t *arguments_list_ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h index 7eb9e7f1b..7311d2052 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h @@ -17,11 +17,11 @@ * Uint32Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT32_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c index 3c9c15179..2eb2b62e8 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h index 5c89a0162..4a84067ab 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h @@ -17,10 +17,10 @@ * Uint8Array prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c index 1429bdde8..10f5b03df 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_uint8array_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h index 5fbdd6f31..555fb0373 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h @@ -17,11 +17,11 @@ * Uint8Array description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c index 348295ea4..4523f3a0b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h index 623091f89..7995c0f13 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h @@ -17,10 +17,10 @@ * Uint8ClampedArray prototype description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c index 52217f8ad..753e39bbe 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -77,4 +77,4 @@ ecma_builtin_uint8clampedarray_dispatch_construct (const ecma_value_t *arguments * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h index 68942b867..f84d18252 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h @@ -17,11 +17,11 @@ * Uint8ClampedArray description */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/operations/ecma-array-object.c b/jerry-core/ecma/operations/ecma-array-object.c index 4d5dd6a84..9e69a5f6f 100644 --- a/jerry-core/ecma/operations/ecma-array-object.c +++ b/jerry-core/ecma/operations/ecma-array-object.c @@ -519,12 +519,12 @@ ecma_fast_array_get_property_names (ecma_object_t *object_p, /**< fast access mo ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) object_p; ecma_collection_t *ret_p = ecma_new_collection (); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (opts & ECMA_LIST_SYMBOLS_ONLY) { return ret_p; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t length = ext_obj_p->u.array.length; @@ -666,7 +666,7 @@ ecma_op_create_array_object (const ecma_value_t *arguments_list_p, /**< list of return ecma_make_object_value (object_p); } /* ecma_op_create_array_object */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Array object creation with custom prototype. * @@ -777,7 +777,7 @@ ecma_op_create_array_iterator (ecma_object_t *obj_p, /**< array object */ ECMA_PSEUDO_ARRAY_ITERATOR, (uint8_t) type); } /* ecma_op_create_array_iterator */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Low level delete of array items from new_length to old_length diff --git a/jerry-core/ecma/operations/ecma-array-object.h b/jerry-core/ecma/operations/ecma-array-object.h index 761b6799d..b1711ed86 100644 --- a/jerry-core/ecma/operations/ecma-array-object.h +++ b/jerry-core/ecma/operations/ecma-array-object.h @@ -99,7 +99,7 @@ ecma_value_t ecma_op_create_array_object (const ecma_value_t *arguments_list_p, ecma_length_t arguments_list_len, bool is_treat_single_arg_as_length); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t ecma_op_array_species_create (ecma_object_t *original_array_p, ecma_length_t length); @@ -107,7 +107,7 @@ ecma_op_array_species_create (ecma_object_t *original_array_p, ecma_value_t ecma_op_create_array_iterator (ecma_object_t *obj_p, ecma_array_iterator_type_t type); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ecma_op_array_object_set_length (ecma_object_t *object_p, ecma_value_t new_value, uint32_t flags); diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.c b/jerry-core/ecma/operations/ecma-arraybuffer-object.c index 7b0e0077c..2f7b72778 100644 --- a/jerry-core/ecma/operations/ecma-arraybuffer-object.c +++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.c @@ -24,7 +24,7 @@ #include "ecma-helpers.h" #include "jmem.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /** \addtogroup ecma ECMA * @{ @@ -280,4 +280,4 @@ ecma_arraybuffer_detach (ecma_object_t *object_p) /**< pointer to the ArrayBuffe * @} * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.h b/jerry-core/ecma/operations/ecma-arraybuffer-object.h index c654b7b6f..f4c4ad655 100644 --- a/jerry-core/ecma/operations/ecma-arraybuffer-object.h +++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /** \addtogroup ecma ECMA * @{ @@ -57,5 +57,5 @@ ecma_is_arraybuffer (ecma_value_t val); * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #endif /* !ECMA_ARRAYBUFFER_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-comparison.c b/jerry-core/ecma/operations/ecma-comparison.c index 04d367d3a..25f6bf288 100644 --- a/jerry-core/ecma/operations/ecma-comparison.c +++ b/jerry-core/ecma/operations/ecma-comparison.c @@ -130,12 +130,12 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */ y = tmp; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_is_value_symbol (x)) { return ECMA_VALUE_FALSE; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (ecma_is_value_boolean (y)) { @@ -153,9 +153,9 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */ if (ecma_is_value_object (x)) { if (ecma_is_value_string (y) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) || ecma_is_value_symbol (y) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ || ecma_is_value_number (y)) { /* 9. */ @@ -210,10 +210,10 @@ ecma_op_strict_equality_compare (ecma_value_t x, /**< first operand */ { if (ecma_is_value_direct (x) || ecma_is_value_direct (y) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) || ecma_is_value_symbol (x) || ecma_is_value_symbol (y) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ || ecma_is_value_object (x) || ecma_is_value_object (y)) { diff --git a/jerry-core/ecma/operations/ecma-container-object.c b/jerry-core/ecma/operations/ecma-container-object.c index 0732c0235..43e70d04e 100644 --- a/jerry-core/ecma/operations/ecma-container-object.c +++ b/jerry-core/ecma/operations/ecma-container-object.c @@ -26,7 +26,7 @@ #include "ecma-property-hashmap.h" #include "ecma-objects.h" -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) +#if ENABLED (JERRY_BUILTIN_CONTAINER) /** \addtogroup ecma ECMA * @{ @@ -184,7 +184,7 @@ ecma_op_container_entry_size (lit_magic_string_id_t lit_id) /**< class id */ return ECMA_CONTAINER_VALUE_SIZE; } /* ecma_op_container_entry_size */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) /** * Release the entries in the WeakSet container. */ @@ -213,9 +213,9 @@ ecma_op_container_free_weakset_entries (ecma_object_t *object_p, /**< object poi *entry_p = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_weakset_entries */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) /** * Release the entries in the WeakMap container. */ @@ -247,9 +247,9 @@ ecma_op_container_free_weakmap_entries (ecma_object_t *object_p, /**< object poi entry_p->value = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_weakmap_entries */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) /** * Release the entries in the Set container. */ @@ -274,9 +274,9 @@ ecma_op_container_free_set_entries (ecma_collection_t *container_p) *entry_p = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_set_entries */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /** * Release the entries in the Map container. */ @@ -304,7 +304,7 @@ ecma_op_container_free_map_entries (ecma_collection_t *container_p) entry_p->value = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_map_entries */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ /** * Release the internal buffer and the stored entries. @@ -320,34 +320,34 @@ ecma_op_container_free_entries (ecma_object_t *object_p) /**< collection object switch (map_object_p->u.class_prop.class_id) { -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKSET) case LIT_MAGIC_STRING_WEAKSET_UL: { ecma_op_container_free_weakset_entries (object_p, container_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#if ENABLED (JERRY_BUILTIN_WEAKMAP) case LIT_MAGIC_STRING_WEAKMAP_UL: { ecma_op_container_free_weakmap_entries (object_p, container_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#if ENABLED (JERRY_BUILTIN_SET) case LIT_MAGIC_STRING_SET_UL: { ecma_op_container_free_set_entries (container_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#if ENABLED (JERRY_BUILTIN_MAP) case LIT_MAGIC_STRING_MAP_UL: { ecma_op_container_free_map_entries (container_p); break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ default: { break; @@ -401,7 +401,7 @@ ecma_op_container_create (const ecma_value_t *arguments_list_p, /**< arguments l ecma_value_t set_value = ecma_make_object_value (object_p); ecma_value_t result = set_value; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (arguments_list_len == 0) { return result; @@ -542,7 +542,7 @@ cleanup_adder: ecma_deref_object (adder_func_p); cleanup_object: ecma_deref_object (object_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return result; } /* ecma_op_container_create */ @@ -623,12 +623,12 @@ ecma_op_container_get (ecma_value_t this_arg, /**< this argument */ return ECMA_VALUE_ERROR; } -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) if (lit_id == LIT_MAGIC_STRING_WEAKMAP_UL && !ecma_is_value_object (key_arg)) { return ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.class_prop.u.value); @@ -669,13 +669,13 @@ ecma_op_container_has (ecma_value_t this_arg, /**< this argument */ ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.class_prop.u.value); -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) if ((map_object_p->u.class_prop.extra_info & ECMA_CONTAINER_FLAGS_WEAK) != 0 && !ecma_is_value_object (key_arg)) { return ECMA_VALUE_FALSE; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ if (ECMA_CONTAINER_GET_SIZE (container_p) == 0) { @@ -778,13 +778,13 @@ ecma_op_container_set (ecma_value_t this_arg, /**< this argument */ ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.class_prop.u.value); -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) if ((map_object_p->u.class_prop.extra_info & ECMA_CONTAINER_FLAGS_WEAK) != 0 && !ecma_is_value_object (key_arg)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Key must be an object")); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ ecma_value_t *entry_p = ecma_op_internal_buffer_find (container_p, key_arg, lit_id); @@ -795,13 +795,13 @@ ecma_op_container_set (ecma_value_t this_arg, /**< this argument */ value_arg, lit_id); -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) if ((map_object_p->u.class_prop.extra_info & ECMA_CONTAINER_FLAGS_WEAK) != 0) { ecma_object_t *key_p = ecma_get_object_from_value (key_arg); ecma_op_container_set_weak (key_p, map_object_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) || ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ } else { @@ -1014,7 +1014,7 @@ ecma_op_container_remove_weak_entry (ecma_object_t *object_p, /**< internal cont ecma_op_internal_buffer_delete (container_p, (ecma_container_pair_t *) entry_p, map_object_p->u.class_prop.class_id); } /* ecma_op_container_remove_weak_entry */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The Create{Set, Map}Iterator Abstract operation @@ -1207,11 +1207,11 @@ ecma_op_container_iterator_next (ecma_value_t this_val, /**< this argument */ return ret_value; } /* ecma_op_container_iterator_next */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ +#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ diff --git a/jerry-core/ecma/operations/ecma-container-object.h b/jerry-core/ecma/operations/ecma-container-object.h index ec30bb120..0d0c35e9c 100644 --- a/jerry-core/ecma/operations/ecma-container-object.h +++ b/jerry-core/ecma/operations/ecma-container-object.h @@ -19,7 +19,7 @@ #include "ecma-globals.h" #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) +#if ENABLED (JERRY_BUILTIN_CONTAINER) /** \addtogroup ecma ECMA * @{ @@ -53,6 +53,6 @@ ecma_value_t ecma_op_container_iterator_next (ecma_value_t this_val, ecma_pseudo * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) */ +#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ #endif /* !ECMA_CONTAINER_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-conversion.c b/jerry-core/ecma/operations/ecma-conversion.c index e28542676..58c3fa0ca 100644 --- a/jerry-core/ecma/operations/ecma-conversion.c +++ b/jerry-core/ecma/operations/ecma-conversion.c @@ -129,7 +129,7 @@ ecma_op_same_value (ecma_value_t x, /**< ecma value */ return false; } /* ecma_op_same_value */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) /** * SameValueZero operation. * @@ -175,7 +175,7 @@ ecma_op_same_value_zero (ecma_value_t x, /**< ecma value */ return ecma_op_same_value (x, y); } /* ecma_op_same_value_zero */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ /** * ToPrimitive operation. @@ -280,12 +280,12 @@ ecma_op_to_number (ecma_value_t value) /**< ecma value */ ecma_string_t *str_p = ecma_get_string_from_value (value); return ecma_make_number_value (ecma_string_to_number (str_p)); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_is_value_symbol (value)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a Symbol value to a number.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (ecma_is_value_object (value)) { @@ -381,12 +381,12 @@ ecma_get_number (ecma_value_t value, /**< ecma value*/ return ECMA_VALUE_EMPTY; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_is_value_symbol (value)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a Symbol value to a number.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_is_value_boolean (value)); @@ -456,13 +456,13 @@ ecma_op_to_string (ecma_value_t value) /**< ecma value */ { return ecma_get_magic_string (LIT_MAGIC_STRING_NULL); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_is_value_symbol (value)) { ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a Symbol value to a string.")); return NULL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_is_value_boolean (value)); if (ecma_is_value_true (value)) @@ -484,14 +484,14 @@ ecma_op_to_prop_name (ecma_value_t value) /**< ecma value */ { ecma_check_value_type_is_spec_defined (value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_is_value_symbol (value)) { ecma_string_t *symbol_p = ecma_get_symbol_from_value (value); ecma_ref_ecma_string (symbol_p); return symbol_p; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_op_to_string (value); } /* ecma_op_to_prop_name */ @@ -522,12 +522,12 @@ ecma_op_to_object (ecma_value_t value) /**< ecma value */ { return ecma_copy_value (value); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_is_value_symbol (value)) { return ecma_op_create_symbol_object (value); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { if (ecma_is_value_undefined (value) @@ -594,11 +594,11 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_des } else { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) JERRY_ASSERT (src_prop_desc_p->flags & (ECMA_PROP_IS_GET_DEFINED | ECMA_PROP_IS_SET_DEFINED)); -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ if (src_prop_desc_p->flags & (ECMA_PROP_IS_GET_DEFINED | ECMA_PROP_IS_SET_DEFINED)) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { /* a. */ if (src_prop_desc_p->get_p == NULL) @@ -925,7 +925,7 @@ ecma_op_to_length (ecma_value_t value, /**< ecma value */ return value; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* 2 */ ecma_number_t num; ecma_value_t length_num = ecma_op_to_integer (value, &num); @@ -953,7 +953,7 @@ ecma_op_to_length (ecma_value_t value, /**< ecma value */ /* 6 */ *length = (uint32_t) num; return ECMA_VALUE_EMPTY; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* In the case of ES5, ToLength(ES6) operation is the same as ToUint32(ES5) */ ecma_number_t num; ecma_value_t to_number = ecma_get_number (value, &num); @@ -966,10 +966,10 @@ ecma_op_to_length (ecma_value_t value, /**< ecma value */ *length = ecma_number_to_uint32 (num); return ECMA_VALUE_EMPTY; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_op_to_length */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * CreateListFromArrayLike operation. * Different types are not handled yet. @@ -1031,7 +1031,7 @@ ecma_op_create_list_from_array_like (ecma_value_t arr, /**< array value */ /* 9. */ return list_ptr; } /* ecma_op_create_list_from_array_like */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-conversion.h b/jerry-core/ecma/operations/ecma-conversion.h index dd3dd64e6..4dc612a60 100644 --- a/jerry-core/ecma/operations/ecma-conversion.h +++ b/jerry-core/ecma/operations/ecma-conversion.h @@ -39,9 +39,9 @@ typedef enum ecma_value_t ecma_op_check_object_coercible (ecma_value_t value); bool ecma_op_same_value (ecma_value_t x, ecma_value_t y); -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) bool ecma_op_same_value_zero (ecma_value_t x, ecma_value_t y); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ ecma_value_t ecma_op_to_primitive (ecma_value_t value, ecma_preferred_type_hint_t preferred_type); bool ecma_op_to_boolean (ecma_value_t value); ecma_value_t ecma_op_to_number (ecma_value_t value); @@ -51,9 +51,9 @@ ecma_string_t *ecma_op_to_prop_name (ecma_value_t value); ecma_value_t ecma_op_to_object (ecma_value_t value); ecma_value_t ecma_op_to_integer (ecma_value_t value, ecma_number_t *number_p); ecma_value_t ecma_op_to_length (ecma_value_t value, uint32_t *length); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_collection_t *ecma_op_create_list_from_array_like (ecma_value_t arr, bool prop_names_only); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_desc_p); ecma_value_t ecma_op_to_property_descriptor (ecma_value_t obj_value, ecma_property_descriptor_t *out_prop_desc_p); diff --git a/jerry-core/ecma/operations/ecma-dataview-object.c b/jerry-core/ecma/operations/ecma-dataview-object.c index 69d54fd90..f33261f01 100644 --- a/jerry-core/ecma/operations/ecma-dataview-object.c +++ b/jerry-core/ecma/operations/ecma-dataview-object.c @@ -22,7 +22,7 @@ #include "ecma-typedarray-object.h" #include "ecma-objects.h" -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) /** \addtogroup ecma ECMA * @{ @@ -333,4 +333,4 @@ ecma_is_dataview (ecma_value_t value) /**< the target need to be checked */ * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ diff --git a/jerry-core/ecma/operations/ecma-dataview-object.h b/jerry-core/ecma/operations/ecma-dataview-object.h index f2e52f923..93932312f 100644 --- a/jerry-core/ecma/operations/ecma-dataview-object.h +++ b/jerry-core/ecma/operations/ecma-dataview-object.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) /** \addtogroup ecma ECMA * @{ @@ -39,6 +39,6 @@ bool ecma_is_dataview (ecma_value_t value); * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ #endif /* !ECMA_DATAVIEW_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-eval.c b/jerry-core/ecma/operations/ecma-eval.c index f499af87c..b05cd4291 100644 --- a/jerry-core/ecma/operations/ecma-eval.c +++ b/jerry-core/ecma/operations/ecma-eval.c @@ -97,9 +97,9 @@ ecma_op_eval_chars_buffer (const lit_utf8_byte_t *code_p, /**< code characters b JERRY_CONTEXT (resource_name) = ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_EVAL); #endif /* ENABLED (JERRY_RESOURCE_NAME) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_CLEAR_LOCAL_PARSE_OPTS (); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t parse_status = parser_parse_script (NULL, 0, diff --git a/jerry-core/ecma/operations/ecma-exceptions.c b/jerry-core/ecma/operations/ecma-exceptions.c index 56cd63ca0..bc0880c90 100644 --- a/jerry-core/ecma/operations/ecma-exceptions.c +++ b/jerry-core/ecma/operations/ecma-exceptions.c @@ -286,13 +286,13 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er lit_magic_string_id_t class_name = ecma_object_get_class_name (arg_object_p); arg_string_p = ecma_get_magic_string (class_name); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_is_value_symbol (arg_val)) { ecma_value_t symbol_desc_value = ecma_get_symbol_descriptive_string (arg_val); arg_string_p = ecma_get_string_from_value (symbol_desc_value); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { arg_string_p = ecma_op_to_string (arg_val); diff --git a/jerry-core/ecma/operations/ecma-function-object.c b/jerry-core/ecma/operations/ecma-function-object.c index fbde56428..c4961e671 100644 --- a/jerry-core/ecma/operations/ecma-function-object.c +++ b/jerry-core/ecma/operations/ecma-function-object.c @@ -51,7 +51,7 @@ ecma_op_resource_name (const ecma_compiled_code_t *bytecode_header_p) } /* ecma_op_resource_name */ #endif /* ENABLED (JERRY_RESOURCE_NAME) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * SetFunctionName operation * @@ -100,7 +100,7 @@ ecma_op_function_form_name (ecma_string_t *prop_name_p, /**< property name */ return ecma_make_string_value (prop_name_p); } /* ecma_op_function_form_name */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * IsCallable operation. @@ -117,12 +117,12 @@ ecma_op_object_is_callable (ecma_object_t *obj_p) /**< ecma object */ const ecma_object_type_t type = ecma_get_object_type (obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { return ecma_op_is_callable (((ecma_proxy_object_t *) obj_p)->target); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return type >= ECMA_OBJECT_TYPE_FUNCTION; } /* ecma_op_object_is_callable */ @@ -165,12 +165,12 @@ ecma_object_is_constructor (ecma_object_t *obj_p) /**< ecma object */ type = ecma_get_object_type (obj_p); } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { return ecma_is_constructor (((ecma_proxy_object_t *) obj_p)->target); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (type == ECMA_OBJECT_TYPE_FUNCTION) { @@ -384,16 +384,16 @@ ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, /**< argu { JERRY_ASSERT (ecma_is_value_true (ret_value)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t *func_name_p; func_name_p = ecma_compiled_code_resolve_function_name ((const ecma_compiled_code_t *) bytecode_data_p); *func_name_p = ecma_make_magic_string_value (LIT_MAGIC_STRING_ANONYMOUS); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *global_env_p = ecma_get_global_environment (); ecma_builtin_id_t fallback_proto = ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target); bool is_generator_func = parse_opts & ECMA_PARSE_GENERATOR_FUNCTION; @@ -423,14 +423,14 @@ ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, /**< argu ecma_deref_ecma_string (function_body_str_p); return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *func_obj_p = ecma_op_create_function_object (global_env_p, bytecode_data_p, fallback_proto); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_SET_NON_NULL_POINTER (func_obj_p->u2.prototype_cp, proto); ecma_deref_object (proto); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_bytecode_deref (bytecode_data_p); ret_value = ecma_make_object_value (func_obj_p); @@ -459,7 +459,7 @@ ecma_op_create_simple_function_object (ecma_object_t *scope_p, /**< function's s return ecma_op_create_function_object (scope_p, bytecode_data_p, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE); } /* ecma_op_create_simple_function_object */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * GeneratorFunction object creation operation. @@ -531,7 +531,7 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, /**< function's sc return func_p; } /* ecma_op_create_arrow_function_object */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * External function object creation operation. @@ -588,7 +588,7 @@ ecma_op_function_get_compiled_code (ecma_extended_object_t *function_p) /**< fun #endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ } /* ecma_op_function_get_compiled_code */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Check whether the given object [[FunctionKind]] internal slot value is "generator". * @@ -610,7 +610,7 @@ ecma_op_function_is_generator (ecma_object_t *obj_p) /**< object */ return false; } /* ecma_op_function_is_generator */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * 15.3.5.3 implementation of [[HasInstance]] for Function objects @@ -665,16 +665,16 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object * ecma_object_t *prototype_obj_p = ecma_get_object_from_value (prototype_obj_value); JERRY_ASSERT (prototype_obj_p != NULL); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) ecma_value_t result = ECMA_VALUE_ERROR; -#else /* !ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t result = ECMA_VALUE_FALSE; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ while (true) { jmem_cpointer_t v_obj_cp; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (v_obj_p)) { ecma_value_t parent = ecma_proxy_object_get_prototype_of (v_obj_p); @@ -688,17 +688,17 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object * } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ v_obj_cp = ecma_op_ordinary_object_get_prototype_of (v_obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (v_obj_cp == JMEM_CP_NULL) { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) result = ECMA_VALUE_FALSE; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ break; } @@ -715,7 +715,7 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object * return result; } /* ecma_op_function_has_instance */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * GetSuperConstructor operation for class methods @@ -730,7 +730,7 @@ ecma_op_function_get_super_constructor (ecma_object_t *func_obj_p) /**< function { ecma_object_t *super_ctor_p; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (func_obj_p)) { ecma_value_t super_ctor = ecma_proxy_object_get_prototype_of (func_obj_p); @@ -744,7 +744,7 @@ ecma_op_function_get_super_constructor (ecma_object_t *func_obj_p) /**< function } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (func_obj_p); if (proto_cp == JMEM_CP_NULL) { @@ -755,9 +755,9 @@ ecma_op_function_get_super_constructor (ecma_object_t *func_obj_p) /**< function super_ctor_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, proto_cp); ecma_ref_object (super_ctor_p); } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (super_ctor_p == NULL || !ecma_object_is_constructor (super_ctor_p)) { @@ -770,7 +770,7 @@ ecma_op_function_get_super_constructor (ecma_object_t *func_obj_p) /**< function return ecma_make_object_value (super_ctor_p); } /* ecma_op_function_get_super_constructor */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Ordinary internal method: GetPrototypeFromConstructor (constructor, intrinsicDefaultProto) @@ -843,7 +843,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ const ecma_compiled_code_t *bytecode_data_p = ecma_op_function_get_compiled_code (ext_func_p); uint16_t status_flags = bytecode_data_p->status_flags; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool is_construct_call = JERRY_CONTEXT (current_new_target) != NULL; if (JERRY_UNLIKELY (status_flags & (CBC_CODE_FLAGS_CLASS_CONSTRUCTOR | CBC_CODE_FLAGS_GENERATOR))) { @@ -857,10 +857,10 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ return ecma_raise_type_error (ECMA_ERR_MSG ("Generator functions cannot be invoked with 'new'.")); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 1. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_object_t *old_function_object_p = JERRY_CONTEXT (current_function_obj_p); if (JERRY_UNLIKELY (status_flags & CBC_CODE_FLAGS_ARROW_FUNCTION)) @@ -880,7 +880,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ else { JERRY_CONTEXT (current_function_obj_p) = func_obj_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (!(status_flags & CBC_CODE_FLAGS_STRICT_MODE)) { if (ecma_is_value_undefined (this_binding) @@ -898,9 +898,9 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (this_binding)); } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 5. */ ecma_object_t *local_env_p; @@ -919,7 +919,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ arguments_list_len, bytecode_data_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) // ECMAScript v6, 9.2.2.8 if (JERRY_UNLIKELY (status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR)) { @@ -928,7 +928,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ : this_binding); ecma_op_init_this_binding (local_env_p, lexical_this); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } ecma_value_t ret_value = vm_run (bytecode_data_p, @@ -937,7 +937,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_CONTEXT (current_function_obj_p) = old_function_object_p; /* ECMAScript v6, 9.2.2.13 */ @@ -957,7 +957,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (!(status_flags & CBC_CODE_FLAGS_LEXICAL_ENV_NOT_NEEDED)) { @@ -1111,20 +1111,20 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */ const ecma_object_type_t type = ecma_get_object_type (func_obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { return ecma_proxy_object_call (func_obj_p, this_arg_value, arguments_list_p, arguments_list_len); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target); if (JERRY_UNLIKELY (!(JERRY_CONTEXT (status_flags) & ECMA_STATUS_DIRECT_EVAL))) { JERRY_CONTEXT (current_new_target) = NULL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t result; @@ -1141,9 +1141,9 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */ result = ecma_op_function_call_bound (func_obj_p, arguments_list_p, arguments_list_len); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_CONTEXT (current_new_target) = old_new_target_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return result; } /* ecma_op_function_call */ @@ -1209,16 +1209,16 @@ ecma_op_function_construct_external (ecma_object_t *func_obj_p, /**< Function ob ecma_value_t this_arg = ecma_make_object_value (new_this_obj_p); ecma_deref_object (proto_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target); JERRY_CONTEXT (current_new_target) = new_target_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ret_value = ecma_op_function_call_external (func_obj_p, this_arg, arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_CONTEXT (current_new_target) = old_new_target_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (ECMA_IS_VALUE_ERROR (ret_value) || ecma_is_value_object (ret_value)) { @@ -1250,7 +1250,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ const ecma_object_type_t type = ecma_get_object_type (func_obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { return ecma_proxy_object_construct (func_obj_p, @@ -1258,7 +1258,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ arguments_list_p, arguments_list_len); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (JERRY_UNLIKELY (type == ECMA_OBJECT_TYPE_BOUND_FUNCTION)) { @@ -1292,7 +1292,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ return ecma_raise_type_error (ECMA_ERR_MSG ("Expected a constructor.")); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* 6. */ ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target); JERRY_CONTEXT (current_new_target) = new_target_p; @@ -1300,7 +1300,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ /* 5. */ if (!ECMA_GET_THIRD_BIT_FROM_POINTER_TAG (ext_func_obj_p->u.function.scope_cp)) { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 5.a */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (new_target_p, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE); @@ -1313,31 +1313,31 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ new_this_obj_p = ecma_create_object (proto_p, 0, ECMA_OBJECT_TYPE_GENERAL); ecma_deref_object (proto_p); this_arg = ecma_make_object_value (new_this_obj_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } else { this_arg = ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ret_value = ecma_op_function_call_simple (func_obj_p, this_arg, arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_CONTEXT (current_new_target) = old_new_target_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 13.a */ if (ECMA_IS_VALUE_ERROR (ret_value) || ecma_is_value_object (ret_value)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (new_this_obj_p != NULL) { ecma_deref_object (new_this_obj_p); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_deref_object (new_this_obj_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ret_value; } @@ -1362,7 +1362,7 @@ ecma_op_lazy_instantiate_prototype_object (ecma_object_t *object_p) /**< the fun ecma_object_t *proto_object_p = NULL; bool init_constructor = true; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_FUNCTION) { const ecma_compiled_code_t *byte_code_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) object_p); @@ -1379,11 +1379,11 @@ ecma_op_lazy_instantiate_prototype_object (ecma_object_t *object_p) /**< the fun return NULL; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (proto_object_p == NULL) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { proto_object_p = ecma_op_create_object_object_noarg (); } @@ -1432,7 +1432,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< { JERRY_ASSERT (!ecma_get_object_is_builtin (object_p)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_LENGTH)) { ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; @@ -1496,7 +1496,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< return NULL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_PROTOTYPE) && ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_FUNCTION) @@ -1510,7 +1510,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< const ecma_compiled_code_t *bytecode_data_p; bytecode_data_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) object_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE)) { ecma_property_t *value_prop_p; @@ -1522,7 +1522,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< value_p->value = ECMA_VALUE_NULL; return value_prop_p; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE) { ecma_object_t *thrower_p = ecma_builtin_get (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER); @@ -1537,7 +1537,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< &caller_prop_p); return caller_prop_p; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } @@ -1595,7 +1595,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p args_length = ecma_get_integer_from_value (args_len_or_this); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (bound_func_p->header.u.bound_function.target_function)) { return NULL; @@ -1606,7 +1606,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p /* Set tag bit to represent initialized 'length' property */ ECMA_SET_FIRST_BIT_TO_POINTER_TAG (bound_func_p->header.u.bound_function.target_function); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ length_attributes = ECMA_PROPERTY_FIXED; ecma_object_t *target_func_p; @@ -1623,7 +1623,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p length = ecma_get_integer_from_value (get_len_value) - (args_length - 1); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (length < 0) { @@ -1679,36 +1679,36 @@ ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functio ecma_collection_t *for_non_enumerable_p = (opts & ECMA_LIST_ENUMERABLE) ? non_enum_collection_p : main_collection_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; if (!ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (ext_func_p->u.function.scope_cp)) { /* Unintialized 'length' property is non-enumerable (ECMA-262 v6, 19.2.4.1) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* 'length' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ const ecma_compiled_code_t *bytecode_data_p; bytecode_data_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) object_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (bytecode_data_p->status_flags & (CBC_CODE_FLAGS_ARROW_FUNCTION | CBC_CODE_FLAGS_ACCESSOR)) { return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_PROTOTYPE)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool append_caller_and_arguments = !(bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ bool append_caller_and_arguments = (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (append_caller_and_arguments) { @@ -1739,11 +1739,11 @@ ecma_op_external_function_list_lazy_property_names (ecma_object_t *object_p, /** ecma_collection_t *for_non_enumerable_p = (opts & ECMA_LIST_ENUMERABLE) ? non_enum_collection_p : main_collection_p; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) JERRY_UNUSED (object_p); -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ if (!ecma_op_ordinary_object_has_own_property (object_p, ecma_get_magic_string (LIT_MAGIC_STRING_PROTOTYPE))) -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ { /* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_PROTOTYPE)); @@ -1770,18 +1770,18 @@ ecma_op_bound_function_list_lazy_property_names (ecma_object_t *object_p, /**< b ecma_collection_t *for_non_enumerable_p = (opts & ECMA_LIST_ENUMERABLE) ? non_enum_collection_p : main_collection_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Unintialized 'length' property is non-enumerable (ECMA-262 v6, 19.2.4.1) */ ecma_bound_function_t *bound_func_p = (ecma_bound_function_t *) object_p; if (!ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (bound_func_p->header.u.bound_function.target_function)) { ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (object_p); /* 'length' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 'caller' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER)); diff --git a/jerry-core/ecma/operations/ecma-function-object.h b/jerry-core/ecma/operations/ecma-function-object.h index c10489eb6..bc87ed557 100644 --- a/jerry-core/ecma/operations/ecma-function-object.h +++ b/jerry-core/ecma/operations/ecma-function-object.h @@ -31,9 +31,9 @@ ecma_value_t ecma_op_resource_name (const ecma_compiled_code_t *bytecode_header_p); #endif /* ENABLED (JERRY_RESOURCE_NAME) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t ecma_op_function_form_name (ecma_string_t *prop_name_p, char *prefix_p, lit_utf8_size_t prefix_size); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ bool ecma_op_is_callable (ecma_value_t value); bool ecma_op_object_is_callable (ecma_object_t *obj_p); @@ -54,7 +54,7 @@ ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, ecma_length_t arguments_list_len, ecma_parse_opts_t opts); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t ecma_op_function_get_super_constructor (ecma_object_t *func_obj_p); @@ -66,7 +66,7 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, const ecma_compile ecma_value_t this_binding); bool ecma_op_function_is_generator (ecma_object_t *func_obj_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t * ecma_op_get_prototype_from_constructor (ecma_object_t *ctor_obj_p, ecma_builtin_id_t default_proto_id); diff --git a/jerry-core/ecma/operations/ecma-get-put-value.c b/jerry-core/ecma/operations/ecma-get-put-value.c index fc47534b8..36f1a580f 100644 --- a/jerry-core/ecma/operations/ecma-get-put-value.c +++ b/jerry-core/ecma/operations/ecma-get-put-value.c @@ -64,24 +64,24 @@ ecma_op_get_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme *ref_base_lex_env_p = lex_env_p; ecma_property_value_t *property_value_p = ECMA_PROPERTY_VALUE_PTR (property_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (property_value_p->value == ECMA_VALUE_UNINITIALIZED)) { return ecma_raise_reference_error (ECMA_ERR_MSG ("Variables declared by let/const must be" " initialized before reading their value.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_fast_copy_value (property_value_p->value); } break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND: { break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); @@ -168,12 +168,12 @@ ecma_op_get_value_object_base (ecma_value_t base_value, /**< base value */ id = ECMA_BUILTIN_ID_NUMBER_PROTOTYPE; #endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_is_value_symbol (base_value)) { id = ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { JERRY_ASSERT (ecma_is_value_boolean (base_value)); @@ -219,22 +219,22 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme { ecma_property_value_t *property_value_p = ECMA_PROPERTY_VALUE_PTR (property_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (property_value_p->value == ECMA_VALUE_UNINITIALIZED)) { return ecma_raise_reference_error (ECMA_ERR_MSG ("Variables declared by let/const must be" " initialized before writing their value.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_named_data_property_assign_value (lex_env_p, property_value_p, value); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_is_property_enumerable (*property_p)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Constant bindings cannot be reassigned.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else if (is_strict) { return ecma_raise_type_error (ECMA_ERR_MSG ("Binding cannot be set.")); @@ -243,12 +243,12 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme } break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND: { break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); @@ -257,12 +257,12 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme ecma_value_t has_property = ecma_op_object_has_property (binding_obj_p, name_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (has_property)) { return has_property; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_true (has_property)) { diff --git a/jerry-core/ecma/operations/ecma-iterator-object.c b/jerry-core/ecma/operations/ecma-iterator-object.c index 86fdb72c1..b64a2319a 100644 --- a/jerry-core/ecma/operations/ecma-iterator-object.c +++ b/jerry-core/ecma/operations/ecma-iterator-object.c @@ -35,7 +35,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Implementation of 'CreateArrayFromList' specialized for iterators @@ -602,7 +602,7 @@ ecma_op_iterator_do (ecma_iterator_command_type_t command, /**< command to be ex return result; } /* ecma_op_iterator_do */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-iterator-object.h b/jerry-core/ecma/operations/ecma-iterator-object.h index 70f46e19d..2c11a9f1d 100644 --- a/jerry-core/ecma/operations/ecma-iterator-object.h +++ b/jerry-core/ecma/operations/ecma-iterator-object.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** \addtogroup ecma ECMA * @{ @@ -69,7 +69,7 @@ ecma_value_t ecma_op_iterator_do (ecma_iterator_command_type_t command, ecma_value_t iterator, ecma_value_t value, bool *done_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-jobqueue.c b/jerry-core/ecma/operations/ecma-jobqueue.c index fed814b7f..134c6dc35 100644 --- a/jerry-core/ecma/operations/ecma-jobqueue.c +++ b/jerry-core/ecma/operations/ecma-jobqueue.c @@ -21,7 +21,7 @@ #include "ecma-promise-object.h" #include "jcontext.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) /** * Mask for job queue type. @@ -384,4 +384,4 @@ ecma_free_all_enqueued_jobs (void) * @} * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ diff --git a/jerry-core/ecma/operations/ecma-jobqueue.h b/jerry-core/ecma/operations/ecma-jobqueue.h index 5436fa4d9..dccdfa464 100644 --- a/jerry-core/ecma/operations/ecma-jobqueue.h +++ b/jerry-core/ecma/operations/ecma-jobqueue.h @@ -16,7 +16,7 @@ #ifndef ECMA_JOB_QUEUE_H #define ECMA_JOB_QUEUE_H -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) /** \addtogroup ecma ECMA * @{ @@ -54,5 +54,5 @@ ecma_value_t ecma_process_all_enqueued_jobs (void); * @} * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ #endif /* !ECMA_JOB_QUEUE_H */ diff --git a/jerry-core/ecma/operations/ecma-lex-env.c b/jerry-core/ecma/operations/ecma-lex-env.c index c0dc6efce..d2676b5c0 100644 --- a/jerry-core/ecma/operations/ecma-lex-env.c +++ b/jerry-core/ecma/operations/ecma-lex-env.c @@ -45,9 +45,9 @@ ecma_init_global_environment (void) glob_obj_p, ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); ECMA_SET_NON_NULL_POINTER (JERRY_CONTEXT (ecma_global_env_cp), global_lex_env_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ECMA_SET_NON_NULL_POINTER (JERRY_CONTEXT (ecma_global_scope_cp), global_lex_env_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_init_global_environment */ /** @@ -56,13 +56,13 @@ ecma_init_global_environment (void) void ecma_finalize_global_environment (void) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_CONTEXT (ecma_global_scope_cp) != JERRY_CONTEXT (ecma_global_env_cp)) { ecma_deref_object (ECMA_GET_NON_NULL_POINTER (ecma_object_t, JERRY_CONTEXT (ecma_global_scope_cp))); } JERRY_CONTEXT (ecma_global_scope_cp) = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_deref_object (ECMA_GET_NON_NULL_POINTER (ecma_object_t, JERRY_CONTEXT (ecma_global_env_cp))); JERRY_CONTEXT (ecma_global_env_cp) = JMEM_CP_NULL; } /* ecma_finalize_global_environment */ @@ -80,7 +80,7 @@ ecma_get_global_environment (void) return ECMA_GET_NON_NULL_POINTER (ecma_object_t, JERRY_CONTEXT (ecma_global_env_cp)); } /* ecma_get_global_environment */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Create the global lexical block on top of the global environment. */ @@ -94,7 +94,7 @@ ecma_create_global_lexical_block (void) ECMA_SET_NON_NULL_POINTER (JERRY_CONTEXT (ecma_global_scope_cp), global_scope_p); } } /* ecma_create_global_lexical_block */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Get reference to Global lexical scope @@ -105,12 +105,12 @@ ecma_create_global_lexical_block (void) ecma_object_t * ecma_get_global_scope (void) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (JERRY_CONTEXT (ecma_global_scope_cp) != JMEM_CP_NULL); return ECMA_GET_NON_NULL_POINTER (ecma_object_t, JERRY_CONTEXT (ecma_global_scope_cp)); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ return ecma_get_global_environment (); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ } /* ecma_get_global_scope */ /** @@ -239,12 +239,12 @@ ecma_op_set_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environment { ecma_named_data_property_assign_value (lex_env_p, ECMA_PROPERTY_VALUE_PTR (property_p), value); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_is_property_enumerable (*property_p)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Constant bindings cannot be reassigned.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else if (is_strict) { return ecma_raise_type_error (ECMA_ERR_MSG ("Binding cannot be set.")); @@ -433,7 +433,7 @@ ecma_op_create_immutable_binding (ecma_object_t *lex_env_p, /**< lexical environ prop_value_p->value = ecma_copy_value_if_not_object (value); } /* ecma_op_create_immutable_binding */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * InitializeBinding operation. * @@ -569,7 +569,7 @@ ecma_op_this_binding_is_initialized (ecma_property_t *prop_p) /**< [[ThisBinding return ECMA_PROPERTY_VALUE_PTR (prop_p)->value != ECMA_VALUE_UNINITIALIZED; } /* ecma_op_this_binding_is_initialized */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-lex-env.h b/jerry-core/ecma/operations/ecma-lex-env.h index 6f260ad4f..d7618c1ec 100644 --- a/jerry-core/ecma/operations/ecma-lex-env.h +++ b/jerry-core/ecma/operations/ecma-lex-env.h @@ -34,14 +34,14 @@ void ecma_init_global_environment (void); void ecma_finalize_global_environment (void); ecma_object_t *ecma_get_global_environment (void); ecma_object_t *ecma_get_global_scope (void); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void ecma_create_global_lexical_block (void); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) void ecma_module_add_lex_env (ecma_object_t *lex_env_p); void ecma_module_finalize_lex_envs (void); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ /** * @} @@ -66,7 +66,7 @@ ecma_value_t ecma_op_implicit_this_value (ecma_object_t *lex_env_p); /* ECMA-262 v5, Table 18. Additional methods of Declarative Environment Records */ void ecma_op_create_immutable_binding (ecma_object_t *lex_env_p, ecma_string_t *name_p, ecma_value_t value); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void ecma_op_initialize_binding (ecma_object_t *lex_env_p, ecma_string_t *name_p, ecma_value_t value); void @@ -83,7 +83,7 @@ ecma_op_get_this_binding (ecma_object_t *lex_env_p); void ecma_op_bind_this_value (ecma_property_t *prop_p, ecma_value_t this_binding); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-objects-arguments.c b/jerry-core/ecma/operations/ecma-objects-arguments.c index 2c3023a51..e34a0d756 100644 --- a/jerry-core/ecma/operations/ecma-objects-arguments.c +++ b/jerry-core/ecma/operations/ecma-objects-arguments.c @@ -140,7 +140,7 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function ecma_property_descriptor_t prop_desc = ecma_make_empty_property_descriptor (); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* ECMAScript v6, 9.4.4.6.7, 9.4.4.7.22 */ ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR); @@ -154,7 +154,7 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function JERRY_ASSERT (ecma_is_value_object (prop_value_p->value)); ecma_deref_object (ecma_get_object_from_value (prop_value_p->value)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 13. */ if (!is_strict) diff --git a/jerry-core/ecma/operations/ecma-objects-general.c b/jerry-core/ecma/operations/ecma-objects-general.c index a0b8517bb..d2ee7466f 100644 --- a/jerry-core/ecma/operations/ecma-objects-general.c +++ b/jerry-core/ecma/operations/ecma-objects-general.c @@ -203,7 +203,7 @@ static const lit_magic_string_id_t to_primitive_non_string_hint_method_names[2] LIT_MAGIC_STRING_TO_STRING_UL, /**< toString operation */ }; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Hints for the ecma general object's toPrimitve operation */ @@ -213,7 +213,7 @@ static const lit_magic_string_id_t hints[3] = LIT_MAGIC_STRING_NUMBER, /**< "number" hint */ LIT_MAGIC_STRING_STRING, /**< "string" hint */ }; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * [[DefaultValue]] ecma general object's operation @@ -232,7 +232,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */ JERRY_ASSERT (obj_p != NULL && !ecma_is_lexical_environment (obj_p)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t obj_value = ecma_make_object_value (obj_p); ecma_value_t exotic_to_prim = ecma_op_get_method_by_symbol_id (obj_value, @@ -272,7 +272,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */ { hint = ECMA_PREFERRED_TYPE_NUMBER; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (hint == ECMA_PREFERRED_TYPE_NO) { if (ecma_object_class_is (obj_p, LIT_MAGIC_STRING_DATE_UL)) @@ -284,7 +284,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */ hint = ECMA_PREFERRED_TYPE_NUMBER; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_op_general_object_ordinary_value (obj_p, hint); } /* ecma_op_general_object_default_value */ @@ -363,12 +363,12 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob const ecma_property_descriptor_t *property_desc_p) /**< property * descriptor */ { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_define_own_property (object_p, property_name_p, property_desc_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ JERRY_ASSERT (object_p != NULL && !ecma_is_lexical_environment (object_p)); @@ -636,7 +636,7 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob #undef ECMA_PROPERTY_TYPE_GENERIC -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * The IsCompatiblePropertyDescriptor method for Proxy object internal methods * @@ -780,7 +780,7 @@ ecma_op_to_complete_property_descriptor (ecma_property_descriptor_t *desc_p) /** desc_p->flags |= (ECMA_PROP_IS_GET_DEFINED | ECMA_PROP_IS_SET_DEFINED); } } /* ecma_op_to_complete_property_descriptor */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-objects-general.h b/jerry-core/ecma/operations/ecma-objects-general.h index 7ab797194..111965f43 100644 --- a/jerry-core/ecma/operations/ecma-objects-general.h +++ b/jerry-core/ecma/operations/ecma-objects-general.h @@ -37,13 +37,13 @@ ecma_value_t ecma_op_general_object_ordinary_value (ecma_object_t *obj_p, ecma_p ecma_value_t ecma_op_general_object_define_own_property (ecma_object_t *object_p, ecma_string_t *property_name_p, const ecma_property_descriptor_t *property_desc_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void ecma_op_to_complete_property_descriptor (ecma_property_descriptor_t *desc_p); bool ecma_op_is_compatible_property_descriptor (const ecma_property_descriptor_t *desc_p, const ecma_property_descriptor_t *current_p, bool is_extensible); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c index 70b6c02fc..f5e69d1ca 100644 --- a/jerry-core/ecma/operations/ecma-objects.c +++ b/jerry-core/ecma/operations/ecma-objects.c @@ -29,11 +29,11 @@ #include "ecma-proxy-object.h" #include "jcontext.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) #include "ecma-typedarray-object.h" #include "ecma-arraybuffer-object.h" #include "ecma-try-catch-macro.h" -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ /** \addtogroup ecma ECMA * @{ @@ -76,9 +76,9 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ { JERRY_ASSERT (object_p != NULL && !ecma_is_lexical_environment (object_p)); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) JERRY_ASSERT (!ECMA_OBJECT_IS_PROXY (object_p)); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ JERRY_ASSERT (property_name_p != NULL); JERRY_ASSERT (options == ECMA_PROPERTY_GET_NO_OPTIONS || options == ECMA_PROPERTY_GET_HAS_OWN_PROP @@ -173,18 +173,18 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ break; } -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) case ECMA_OBJECT_TYPE_PSEUDO_ARRAY: { /* ES2015 9.4.5.1 */ if (ecma_object_is_typedarray (object_p)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_prop_name_is_symbol (property_name_p)) { break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t array_index = ecma_string_get_array_index (property_name_p); @@ -232,7 +232,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ default: { break; @@ -256,7 +256,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ } else if (type == ECMA_OBJECT_TYPE_FUNCTION) { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) if (ecma_string_is_length (property_name_p)) { if (options & ECMA_PROPERTY_GET_VALUE) @@ -282,7 +282,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ return ECMA_PROPERTY_TYPE_VIRTUAL; } -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ /* Get prototype physical property. */ property_p = ecma_op_function_try_to_lazy_instantiate_property (object_p, property_name_p); @@ -407,12 +407,12 @@ ecma_op_object_has_property (ecma_object_t *object_p, /**< the object */ { while (true) { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_has (object_p, property_name_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /* 2 - 3. */ if (ecma_op_ordinary_object_has_own_property (object_p, property_name_p)) @@ -544,16 +544,16 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ } } } -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /* ES2015 9.4.5.4 */ if (ecma_object_is_typedarray (object_p)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_prop_name_is_symbol (property_name_p)) { break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t array_index = ecma_string_get_array_index (property_name_p); @@ -583,7 +583,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ ecma_deref_ecma_string (num_to_str); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ break; } @@ -610,7 +610,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ } else if (type == ECMA_OBJECT_TYPE_FUNCTION) { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) if (ecma_string_is_length (property_name_p)) { /* Get length virtual property. */ @@ -631,7 +631,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ return ecma_make_uint32_value (len); } -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ /* Get prototype physical property. */ property_p = ecma_op_function_try_to_lazy_instantiate_property (object_p, property_name_p); @@ -734,12 +734,12 @@ ecma_op_object_find (ecma_object_t *object_p, /**< the object */ while (true) { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_find (object_p, property_name_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t value = ecma_op_object_find_own (base_value, object_p, property_name_p); @@ -834,12 +834,12 @@ ecma_op_object_get_with_receiver (ecma_object_t *object_p, /**< the object */ { while (true) { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_get (object_p, property_name_p, receiver); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t value = ecma_op_object_find_own (receiver, object_p, property_name_p); @@ -931,7 +931,7 @@ ecma_op_object_get_by_magic_id (ecma_object_t *object_p, /**< the object */ return ecma_op_object_get (object_p, ecma_get_magic_string (property_id)); } /* ecma_op_object_get_by_magic_id */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * [[Get]] a well-known symbol by the given property id * @@ -1055,7 +1055,7 @@ ecma_op_get_method_by_magic_id (ecma_value_t value, /**< ecma value */ { return ecma_op_get_method (value, ecma_get_magic_string (magic_id)); } /* ecma_op_get_method_by_magic_id */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * [[Put]] ecma general object's operation specialized for uint32_ property index @@ -1138,7 +1138,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */ is_throw); } /* ecma_op_object_put */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * [[Set]] ( P, V, Receiver) operation part for ordinary objects * @@ -1200,7 +1200,7 @@ ecma_op_object_put_apply_receiver (ecma_value_t receiver, /**< receiver */ return result; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (receiver_obj_p)) { ecma_property_descriptor_t desc; @@ -1208,7 +1208,7 @@ ecma_op_object_put_apply_receiver (ecma_value_t receiver, /**< receiver */ desc.value = value; return ecma_proxy_object_define_own_property (receiver_obj_p, property_name_p, &desc); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (JERRY_UNLIKELY (ecma_op_object_is_fast_array (receiver_obj_p))) { @@ -1226,7 +1226,7 @@ ecma_op_object_put_apply_receiver (ecma_value_t receiver, /**< receiver */ return ECMA_VALUE_TRUE; } /* ecma_op_object_put_apply_receiver */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * [[Put]] ecma general object's operation with given receiver @@ -1258,12 +1258,12 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ && !ecma_is_lexical_environment (object_p)); JERRY_ASSERT (property_name_p != NULL); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_set (object_p, property_name_p, value, receiver); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_object_type_t type = ecma_get_object_type (object_p); @@ -1334,16 +1334,16 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ } } } -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /* ES2015 9.4.5.5 */ if (ecma_object_is_typedarray (object_p)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_prop_name_is_symbol (property_name_p)) { break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t array_index = ecma_string_get_array_index (property_name_p); @@ -1383,7 +1383,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ ecma_deref_ecma_string (num_to_str); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ break; } default: @@ -1430,19 +1430,19 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ } else if (type == ECMA_OBJECT_TYPE_FUNCTION) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Uninitialized 'length' property is non-writable (ECMA-262 v6, 19.2.4.1) */ if ((ecma_string_is_length (property_name_p)) && (!ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (((ecma_extended_object_t *) object_p)->u.function.scope_cp))) { return ecma_reject (is_throw); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (ecma_string_is_length (property_name_p)) { return ecma_reject (is_throw); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Get prototype physical property. */ property_p = ecma_op_function_try_to_lazy_instantiate_property (object_p, property_name_p); @@ -1465,12 +1465,12 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ { if (ecma_is_property_writable (*property_p)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_make_object_value (object_p) != receiver) { return ecma_op_object_put_apply_receiver (receiver, property_name_p, value, is_throw); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* There is no need for special casing arrays here because changing the * value of an existing property never changes the length of an array. */ @@ -1500,7 +1500,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ ecma_property_ref_t property_ref = { NULL }; ecma_object_t *proto_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, proto_cp); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (proto_p)) { return ecma_op_object_put_with_receiver (proto_p, @@ -1509,7 +1509,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ receiver, is_throw); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_property_t inherited_property = ecma_op_object_get_property (proto_p, property_name_p, @@ -1567,9 +1567,9 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) return ecma_op_object_put_apply_receiver (receiver, property_name_p, value, is_throw); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_property_value_t *new_prop_value_p; new_prop_value_p = ecma_create_named_data_property (object_p, @@ -1682,12 +1682,12 @@ ecma_op_object_delete (ecma_object_t *obj_p, /**< the object */ } } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_delete_property (obj_p, property_name_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ JERRY_ASSERT_OBJECT_TYPE_IS_VALID (ecma_get_object_type (obj_p)); @@ -1754,12 +1754,12 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */ const ecma_object_type_t type = ecma_get_object_type (obj_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_define_own_property (obj_p, property_name_p, property_desc_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ switch (type) { @@ -1787,28 +1787,28 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */ ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p; -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS) { -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ return ecma_op_arguments_object_define_own_property (obj_p, property_name_p, property_desc_p); -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) } /* ES2015 9.4.5.3 */ if (ecma_object_is_typedarray (obj_p)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_prop_name_is_symbol (property_name_p)) { return ecma_op_general_object_define_own_property (obj_p, property_name_p, property_desc_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t array_index = ecma_string_get_array_index (property_name_p); if (array_index != ECMA_STRING_NOT_ARRAY_INDEX) @@ -1841,9 +1841,9 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */ return ecma_op_general_object_define_own_property (obj_p, property_name_p, property_desc_p); -#else /* !ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ break; -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ } } } /* ecma_op_object_define_own_property */ @@ -1870,12 +1870,12 @@ ecma_op_object_get_own_property_descriptor (ecma_object_t *object_p, /**< the ob { *prop_desc_p = ecma_make_empty_property_descriptor (); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_get_own_property_descriptor (object_p, property_name_p, prop_desc_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_property_ref_t property_ref; @@ -1985,7 +1985,7 @@ ecma_op_object_is_prototype_of (ecma_object_t *base_p, /**< base object */ do { jmem_cpointer_t target_cp; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (target_p)) { ecma_value_t target_proto = ecma_proxy_object_get_prototype_of (target_p); @@ -1998,11 +1998,11 @@ ecma_op_object_is_prototype_of (ecma_object_t *base_p, /**< base object */ } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ target_cp = ecma_op_ordinary_object_get_prototype_of (target_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (target_cp == JMEM_CP_NULL) { @@ -2040,7 +2040,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ JERRY_ASSERT (obj_p != NULL && !ecma_is_lexical_environment (obj_p)); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (obj_p)) { /* Integrated a part of ECMA 262 v6 7.3.21 EnumerableOwnNames operation. */ @@ -2075,7 +2075,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ ecma_collection_destroy (proxy_keys); return return_keys; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_op_object_is_fast_array (obj_p)) { @@ -2088,10 +2088,10 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ const bool is_enumerable_only = (opts & ECMA_LIST_ENUMERABLE) != 0; const bool is_array_indices_only = (opts & ECMA_LIST_ARRAY_INDICES) != 0; const bool is_with_prototype_chain = (opts & ECMA_LIST_PROTOTYPE) != 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const bool is_symbols = (opts & ECMA_LIST_SYMBOLS) != 0; const bool is_symbols_only = (opts & ECMA_LIST_SYMBOLS_ONLY) != 0; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ const size_t bitmap_row_size = sizeof (uint32_t) * JERRY_BITSINBYTE; const size_t names_hashes_bitmap_size = ECMA_OBJECT_HASH_BITMAP_SIZE / bitmap_row_size; @@ -2105,15 +2105,15 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ const bool obj_is_builtin = ecma_get_object_is_builtin (obj_p); ecma_length_t string_named_properties_count = 0; ecma_length_t array_index_named_properties_count = 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_length_t symbol_named_properties_count = 0; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_collection_t *prop_names_p = ecma_new_collection (); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_LIKELY (!is_symbols_only)) { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (obj_is_builtin) { @@ -2138,12 +2138,12 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ { case ECMA_OBJECT_TYPE_PSEUDO_ARRAY: { - #if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) + #if ENABLED (JERRY_BUILTIN_TYPEDARRAY) if (ecma_object_is_typedarray (obj_p)) { ecma_op_typedarray_list_lazy_property_names (obj_p, prop_names_p); } - #endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ + #endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ break; } case ECMA_OBJECT_TYPE_FUNCTION: @@ -2209,9 +2209,9 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ } } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t *buffer_p = prop_names_p->buffer_p; uint32_t lazy_prop_name_count = prop_names_p->item_count; @@ -2228,21 +2228,21 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ { array_index_named_properties_count++; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_prop_name_is_symbol (name_p)) { symbol_named_properties_count++; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { string_named_properties_count++; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Symbols are never lazy listed */ JERRY_ASSERT (!ecma_prop_name_is_symbol (name_p)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint8_t hash = (uint8_t) ecma_string_hash (name_p); uint32_t bitmap_row = (uint32_t) (hash / bitmap_row_size); @@ -2345,7 +2345,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ if (!(is_enumerable_only && !ecma_is_property_enumerable (*property_p))) { - #if ENABLED (JERRY_ES2015) + #if ENABLED (JERRY_ESNEXT) /* We skip the current property in the following cases: 1. We don't want to list symbols (is_symbols and is_symbols_only are false) and the current property is a symbol. @@ -2357,7 +2357,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ ecma_deref_ecma_string (name_p); continue; } - #endif /* ENABLED (JERRY_ES2015) */ + #endif /* ENABLED (JERRY_ESNEXT) */ uint8_t hash = (uint8_t) ecma_string_hash (name_p); uint32_t bitmap_row = (uint32_t) (hash / bitmap_row_size); @@ -2390,18 +2390,18 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ } else if (!is_array_indices_only) { - #if ENABLED (JERRY_ES2015) + #if ENABLED (JERRY_ESNEXT) if (ecma_prop_name_is_symbol (name_p)) { symbol_named_properties_count++; } else { - #endif /* ENABLED (JERRY_ES2015) */ + #endif /* ENABLED (JERRY_ESNEXT) */ string_named_properties_count++; - #if ENABLED (JERRY_ES2015) + #if ENABLED (JERRY_ESNEXT) } - #endif /* ENABLED (JERRY_ES2015) */ + #endif /* ENABLED (JERRY_ESNEXT) */ } else { @@ -2433,24 +2433,24 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ ecma_length_t all_properties_count = array_index_named_properties_count + string_named_properties_count; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) all_properties_count += symbol_named_properties_count; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Second pass: collecting property names into an array. */ JMEM_DEFINE_LOCAL_ARRAY (names_p, all_properties_count, ecma_string_t *); ecma_string_t **string_names_p = names_p + array_index_named_properties_count; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_string_t **symbol_names_p = string_names_p + string_named_properties_count; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t array_index_name_pos = 0; uint32_t string_name_pos = string_named_properties_count; uint32_t lazy_string_name_pos = 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint32_t symbol_name_pos = symbol_named_properties_count; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ buffer_p = prop_names_p->buffer_p; @@ -2493,7 +2493,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ names_p[insertion_pos] = name_p; } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (ecma_prop_name_is_symbol (name_p)) { // Put in the symbols in reverse order. @@ -2502,7 +2502,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ symbol_names_p[--symbol_name_pos] = name_p; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { // Put in the strings in reverse order. @@ -2522,9 +2522,9 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ JERRY_ASSERT (array_index_name_pos == array_index_named_properties_count); JERRY_ASSERT (string_name_pos - lazy_string_name_pos == 0); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (symbol_name_pos == 0); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_collection_free (prop_names_p); @@ -2617,10 +2617,10 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */ { #ifndef JERRY_NDEBUG return (ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_GLOBAL) -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_PROMISE_PROTOTYPE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE) @@ -2634,8 +2634,8 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */ #if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE) #endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#if ENABLED (JERRY_ESNEXT) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAY_PROTOTYPE_UNSCOPABLES) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAY_ITERATOR_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE) @@ -2654,28 +2654,28 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */ || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_DATE_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_REGEXP_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE) -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_BUILTIN_MAP) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_MAP_PROTOTYPE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_MAP_ITERATOR_PROTOTYPE) -#endif /* ENABLED (JERRY_ES2015) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_MAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_SET) +#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#if ENABLED (JERRY_BUILTIN_SET) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SET_PROTOTYPE) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SET_ITERATOR_PROTOTYPE) -#endif /* ENABLED (JERRY_ES2015) */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_SET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#if ENABLED (JERRY_BUILTIN_WEAKSET) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#if ENABLED (JERRY_BUILTIN_DATAVIEW) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE) -#endif /* ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) */ +#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE)); #else /* JERRY_NDEBUG */ JERRY_UNUSED (obj_p); @@ -2711,14 +2711,14 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ switch (ext_obj_p->u.pseudo_array.type) { -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) case ECMA_PSEUDO_ARRAY_TYPEDARRAY: case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO: { return (lit_magic_string_id_t) ext_obj_p->u.pseudo_array.u1.class_id; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#if ENABLED (JERRY_ESNEXT) case ECMA_PSEUDO_ARRAY_ITERATOR: { return LIT_MAGIC_STRING_ARRAY_ITERATOR_UL; @@ -2731,13 +2731,13 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ { return LIT_MAGIC_STRING_MAP_ITERATOR_UL; } -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_ESNEXT) case ECMA_PSEUDO_STRING_ITERATOR: { return LIT_MAGIC_STRING_STRING_ITERATOR_UL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (ext_obj_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS); @@ -2770,25 +2770,25 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ return LIT_MAGIC_STRING_MATH_UL; } #endif /* ENABLED (JERRY_BUILTIN_MATH) */ -#if ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_REFLECT) case ECMA_BUILTIN_ID_REFLECT: { return LIT_MAGIC_STRING_REFLECT_UL; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_REFLECT) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ +#if ENABLED (JERRY_ESNEXT) case ECMA_BUILTIN_ID_GENERATOR: { return LIT_MAGIC_STRING_GENERATOR_UL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_BUILTIN_JSON) case ECMA_BUILTIN_ID_JSON: { return LIT_MAGIC_STRING_JSON_U; } #endif /* ENABLED (JERRY_BUILTIN_JSON) */ -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) #if ENABLED (JERRY_BUILTIN_ERRORS) case ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE: case ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE: @@ -2801,13 +2801,13 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ { return LIT_MAGIC_STRING_ERROR_UL; } -#endif /* !ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#endif /* !ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_BUILTIN_PROXY) case ECMA_BUILTIN_ID_PROXY: { return LIT_MAGIC_STRING_FUNCTION_UL; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ default: { JERRY_ASSERT (ecma_object_check_class_name_is_object (obj_p)); @@ -2860,7 +2860,7 @@ ecma_object_is_regexp_object (ecma_value_t arg) /**< argument */ && ecma_object_class_is (ecma_get_object_from_value (arg), LIT_MAGIC_STRING_REGEXP_UL)); } /* ecma_object_is_regexp_object */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Object's IsConcatSpreadable operation, used for Array.prototype.concat * It checks the argument's [Symbol.isConcatSpreadable] property value @@ -3007,7 +3007,7 @@ ecma_op_invoke_by_symbol_id (ecma_value_t object, /**< Object value */ return ret_value; } /* ecma_op_invoke_by_symbol_id */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * 7.3.18 Abstract operation Invoke when property name is a magic string @@ -3139,12 +3139,12 @@ ecma_op_ordinary_object_set_prototype_of (ecma_object_t *obj_p, /**< base object } /* 8.c.i */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (iter_p)) { break; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /* 8.c.ii */ iter_p = ECMA_GET_POINTER (ecma_object_t, ecma_op_ordinary_object_get_prototype_of (iter_p)); diff --git a/jerry-core/ecma/operations/ecma-objects.h b/jerry-core/ecma/operations/ecma-objects.h index 5f287bf09..fa7b9c6ff 100644 --- a/jerry-core/ecma/operations/ecma-objects.h +++ b/jerry-core/ecma/operations/ecma-objects.h @@ -42,12 +42,12 @@ ecma_value_t ecma_op_object_get_with_receiver (ecma_object_t *object_p, ecma_str ecma_value_t ecma_op_object_get_length (ecma_object_t *object_p, uint32_t *length_p); ecma_value_t ecma_op_object_get_by_uint32_index (ecma_object_t *object_p, uint32_t index); ecma_value_t ecma_op_object_get_by_magic_id (ecma_object_t *object_p, lit_magic_string_id_t property_id); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_string_t *ecma_op_get_global_symbol (lit_magic_string_id_t property_id); ecma_value_t ecma_op_object_get_by_symbol_id (ecma_object_t *object_p, lit_magic_string_id_t property_id); ecma_value_t ecma_op_get_method_by_symbol_id (ecma_value_t value, lit_magic_string_id_t symbol_id); ecma_value_t ecma_op_get_method_by_magic_id (ecma_value_t value, lit_magic_string_id_t magic_id); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ecma_op_object_put_with_receiver (ecma_object_t *object_p, ecma_string_t *property_name_p, ecma_value_t value, ecma_value_t receiver, bool is_throw); ecma_value_t ecma_op_object_put (ecma_object_t *object_p, ecma_string_t *property_name_p, ecma_value_t value, @@ -73,13 +73,13 @@ ecma_collection_t * ecma_op_object_get_property_names (ecma_object_t *obj_p, uin lit_magic_string_id_t ecma_object_get_class_name (ecma_object_t *obj_p); bool ecma_object_class_is (ecma_object_t *object_p, uint32_t class_id); bool ecma_object_is_regexp_object (ecma_value_t arg); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t ecma_op_is_concat_spreadable (ecma_value_t arg); ecma_value_t ecma_op_is_regexp (ecma_value_t arg); ecma_value_t ecma_op_species_constructor (ecma_object_t *this_value, ecma_builtin_id_t default_constructor_id); ecma_value_t ecma_op_invoke_by_symbol_id (ecma_value_t object, lit_magic_string_id_t magic_string_id, ecma_value_t *args_p, ecma_length_t args_len); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t ecma_op_invoke (ecma_value_t object, ecma_string_t *property_name_p, ecma_value_t *args_p, ecma_length_t args_len); ecma_value_t ecma_op_invoke_by_magic_id (ecma_value_t object, lit_magic_string_id_t magic_string_id, diff --git a/jerry-core/ecma/operations/ecma-promise-object.c b/jerry-core/ecma/operations/ecma-promise-object.c index dbcd0242a..282cfd1b9 100644 --- a/jerry-core/ecma/operations/ecma-promise-object.c +++ b/jerry-core/ecma/operations/ecma-promise-object.c @@ -26,7 +26,7 @@ #include "ecma-promise-object.h" #include "jcontext.h" -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) /** \addtogroup ecma ECMA * @{ @@ -967,4 +967,4 @@ ecma_promise_then (ecma_value_t promise, /**< the promise which call 'then' */ * @} * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ diff --git a/jerry-core/ecma/operations/ecma-promise-object.h b/jerry-core/ecma/operations/ecma-promise-object.h index 18bfa103b..0e59660cc 100644 --- a/jerry-core/ecma/operations/ecma-promise-object.h +++ b/jerry-core/ecma/operations/ecma-promise-object.h @@ -16,7 +16,7 @@ #ifndef ECMA_PROMISE_OBJECT_H #define ECMA_PROMISE_OBJECT_H -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) #include "ecma-globals.h" /** \addtogroup ecma ECMA @@ -98,5 +98,5 @@ void ecma_promise_free_resolving_functions (ecma_promise_resolving_functions_t * * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ #endif /* !ECMA_PROMISE_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-proxy-object.c b/jerry-core/ecma/operations/ecma-proxy-object.c index 9e1fe8e75..31a6b3e31 100644 --- a/jerry-core/ecma/operations/ecma-proxy-object.c +++ b/jerry-core/ecma/operations/ecma-proxy-object.c @@ -34,7 +34,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) /** * Check whether the argument satifies the requrements of [[ProxyTarget]] or [[ProxyHandler]] * @@ -1810,7 +1810,7 @@ ecma_proxy_object_construct (ecma_object_t *obj_p, /**< proxy object */ return new_obj; } /* ecma_proxy_object_construct */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-proxy-object.h b/jerry-core/ecma/operations/ecma-proxy-object.h index db8ae06c8..cfd59ee0f 100644 --- a/jerry-core/ecma/operations/ecma-proxy-object.h +++ b/jerry-core/ecma/operations/ecma-proxy-object.h @@ -25,7 +25,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) ecma_object_t * ecma_proxy_create (ecma_value_t target, @@ -110,7 +110,7 @@ ecma_proxy_object_construct (ecma_object_t *obj_p, const ecma_value_t *args_p, ecma_length_t argc); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-reference.c b/jerry-core/ecma/operations/ecma-reference.c index 518d21676..2b87837bd 100644 --- a/jerry-core/ecma/operations/ecma-reference.c +++ b/jerry-core/ecma/operations/ecma-reference.c @@ -47,22 +47,22 @@ ecma_op_resolve_reference_base (ecma_object_t *lex_env_p, /**< starting lexical while (true) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND) { JERRY_ASSERT (lex_env_p->u2.outer_reference_cp != JMEM_CP_NULL); lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t has_binding = ecma_op_has_binding (lex_env_p, name_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (has_binding)) { return ECMA_OBJECT_POINTER_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_true (has_binding)) { @@ -78,7 +78,7 @@ ecma_op_resolve_reference_base (ecma_object_t *lex_env_p, /**< starting lexical } } /* ecma_op_resolve_reference_base */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Perform GetThisEnvironment and GetSuperBase operations * @@ -99,12 +99,12 @@ ecma_op_resolve_super_base (ecma_object_t *lex_env_p) /**< starting lexical envi { ecma_object_t *home_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u1.home_object_cp); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (home_p)) { return ecma_proxy_object_get_prototype_of (home_p); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (home_p); @@ -173,7 +173,7 @@ ecma_op_is_prop_unscopable (ecma_object_t *binding_obj_p, /**< binding object */ return ECMA_VALUE_FALSE; } /* ecma_op_is_prop_unscopable */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Helper method for HasBindig operation @@ -205,7 +205,7 @@ ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p); ecma_value_t found_binding; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (binding_obj_p)) { found_binding = ecma_proxy_object_has (binding_obj_p, name_p); @@ -217,7 +217,7 @@ ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env } else { -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ found_binding = ecma_op_object_find (binding_obj_p, name_p); if (ECMA_IS_VALUE_ERROR (found_binding) || !ecma_is_value_found (found_binding)) @@ -225,39 +225,39 @@ ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env return found_binding; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_LIKELY (lex_env_p == ecma_get_global_scope ())) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { return found_binding; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t blocked = ecma_op_is_prop_unscopable (binding_obj_p, name_p); if (ecma_is_value_false (blocked)) { -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_OBJECT_IS_PROXY (binding_obj_p)) { return ecma_proxy_object_get (binding_obj_p, name_p, ecma_make_object_value (binding_obj_p)); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return found_binding; } -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (!ECMA_OBJECT_IS_PROXY (binding_obj_p)) { ecma_free_value (found_binding); } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ return ECMA_IS_VALUE_ERROR (blocked) ? blocked : ECMA_VALUE_NOT_FOUND; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_op_object_bound_environment_resolve_reference_value */ /** @@ -283,24 +283,24 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical { ecma_property_value_t *property_value_p = ECMA_PROPERTY_VALUE_PTR (property_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (property_value_p->value == ECMA_VALUE_UNINITIALIZED)) { return ecma_raise_reference_error (ECMA_ERR_MSG ("Variables declared by let/const must be" " initialized before reading their value.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_fast_copy_value (property_value_p->value); } } else if (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool lcache_lookup_allowed = (lex_env_p == ecma_get_global_environment ()); -#else /* !ENABLED (JERRY_ES2015)*/ +#else /* !ENABLED (JERRY_ESNEXT)*/ bool lcache_lookup_allowed = true; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (lcache_lookup_allowed) { @@ -344,11 +344,11 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical } else { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNREACHABLE (); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } if (lex_env_p->u2.outer_reference_cp == JMEM_CP_NULL) diff --git a/jerry-core/ecma/operations/ecma-reference.h b/jerry-core/ecma/operations/ecma-reference.h index 958379766..a7ea38489 100644 --- a/jerry-core/ecma/operations/ecma-reference.h +++ b/jerry-core/ecma/operations/ecma-reference.h @@ -29,9 +29,9 @@ ecma_object_t *ecma_op_resolve_reference_base (ecma_object_t *lex_env_p, ecma_string_t *name_p); ecma_value_t ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, ecma_string_t *name_p); ecma_value_t ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env_p, ecma_string_t *name_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t ecma_op_resolve_super_base (ecma_object_t *lex_env_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-regexp-object.c b/jerry-core/ecma/operations/ecma-regexp-object.c index 82f22a463..e6e84c47a 100644 --- a/jerry-core/ecma/operations/ecma-regexp-object.c +++ b/jerry-core/ecma/operations/ecma-regexp-object.c @@ -120,7 +120,7 @@ ecma_regexp_parse_flags (ecma_string_t *flags_str_p, /**< Input string with flag return ret_value; } /* ecma_regexp_parse_flags */ -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) /* * Create the properties of a RegExp instance. */ @@ -193,7 +193,7 @@ ecma_regexp_update_props (ecma_object_t *re_object_p, /**< RegExp object */ prop_value_p = ECMA_PROPERTY_VALUE_PTR (prop_p); prop_value_p->value = ecma_make_boolean_value (flags & RE_FLAG_MULTILINE); } /* ecma_regexp_update_props */ -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ /** * RegExpAlloc method @@ -209,7 +209,7 @@ ecma_regexp_update_props (ecma_object_t *re_object_p, /**< RegExp object */ ecma_object_t * ecma_op_regexp_alloc (ecma_object_t *ctr_obj_p) /**< constructor object pointer */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ctr_obj_p == NULL) { ctr_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP); @@ -223,18 +223,18 @@ ecma_op_regexp_alloc (ecma_object_t *ctr_obj_p) /**< constructor object pointer return proto_obj_p; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (ctr_obj_p); ecma_object_t *proto_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *new_object_p = ecma_create_object (proto_obj_p, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_deref_object (proto_obj_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_extended_object_t *regexp_obj_p = (ecma_extended_object_t *) new_object_p; @@ -262,7 +262,7 @@ ecma_op_regexp_initialize (ecma_object_t *regexp_obj_p, /**< RegExp object */ { ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) regexp_obj_p; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) if (ext_obj_p->u.class_prop.class_id == LIT_MAGIC_STRING_UNDEFINED) { /* This instance has not been initialized before. */ @@ -272,12 +272,12 @@ ecma_op_regexp_initialize (ecma_object_t *regexp_obj_p, /**< RegExp object */ { ecma_regexp_update_props (regexp_obj_p, pattern_str_p, flags); } -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_UNUSED (pattern_str_p); JERRY_UNUSED (flags); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ext_obj_p->u.class_prop.class_id = LIT_MAGIC_STRING_REGEXP_UL; ECMA_SET_INTERNAL_VALUE_POINTER (ext_obj_p->u.class_prop.u.value, bc_p); @@ -413,13 +413,13 @@ ecma_regexp_canonicalize_char (lit_code_point_t ch, /**< character */ return ch; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* TODO: Implement case folding for code points in the upper planes. */ if (JERRY_UNLIKELY (ch > LIT_UTF16_CODE_UNIT_MAX)) { return ch; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_char_t u[LIT_MAXIMUM_OTHER_CASE_LENGTH]; const ecma_length_t size = lit_char_to_upper_case ((ecma_char_t) ch, u, LIT_MAXIMUM_OTHER_CASE_LENGTH); @@ -514,7 +514,7 @@ ecma_regexp_advance (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ JERRY_ASSERT (str_p != NULL); lit_code_point_t cp = lit_cesu8_read_next (str_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (re_ctx_p->flags & RE_FLAG_UNICODE) && lit_is_code_point_utf16_high_surrogate ((ecma_char_t) cp) && *str_p < re_ctx_p->input_end_p) @@ -526,12 +526,12 @@ ecma_regexp_advance (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ *str_p += LIT_UTF8_MAX_BYTES_IN_CODE_UNIT; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_regexp_canonicalize (cp, re_ctx_p->flags); } /* ecma_regexp_advance */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Helper function to get current full unicode code point and advance the string pointer. * @@ -559,7 +559,7 @@ ecma_regexp_unicode_advance (const lit_utf8_byte_t **str_p, /**< reference to st *str_p = current_p; return ch; } /* ecma_regexp_unicode_advance */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Helper function to revert the string pointer to the previous code point. @@ -571,7 +571,7 @@ ecma_regexp_step_back (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ const lit_utf8_byte_t *str_p) /**< reference to string pointer */ { JERRY_ASSERT (str_p != NULL); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) lit_code_point_t ch = lit_cesu8_read_prev (&str_p); if (JERRY_UNLIKELY (re_ctx_p->flags & RE_FLAG_UNICODE) && lit_is_code_point_utf16_low_surrogate (ch) @@ -579,10 +579,10 @@ ecma_regexp_step_back (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ { str_p -= LIT_UTF8_MAX_BYTES_IN_CODE_UNIT; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (re_ctx_p); lit_utf8_decr (&str_p); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ return str_p; } /* ecma_regexp_step_back */ @@ -1450,7 +1450,7 @@ class_found: bc_p = bc_p + escape_count + chars_size + ranges_size; continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case RE_OP_UNICODE_PERIOD: { if (str_curr_p >= re_ctx_p->input_end_p) @@ -1467,7 +1467,7 @@ class_found: continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case RE_OP_PERIOD: { if (str_curr_p >= re_ctx_p->input_end_p) @@ -1709,11 +1709,11 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ /* TODO: Replace with ToLength */ if (lastindex_num < 0.0f) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) lastindex_num = 0.0f; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ lastindex_num = input_length + 1; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } index = ecma_number_to_uint32 (lastindex_num); @@ -1771,7 +1771,7 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx.flags & RE_FLAG_STICKY) { ecma_value_t put_result = ecma_op_object_put (regexp_object_p, @@ -1788,7 +1788,7 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ ret_value = ECMA_VALUE_NULL; goto cleanup_context; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (input_curr_p >= input_end_p) { @@ -1814,7 +1814,7 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ JERRY_ASSERT (input_curr_p < input_end_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx.flags & RE_FLAG_UNICODE) { index++; @@ -1828,7 +1828,7 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ index++; lit_utf8_incr (&input_curr_p); @@ -2007,7 +2007,7 @@ ecma_regexp_split_helper (ecma_value_t this_arg, /**< this value */ ecma_value_t string_arg, /**< string value */ ecma_value_t limit_arg) /**< limit value */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* 2. */ if (!ecma_is_value_object (this_arg)) { @@ -2311,7 +2311,7 @@ cleanup_string: ecma_deref_ecma_string (string_p); return result; -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ ecma_value_t result = ECMA_VALUE_ERROR; /* 2. */ @@ -2480,7 +2480,7 @@ cleanup_string: ecma_deref_ecma_string (string_p); return result; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* ecma_regexp_split_helper */ /** @@ -2523,7 +2523,7 @@ ecma_regexp_replace_helper_fast (ecma_replace_context_t *ctx_p, /**index <= string_length); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Global matches always start at index 0, but Sticky matches may have a non-zero lastIndex. */ if (ctx_p->index > 0) { @@ -2540,7 +2540,7 @@ ecma_regexp_replace_helper_fast (ecma_replace_context_t *ctx_p, /**index++; @@ -2653,7 +2653,7 @@ ecma_regexp_replace_helper_fast (ecma_replace_context_t *ctx_p, /**index++; lit_utf8_incr (¤t_p); @@ -2736,15 +2736,15 @@ ecma_regexp_replace_helper (ecma_value_t this_arg, /**< this argument */ const bool global = ecma_op_to_boolean (result); ecma_free_value (result); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const lit_utf8_size_t string_length = ecma_string_get_length (string_p); bool unicode = false; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* 10. */ if (global) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) result = ecma_op_object_get_by_magic_id (this_obj_p, LIT_MAGIC_STRING_UNICODE); if (ECMA_IS_VALUE_ERROR (result)) { @@ -2753,7 +2753,7 @@ ecma_regexp_replace_helper (ecma_value_t this_arg, /**< this argument */ unicode = ecma_op_to_boolean (result); ecma_free_value (result); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ result = ecma_op_object_put (this_obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL), @@ -2767,7 +2767,7 @@ ecma_regexp_replace_helper (ecma_value_t this_arg, /**< this argument */ JERRY_ASSERT (ecma_is_value_boolean (result)); } -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) ecma_extended_object_t *re_obj_p = (ecma_extended_object_t *) this_obj_p; const re_compiled_code_t *bc_p = ECMA_GET_INTERNAL_VALUE_POINTER (re_compiled_code_t, re_obj_p->u.class_prop.u.value); @@ -2778,7 +2778,7 @@ ecma_regexp_replace_helper (ecma_value_t this_arg, /**< this argument */ replace_arg); goto cleanup_replace; -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ result = ecma_op_object_get_by_magic_id (this_obj_p, LIT_MAGIC_STRING_EXEC); if (ECMA_IS_VALUE_ERROR (result)) @@ -3190,7 +3190,7 @@ cleanup_chars: cleanup_results: ecma_collection_free (results_p); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ cleanup_replace: if (replace_ctx.replace_str_p != NULL) @@ -3250,7 +3250,7 @@ ecma_regexp_match_helper (ecma_value_t this_arg, /**< this argument */ return result; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t full_unicode_value = ecma_op_object_get_by_magic_id (obj_p, LIT_MAGIC_STRING_UNICODE); if (ECMA_IS_VALUE_ERROR (full_unicode_value)) @@ -3262,7 +3262,7 @@ ecma_regexp_match_helper (ecma_value_t this_arg, /**< this argument */ bool full_unicode = ecma_op_to_boolean (full_unicode_value); ecma_free_value (full_unicode_value); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t set_status = ecma_op_object_put (obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL), @@ -3336,7 +3336,7 @@ ecma_regexp_match_helper (ecma_value_t this_arg, /**< this argument */ goto match_cleanup; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint32_t index; ecma_value_t length_value = ecma_op_to_length (this_index, &index); @@ -3353,7 +3353,7 @@ ecma_regexp_match_helper (ecma_value_t this_arg, /**< this argument */ ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL), ecma_make_uint32_value (next_index), true); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_number_t next_index = ecma_get_number_from_value (this_index); ecma_value_t next_set_status = ecma_op_object_put (obj_p, @@ -3362,7 +3362,7 @@ ecma_regexp_match_helper (ecma_value_t this_arg, /**< this argument */ true); ecma_free_value (this_index); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (ECMA_IS_VALUE_ERROR (next_set_status)) { @@ -3405,7 +3405,7 @@ ecma_op_regexp_exec (ecma_value_t this_arg, /**< this argument */ { ecma_object_t *arg_obj_p = ecma_get_object_from_value (this_arg); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t exec = ecma_op_object_get_by_magic_id (arg_obj_p, LIT_MAGIC_STRING_EXEC); if (ECMA_IS_VALUE_ERROR (exec)) @@ -3439,7 +3439,7 @@ ecma_op_regexp_exec (ecma_value_t this_arg, /**< this argument */ { ecma_free_value (exec); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (!ecma_object_is_regexp_object (this_arg)) { diff --git a/jerry-core/ecma/operations/ecma-regexp-object.h b/jerry-core/ecma/operations/ecma-regexp-object.h index fdc9971cc..4cdd20ebf 100644 --- a/jerry-core/ecma/operations/ecma-regexp-object.h +++ b/jerry-core/ecma/operations/ecma-regexp-object.h @@ -148,9 +148,9 @@ typedef struct uint8_t char_size; /**< size of encoded characters */ } ecma_regexp_ctx_t; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) lit_code_point_t ecma_regexp_unicode_advance (const lit_utf8_byte_t **str_p, const lit_utf8_byte_t *end_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *ecma_op_regexp_alloc (ecma_object_t *new_target_obj_p); ecma_value_t ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, diff --git a/jerry-core/ecma/operations/ecma-symbol-object.c b/jerry-core/ecma/operations/ecma-symbol-object.c index 1dc09d811..04926c8fd 100644 --- a/jerry-core/ecma/operations/ecma-symbol-object.c +++ b/jerry-core/ecma/operations/ecma-symbol-object.c @@ -24,7 +24,7 @@ #include "ecma-symbol-object.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** \addtogroup ecma ECMA * @{ @@ -173,7 +173,7 @@ ecma_symbol_to_string_helper (ecma_value_t this_arg, /**< this argument value */ return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is must be a Symbol.")); } /* ecma_symbol_to_string_helper */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-symbol-object.h b/jerry-core/ecma/operations/ecma-symbol-object.h index a86d87748..7a9bc643a 100644 --- a/jerry-core/ecma/operations/ecma-symbol-object.h +++ b/jerry-core/ecma/operations/ecma-symbol-object.h @@ -16,7 +16,7 @@ #ifndef ECMA_SYMBOL_H #define ECMA_SYMBOL_H -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #include "ecma-globals.h" /** \addtogroup ecma ECMA @@ -44,7 +44,7 @@ ecma_symbol_to_string_helper (ecma_value_t this_arg, bool is_to_string); ecma_value_t ecma_get_symbol_descriptive_string (ecma_value_t symbol_value); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} * @} diff --git a/jerry-core/ecma/operations/ecma-typedarray-object.c b/jerry-core/ecma/operations/ecma-typedarray-object.c index c01cfbf10..972f5be45 100644 --- a/jerry-core/ecma/operations/ecma-typedarray-object.c +++ b/jerry-core/ecma/operations/ecma-typedarray-object.c @@ -29,7 +29,7 @@ #include "ecma-helpers.h" #include "jcontext.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /** \addtogroup ecma ECMA * @{ @@ -1378,4 +1378,4 @@ ecma_typedarray_get_info (ecma_object_t *typedarray_p) * @} * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ diff --git a/jerry-core/ecma/operations/ecma-typedarray-object.h b/jerry-core/ecma/operations/ecma-typedarray-object.h index 52821fa78..dfdcaf257 100644 --- a/jerry-core/ecma/operations/ecma-typedarray-object.h +++ b/jerry-core/ecma/operations/ecma-typedarray-object.h @@ -19,7 +19,7 @@ #include "ecma-globals.h" #include "ecma-builtins.h" -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) /** \addtogroup ecma ECMA * @{ @@ -79,5 +79,5 @@ ecma_value_t ecma_typedarray_create_object_with_length (ecma_length_t array_leng * @} */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */ +#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ #endif /* !ECMA_TYPEDARRAY_OBJECT_H */ diff --git a/jerry-core/include/jerryscript-port.h b/jerry-core/include/jerryscript-port.h index 37609fd4d..8ac4414aa 100644 --- a/jerry-core/include/jerryscript-port.h +++ b/jerry-core/include/jerryscript-port.h @@ -197,7 +197,7 @@ void jerry_port_print_char (char c); * Open a source file and read its contents into a buffer. * * Note: - * This port function is called by jerry-core when JERRY_ES2015_MODULE_SYSTEM + * This port function is called by jerry-core when JERRY_MODULE_SYSTEM * is enabled. The path is specified in the import statement's 'from "..."' * section. * @@ -221,7 +221,7 @@ void jerry_port_release_source (uint8_t *buffer_p); * Normalize a file path string. * * Note: - * This port function is called by jerry-core when ES2015_MODULE_SYSTEM + * This port function is called by jerry-core when JERRY_MODULE_SYSTEM * is enabled. The normalized path is used to uniquely identify modules. * * @param in_path_p Input path as a zero terminated string. @@ -242,7 +242,7 @@ size_t jerry_port_normalize_path (const char *in_path_p, * Get the module object of a native module. * * Note: - * This port function is called by jerry-core when ES2015_MODULE_SYSTEM + * This port function is called by jerry-core when JERRY_MODULE_SYSTEM * is enabled. * * @param name String value of the module specifier. diff --git a/jerry-core/jcontext/jcontext.h b/jerry-core/jcontext/jcontext.h index e609fcac5..5c72db9e4 100644 --- a/jerry-core/jcontext/jcontext.h +++ b/jerry-core/jcontext/jcontext.h @@ -138,19 +138,19 @@ struct jerry_context_t const lit_utf8_byte_t * const *lit_magic_string_ex_array; /**< array of external magic strings */ const lit_utf8_size_t *lit_magic_string_ex_sizes; /**< external magic string lengths */ jmem_cpointer_t string_list_first_cp; /**< first item of the literal string list */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) jmem_cpointer_t symbol_list_first_cp; /**< first item of the global symbol list */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ jmem_cpointer_t number_list_first_cp; /**< first item of the literal number list */ jmem_cpointer_t ecma_global_env_cp; /**< global lexical environment */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) jmem_cpointer_t ecma_global_scope_cp; /**< global lexical scope */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) ecma_module_t *ecma_modules_p; /**< list of referenced modules */ ecma_module_context_t *module_top_context_p; /**< top (current) module parser context */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ vm_frame_ctx_t *vm_top_context_p; /**< top (current) interpreter context */ jerry_context_data_header_t *context_data_p; /**< linked list of user-provided context-specific pointers */ @@ -176,10 +176,10 @@ struct jerry_context_t uint8_t re_cache_idx; /**< evicted item index when regex cache is full (round-robin) */ #endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) ecma_job_queue_item_t *job_queue_head_p; /**< points to the head item of the job queue */ ecma_job_queue_item_t *job_queue_tail_p; /**< points to the tail item of the job queue */ -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROMISE) */ +#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ #if ENABLED (JERRY_VM_EXEC_STOP) uint32_t vm_exec_stop_frequency; /**< reset value for vm_exec_stop_counter */ @@ -224,7 +224,7 @@ struct jerry_context_t ecma_lcache_hash_entry_t lcache[ECMA_LCACHE_HASH_ROWS_COUNT][ECMA_LCACHE_HASH_ROW_LENGTH]; #endif /* ENABLED (JERRY_LCACHE) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Allowed values and it's meaning: * * NULL (0x0): the current "new.target" is undefined, that is the execution is inside a normal method. @@ -233,7 +233,7 @@ struct jerry_context_t ecma_object_t *current_new_target; ecma_object_t *current_function_obj_p; /** currently invoked function object (Note: currently used only in generator functions) */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ }; #if ENABLED (JERRY_EXTERNAL_CONTEXT) diff --git a/jerry-core/lit/lit-char-helpers.c b/jerry-core/lit/lit-char-helpers.c index 90606d323..fd733eed1 100644 --- a/jerry-core/lit/lit-char-helpers.c +++ b/jerry-core/lit/lit-char-helpers.c @@ -218,15 +218,15 @@ lit_code_point_is_identifier_start (lit_code_point_t code_point) /**< code point || code_point == LIT_CHAR_UNDERSCORE); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (code_point >= LIT_UTF8_4_BYTE_CODE_POINT_MIN) { /* TODO: detect these ranges correctly. */ return (code_point >= 0x10C80 && code_point <= 0x10CF2); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (code_point <= LIT_UTF8_4_BYTE_CODE_POINT_MIN); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return lit_char_is_unicode_letter ((ecma_char_t) code_point); } /* lit_code_point_is_identifier_start */ @@ -249,15 +249,15 @@ lit_code_point_is_identifier_part (lit_code_point_t code_point) /**< code point || code_point == LIT_CHAR_UNDERSCORE); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (code_point >= LIT_UTF8_4_BYTE_CODE_POINT_MIN) { /* TODO: detect these ranges correctly. */ return (code_point >= 0x10C80 && code_point <= 0x10CF2); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (code_point <= LIT_UTF8_4_BYTE_CODE_POINT_MIN); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return (lit_char_is_unicode_letter ((ecma_char_t) code_point) || lit_char_is_unicode_non_letter_ident_part ((ecma_char_t) code_point)); @@ -298,7 +298,7 @@ lit_char_is_hex_digit (ecma_char_t c) /**< code unit */ && LEXER_TO_ASCII_LOWERCASE (c) <= LIT_CHAR_ASCII_LOWERCASE_LETTERS_HEX_END)); } /* lit_char_is_hex_digit */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Check if specified character is one of BinaryDigits characters (ECMA-262 v6, 11.8.3) * @@ -309,7 +309,7 @@ lit_char_is_binary_digit (ecma_char_t c) /** code unit */ { return (c == LIT_CHAR_0 || c == LIT_CHAR_1); } /* lit_char_is_binary_digit */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Convert a HexDigit character to its numeric value, as defined in ECMA-262 v5, 7.8.3 diff --git a/jerry-core/lit/lit-char-helpers.h b/jerry-core/lit/lit-char-helpers.h index 3ad25b7fc..315b8f8da 100644 --- a/jerry-core/lit/lit-char-helpers.h +++ b/jerry-core/lit/lit-char-helpers.h @@ -210,9 +210,9 @@ bool lit_code_point_is_identifier_part (lit_code_point_t code_point); bool lit_char_is_octal_digit (ecma_char_t c); bool lit_char_is_decimal_digit (ecma_char_t c); bool lit_char_is_hex_digit (ecma_char_t c); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool lit_char_is_binary_digit (ecma_char_t c); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint32_t lit_char_hex_to_int (ecma_char_t c); size_t lit_code_point_to_cesu8_bytes (uint8_t *dst_p, lit_code_point_t code_point); size_t lit_code_point_get_cesu8_length (lit_code_point_t code_point); diff --git a/jerry-core/lit/lit-magic-strings.inc.h b/jerry-core/lit/lit-magic-strings.inc.h index c33c6cf18..17aa6655e 100644 --- a/jerry-core/lit/lit-magic-strings.inc.h +++ b/jerry-core/lit/lit-magic-strings.inc.h @@ -18,11 +18,11 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING__EMPTY, "") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPACE_CHAR, " ") -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASTERIX_CHAR, "*") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COMMA_CHAR, ",") #endif #if ENABLED (JERRY_BUILTIN_MATH) @@ -33,23 +33,23 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RIGHT_SQUARE_CHAR, "]") #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PI_U, "PI") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS, "is") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OF, "of") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LN2_U, "LN2") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_CONTAINER) \ +|| ENABLED (JERRY_BUILTIN_MAP) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_UL, "Map") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAN, "NaN") -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_CONTAINER) \ +|| ENABLED (JERRY_BUILTIN_SET) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UL, "Set") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -58,35 +58,35 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UTC_U, "UTC") #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ABS, "abs") #endif -#if ENABLED (JERRY_ES2015) && ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_CONTAINER) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_BUILTIN_WEAKSET) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ADD, "add") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ALL, "all") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COS, "cos") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXP, "exp") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR, "for") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET, "get") -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_PROXY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_REFLECT) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_BUILTIN_PROXY) \ +|| ENABLED (JERRY_BUILTIN_REFLECT) \ +|| ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_BUILTIN_WEAKMAP) \ +|| ENABLED (JERRY_BUILTIN_WEAKSET) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS, "has") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG, "log") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP, "map") #endif #if ENABLED (JERRY_BUILTIN_MATH) @@ -102,7 +102,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_POP, "pop") #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_POW, "pow") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RAW, "raw") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET, "set") @@ -129,79 +129,79 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATAN, "atan") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BIND, "bind") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CALL, "call") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CBRT, "cbrt") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CEIL, "ceil") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COSH, "cosh") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DONE, "done") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVAL, "eval") #if ENABLED (JERRY_BUILTIN_REGEXP) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXEC, "exec") #endif -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FILL, "fill") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FIND, "find") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROM, "from") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IMUL, "imul") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_JOIN, "join") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_KEYS, "keys") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG2, "log2") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAME, "name") -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_MAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NEXT, "next") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NULL, "null") #if ENABLED (JERRY_BUILTIN_ARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PUSH, "push") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RACE, "race") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SEAL, "seal") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIGN, "sign") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SINH, "sinh") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_BUILTIN_SET) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIZE, "size") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SOME, "some") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SORT, "sort") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT, "sqrt") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TANH, "tanh") #endif #if ENABLED (JERRY_BUILTIN_REGEXP) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TEST, "test") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_THEN, "then") #endif #if ENABLED (JERRY_BUILTIN_STRING) @@ -213,50 +213,50 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ERROR_UL, "Error") #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG2E_U, "LOG2E") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROXY_UL, "Proxy") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT2_U, "SQRT2") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ACOSH, "acosh") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_APPLY, "apply") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASINH, "asinh") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATAN2, "atan2") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATANH, "atanh") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CATCH, "catch") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_BUILTIN_SET) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CLEAR, "clear") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CLZ32, "clz32") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVERY, "every") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXPM1, "expm1") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FALSE, "false") -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLAGS, "flags") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOOR, "floor") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HYPOT, "hypot") #endif #if ENABLED (JERRY_BUILTIN_REGEXP) @@ -264,19 +264,19 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INDEX, "index") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INPUT, "input") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_NAN, "isNaN") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG10, "log10") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG1P, "log1p") #endif #if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ES2015) +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MATCH, "match") #endif #if ENABLED (JERRY_BUILTIN_DATE) \ || ENABLED (JERRY_BUILTIN_JSON) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE, "parse") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROXY, "proxy") #endif #if ENABLED (JERRY_BUILTIN_MATH) @@ -287,17 +287,17 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SHIFT, "shift") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ || ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SLICE, "slice") #endif #if ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ES2015) +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPLIT, "split") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_THROW, "throw") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRUNC, "trunc") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUE, "value") @@ -311,12 +311,12 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NUMBER_UL, "Number") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OBJECT_UL, "Object") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REGEXP_UL, "RegExp") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRING_UL, "String") -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL_UL, "Symbol") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASSIGN, "assign") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BUFFER, "buffer") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CALLEE, "callee") @@ -329,21 +329,21 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_AT_UL, "charAt") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONCAT, "concat") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CREATE, "create") -#if ENABLED (JERRY_ES2015_BUILTIN_MAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_BUILTIN_WEAKMAP) \ +|| ENABLED (JERRY_BUILTIN_WEAKSET) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE, "delete") #endif #if ENABLED (JERRY_BUILTIN_ANNEXB) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ESCAPE, "escape") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FILTER, "filter") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FREEZE, "freeze") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROUND, "fround") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -352,10 +352,10 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_DAY_UL, "getDay") #if ENABLED (JERRY_BUILTIN_REGEXP) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GLOBAL, "global") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_VIEW_UL, "isView") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_KEY_FOR, "keyFor") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LENGTH, "length") @@ -365,94 +365,94 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OBJECT, "object") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RANDOM, "random") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REDUCE, "reduce") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REJECT, "reject") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REPEAT, "repeat") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RETURN, "return") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REVOKE, "revoke") #endif #if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ES2015) +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SEARCH, "search") #endif -#if !ENABLED (JERRY_ES2015) && ENABLED (JERRY_BUILTIN_REGEXP) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && !( ENABLED (JERRY_ES2015)) +#if !ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_REGEXP) \ +|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_REGEXP) && !( ENABLED (JERRY_ESNEXT)) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SOURCE, "source") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPLICE, "splice") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && !( !ENABLED (JERRY_ES2015)) +#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_REGEXP) && !( !ENABLED (JERRY_ESNEXT)) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STICKY, "sticky") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRING, "string") #if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_STRING) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SUBSTR, "substr") #endif -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL, "symbol") #endif #if ENABLED (JERRY_BUILTIN_DATE) \ || ENABLED (JERRY_BUILTIN_JSON) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_JSON_UL, "toJSON") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUES, "values") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BOOLEAN_UL, "Boolean") -#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EPSILON_U, "EPSILON") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROMISE_UL, "Promise") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_REFLECT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REFLECT_UL, "Reflect") #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT1_2_U, "SQRT1_2") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKMAP) +#if ENABLED (JERRY_BUILTIN_CONTAINER) \ +|| ENABLED (JERRY_BUILTIN_WEAKMAP) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKMAP_UL, "WeakMap") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_ES2015_BUILTIN_WEAKSET) +#if ENABLED (JERRY_BUILTIN_CONTAINER) \ +|| ENABLED (JERRY_BUILTIN_WEAKSET) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKSET_UL, "WeakSet") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BOOLEAN, "boolean") #if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_REGEXP) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COMPILE, "compile") #endif -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_MODULE_SYSTEM) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFAULT, "default") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENTRIES, "entries") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_MAP) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR_EACH_UL, "forEach") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_DATE_UL, "getDate") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_INT8_UL, "getInt8") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -463,32 +463,32 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_YEAR_UL, "getYear") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ || ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INDEX_OF_UL, "indexOf") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_ARRAY_UL, "isArray") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MESSAGE, "message") -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_PROXY) \ +|| ENABLED (JERRY_BUILTIN_REFLECT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OWN_KEYS_UL, "ownKeys") #endif #if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ES2015) +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REPLACE, "replace") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_PROMISE) +#if ENABLED (JERRY_BUILTIN_PROMISE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOLVE, "resolve") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REVERSE, "reverse") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_DATE_UL, "setDate") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_INT8_UL, "setInt8") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -497,20 +497,20 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_TIME_UL, "setTime") #if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_YEAR_UL, "setYear") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPECIES, "species") #endif #if ENABLED (JERRY_BUILTIN_NUMBER) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_FIXED_UL, "toFixed") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNICODE, "unicode") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNSHIFT, "unshift") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUE_OF_UL, "valueOf") -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DATAVIEW_UL, "DataView") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FUNCTION_UL, "Function") @@ -518,50 +518,50 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INFINITY_UL, "Infinity") #if ENABLED (JERRY_BUILTIN_ERRORS) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_URI_ERROR_UL, "URIError") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENDS_WITH, "endsWith") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FUNCTION, "function") #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_HOURS_UL, "getHours") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_INT16_UL, "getInt16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_INT32_UL, "getInt32") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_MONTH_UL, "getMonth") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UINT8_UL, "getUint8") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INCLUDES, "includes") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_FINITE, "isFinite") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_FROZEN_UL, "isFrozen") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_SEALED_UL, "isSealed") -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ITERATOR, "iterator") #endif -#if ENABLED (JERRY_ES2015) \ -|| !( ENABLED (JERRY_ES2015)) +#if ENABLED (JERRY_ESNEXT) \ +|| !( ENABLED (JERRY_ESNEXT)) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE_INT, "parseInt") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_HOURS_UL, "setHours") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_INT16_UL, "setInt16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_INT32_UL, "setInt32") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_MONTH_UL, "setMonth") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UINT8_UL, "setUint8") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SUBARRAY, "subarray") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_STRING_UL, "toString") @@ -574,10 +574,10 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARGUMENTS_UL, "Arguments") #if ENABLED (JERRY_BUILTIN_ERRORS) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVAL_ERROR_UL, "EvalError") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GENERATOR_UL, "Generator") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INT8_ARRAY_UL, "Int8Array") #endif #if ENABLED (JERRY_BUILTIN_NUMBER) @@ -589,43 +589,43 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TYPE_ERROR_UL, "TypeError") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNDEFINED_UL, "Undefined") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING__PROTO__, "__proto__") -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ANONYMOUS, "anonymous") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARGUMENTS, "arguments") -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_PROXY) \ +|| ENABLED (JERRY_BUILTIN_REFLECT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONSTRUCT, "construct") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DECODE_URI, "decodeURI") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENCODE_URI, "encodeURI") -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FIND_INDEX, "findIndex") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_DAY_UL, "getUTCDay") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UINT16_UL, "getUint16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UINT32_UL, "getUint32") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_INTEGER, "isInteger") #endif #if ENABLED (JERRY_BUILTIN_REGEXP) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LASTINDEX_UL, "lastIndex") #endif -#if !ENABLED (JERRY_ES2015) && ENABLED (JERRY_BUILTIN_REGEXP) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && !( ENABLED (JERRY_ES2015)) +#if !ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_REGEXP) \ +|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_REGEXP) && !( ENABLED (JERRY_ESNEXT)) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MULTILINE, "multiline") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROTOTYPE, "prototype") -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REVOCABLE, "revocable") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UINT16_UL, "setUint16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UINT32_UL, "setUint32") #endif @@ -636,34 +636,34 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRINGIFY, "stringify") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SUBSTRING, "substring") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNDEFINED, "undefined") -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INT16_ARRAY_UL, "Int16Array") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INT32_ARRAY_UL, "Int32Array") #endif #if ENABLED (JERRY_BUILTIN_ERRORS) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RANGE_ERROR_UL, "RangeError") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TYPED_ARRAY_UL, "TypedArray") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT8_ARRAY_UL, "Uint8Array") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTE_LENGTH_UL, "byteLength") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTE_OFFSET_UL, "byteOffset") #endif #if ENABLED (JERRY_BUILTIN_STRING) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_CODE_AT_UL, "charCodeAt") #endif -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COPY_WITHIN, "copyWithin") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENUMERABLE, "enumerable") -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_FLOAT_32_UL, "getFloat32") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_FLOAT_64_UL, "getFloat64") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -671,19 +671,19 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_MINUTES_UL, "getMinutes") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_SECONDS_UL, "getSeconds") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_DATE_UL, "getUTCDate") #endif -#if !ENABLED (JERRY_ES2015) && ENABLED (JERRY_BUILTIN_REGEXP) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && !( ENABLED (JERRY_ES2015)) +#if !ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_REGEXP) \ +|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_REGEXP) && !( ENABLED (JERRY_ESNEXT)) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IGNORECASE_UL, "ignoreCase") #endif -#if ENABLED (JERRY_ES2015) \ -|| !( ENABLED (JERRY_ES2015)) +#if ENABLED (JERRY_ESNEXT) \ +|| !( ENABLED (JERRY_ESNEXT)) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE_FLOAT, "parseFloat") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_FLOAT_32_UL, "setFloat32") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_FLOAT_64_UL, "setFloat64") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -691,22 +691,22 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_MINUTES_UL, "setMinutes") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_SECONDS_UL, "setSeconds") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_DATE_UL, "setUTCDate") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STARTS_WITH, "startsWith") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOURCE_ANON, "") -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, "ArrayBuffer") #endif #if ENABLED (JERRY_BUILTIN_ERRORS) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYNTAX_ERROR_UL, "SyntaxError") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT16_ARRAY_UL, "Uint16Array") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT32_ARRAY_UL, "Uint32Array") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CODE_POINT_AT, "codePointAt") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONSTRUCTOR, "constructor") @@ -715,16 +715,16 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_FULL_YEAR_UL, "getFullYear") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_HOURS_UL, "getUTCHours") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_MONTH_UL, "getUTCMonth") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS_INSTANCE, "hasInstance") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ || ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LAST_INDEX_OF_UL, "lastIndexOf") #endif #if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, "reduceRight") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -744,7 +744,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOWER_CASE_UL, "toLowerCase") #if ENABLED (JERRY_BUILTIN_NUMBER) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_PRECISION_UL, "toPrecision") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_PRIMITIVE, "toPrimitive") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_STRING_TAG, "toStringTag") #endif @@ -754,24 +754,24 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_UTC_STRING_UL, "toUTCString") #if ENABLED (JERRY_BUILTIN_STRING) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_UPPER_CASE_UL, "toUpperCase") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNSCOPABLES, "unscopables") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOAT32_ARRAY_UL, "Float32Array") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, "Float64Array") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INVALID_DATE_UL, "Invalid Date") #endif -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_MAP) +#if ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_ITERATOR_UL, "Map Iterator") #endif -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) +#if ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_ITERATOR_UL, "Set Iterator") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONFIGURABLE, "configurable") @@ -783,7 +783,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_EXTENSIBLE, "isExtensible") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_DATE_STRING_UL, "toDateString") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_TIME_STRING_UL, "toTimeString") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROM_CODE_POINT_UL, "fromCodePoint") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -791,7 +791,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_MINUTES_UL, "getUTCMinutes") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_SECONDS_UL, "getUTCSeconds") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_PROTOTYPE_OF_UL, "isPrototypeOf") -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_SAFE_INTEGER, "isSafeInteger") #endif #if ENABLED (JERRY_BUILTIN_STRING) @@ -804,15 +804,15 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_SECONDS_UL, "setUTCSeconds") #if ENABLED (JERRY_BUILTIN_NUMBER) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_EXPONENTIAL_UL, "toExponential") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARRAY_ITERATOR_UL, "Array Iterator") #endif #if ENABLED (JERRY_BUILTIN_ERRORS) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REFERENCE_ERROR_UL, "ReferenceError") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_PROPERTY_UL, "defineProperty") -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_PROXY) \ +|| ENABLED (JERRY_BUILTIN_REFLECT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE_PROPERTY_UL, "deleteProperty") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_PROTOTYPE_OF_UL, "getPrototypeOf") @@ -820,38 +820,38 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_PROTOTYPE_OF_UL, "getPrototypeOf") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_FULL_YEAR_UL, "getUTCFullYear") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS_OWN_PROPERTY_UL, "hasOwnProperty") -#if ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_PROXY) \ -|| ENABLED (JERRY_ES2015_BUILTIN_REFLECT) +#if ENABLED (JERRY_BUILTIN_PROXY) \ +|| ENABLED (JERRY_BUILTIN_REFLECT) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_PROTOTYPE_OF_UL, "setPrototypeOf") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_FULL_YEAR_UL, "setUTCFullYear") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOCALE_STRING_UL, "toLocaleString") -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRING_ITERATOR_UL, "String Iterator") #endif #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_MILLISECONDS_UL, "getMilliseconds") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_MILLISECONDS_UL, "setMilliseconds") #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U, "MAX_SAFE_INTEGER") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U, "MIN_SAFE_INTEGER") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL, "defineProperties") -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, "BYTES_PER_ELEMENT") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, "GeneratorFunction") #endif #if ENABLED (JERRY_BUILTIN_NUMBER) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NEGATIVE_INFINITY_U, "NEGATIVE_INFINITY") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_POSITIVE_INFINITY_U, "POSITIVE_INFINITY") #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL, "Uint8ClampedArray") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -867,7 +867,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENCODE_URI_COMPONENT, "encodeURIComponent #if ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_MILLISECONDS_UL, "getUTCMilliseconds") #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_CONCAT_SPREADABLE, "isConcatSpreadable") #endif #if ENABLED (JERRY_BUILTIN_DATE) @@ -877,7 +877,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOCALE_TIME_STRING_UL, "toLocaleTimeSt #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_NAMES_UL, "getOwnPropertyNames") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROPERTY_IS_ENUMERABLE_UL, "propertyIsEnumerable") -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL, "getOwnPropertySymbols") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL, "getOwnPropertyDescriptor") @@ -887,23 +887,23 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (0, LIT_MAGIC_STRING__EMPTY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_SPACE_CHAR) #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_PI_U) -#elif ENABLED (JERRY_ES2015) +#elif ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_IS) -#elif ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#elif ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ESNEXT) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_OF) #elif ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_LN2_U) -#elif ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_ES2015_BUILTIN_MAP) +#elif ENABLED (JERRY_BUILTIN_CONTAINER) \ +|| ENABLED (JERRY_BUILTIN_MAP) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_MAP_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_NAN) #endif #if ENABLED (JERRY_BUILTIN_MATH) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_LN2_U) -#elif ENABLED (JERRY_ES2015_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_ES2015_BUILTIN_MAP) +#elif ENABLED (JERRY_BUILTIN_CONTAINER) \ +|| ENABLED (JERRY_BUILTIN_MAP) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_MAP_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_NAN) @@ -922,80 +922,80 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (6, LIT_MAGIC_STRING_LOG10E_U) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (6, LIT_MAGIC_STRING_NUMBER_UL) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (7, LIT_MAGIC_STRING_BOOLEAN_UL) -#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) +#if ENABLED (JERRY_BUILTIN_DATAVIEW) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (8, LIT_MAGIC_STRING_DATAVIEW_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (8, LIT_MAGIC_STRING_FUNCTION_UL) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (9, LIT_MAGIC_STRING_NEGATIVE_INFINITY_UL) -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_INT16_ARRAY_UL) #elif ENABLED (JERRY_BUILTIN_ERRORS) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_RANGE_ERROR_UL) -#elif ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_TYPED_ARRAY_UL) -#elif ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#elif ENABLED (JERRY_BUILTIN_DATAVIEW) \ +|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_BYTE_LENGTH_UL) #elif ENABLED (JERRY_BUILTIN_STRING) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_CHAR_CODE_AT_UL) -#elif ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_COPY_WITHIN) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_ENUMERABLE) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_RESOURCE_ANON) -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT32_ARRAY_UL) -#elif ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT64_ARRAY_UL) #elif ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_INVALID_DATE_UL) -#elif ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_MAP) +#elif ENABLED (JERRY_BUILTIN_MAP) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_MAP_ITERATOR_UL) -#elif ENABLED (JERRY_ES2015) \ -|| ENABLED (JERRY_ES2015_BUILTIN_SET) +#elif ENABLED (JERRY_BUILTIN_SET) \ +|| ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_SET_ITERATOR_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_CONFIGURABLE) #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_FROM_CODE_POINT_UL) #elif ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_GET_UTC_MINUTES_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_IS_PROTOTYPE_OF_UL) #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (14, LIT_MAGIC_STRING_ARRAY_ITERATOR_UL) #elif ENABLED (JERRY_BUILTIN_ERRORS) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (14, LIT_MAGIC_STRING_REFERENCE_ERROR_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (14, LIT_MAGIC_STRING_DEFINE_PROPERTY_UL) #endif -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_STRING_ITERATOR_UL) #elif ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_GET_MILLISECONDS_UL) -#elif ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ES2015) +#elif ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL) #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL) #endif -#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U) -#elif ENABLED (JERRY_ES2015) +#elif ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL) #elif ENABLED (JERRY_BUILTIN_NUMBER) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_NEGATIVE_INFINITY_U) -#elif ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) +#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL) #elif ENABLED (JERRY_BUILTIN_DATE) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_GET_TIMEZONE_OFFSET_UL) @@ -1005,7 +1005,7 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_PREVENT_EXTENSIONS LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (18, LIT_MAGIC_STRING_DECODE_URI_COMPONENT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (19, LIT_MAGIC_STRING_GET_OWN_PROPERTY_NAMES_UL) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (20, LIT_MAGIC_STRING_PROPERTY_IS_ENUMERABLE_UL) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (21, LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (21, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL) diff --git a/jerry-core/parser/js/byte-code.h b/jerry-core/parser/js/byte-code.h index 1eb4cf64f..586ccd5e6 100644 --- a/jerry-core/parser/js/byte-code.h +++ b/jerry-core/parser/js/byte-code.h @@ -64,19 +64,19 @@ #define CBC_HAS_POP_STACK_BYTE_ARG (CBC_HAS_BYTE_ARG | CBC_POP_STACK_BYTE_ARG) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * CBC_NO_RESULT_OPERATION for ext opcodes */ #define CBC_EXT_NO_RESULT_OPERATION(opcode) \ ((opcode) >= PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_CALL) \ && (opcode) <= PARSER_TO_EXT_OPCODE (CBC_EXT_SPREAD_CALL_PROP_BLOCK)) -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /** * CBC_NO_RESULT_OPERATION for ext opcodes */ #define CBC_EXT_NO_RESULT_OPERATION(opcode) false -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Debug macro. */ #define CBC_ARGS_EQ(op, types) \ diff --git a/jerry-core/parser/js/common.h b/jerry-core/parser/js/common.h index 3f504c90b..366b884be 100644 --- a/jerry-core/parser/js/common.h +++ b/jerry-core/parser/js/common.h @@ -74,9 +74,9 @@ typedef enum LEXER_FLAG_SOURCE_PTR = (1 << 2), /**< the literal is directly referenced in the source code * (no need to allocate memory) */ LEXER_FLAG_LATE_INIT = (1 << 3), /**< initialize this variable after the byte code is freed */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_FLAG_GLOBAL = (1 << 4), /**< this local identifier is not a let or const declaration */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } lexer_literal_status_flags_t; /** diff --git a/jerry-core/parser/js/js-lexer.c b/jerry-core/parser/js/js-lexer.c index b06ff84d9..b9eaccbfa 100644 --- a/jerry-core/parser/js/js-lexer.c +++ b/jerry-core/parser/js/js-lexer.c @@ -92,7 +92,7 @@ lexer_hex_to_code_point (const uint8_t *source_p, /**< current source position * return result; } /* lexer_hex_to_code_point */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Parse hexadecimal character sequence enclosed in braces @@ -146,7 +146,7 @@ lexer_hex_in_braces_to_code_point (const uint8_t *source_p, /**< current source return result; } /* lexer_hex_in_braces_to_code_point */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Parse hexadecimal character sequence @@ -160,13 +160,13 @@ lexer_unchecked_hex_to_character (const uint8_t **source_p) /**< [in, out] curre const uint8_t *char_p = *source_p; uint32_t length = (char_p[-1] == LIT_CHAR_LOWERCASE_U) ? 4 : 2; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (char_p[0] == LIT_CHAR_LEFT_BRACE) { length = 0; char_p++; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (true) { @@ -188,7 +188,7 @@ lexer_unchecked_hex_to_character (const uint8_t **source_p) /**< [in, out] curre JERRY_ASSERT (result <= LIT_UNICODE_CODE_POINT_MAX); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (length == 0) { if (*char_p != LIT_CHAR_RIGHT_BRACE) @@ -198,7 +198,7 @@ lexer_unchecked_hex_to_character (const uint8_t **source_p) /**< [in, out] curre *source_p = char_p + 1; return result; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (--length == 0) { @@ -395,7 +395,7 @@ lexer_skip_spaces (parser_context_t *context_p) /**< context */ } } /* lexer_skip_spaces */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Skip all the continuous empty statements. */ @@ -413,7 +413,7 @@ lexer_skip_empty_statements (parser_context_t *context_p) /**< context */ context_p->token.flags = (uint8_t) (context_p->token.flags | LEXER_NO_SKIP_SPACES); } /* lexer_skip_empty_statements */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Keyword data. @@ -485,10 +485,10 @@ static const keyword_string_t keywords_with_length_4[] = */ static const keyword_string_t keywords_with_length_5[] = { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_KEYWORD ("async", LEXER_KEYW_ASYNC), LEXER_KEYWORD ("await", LEXER_KEYW_AWAIT), -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ LEXER_KEYWORD ("break", LEXER_KEYW_BREAK), LEXER_KEYWORD ("catch", LEXER_KEYW_CATCH), LEXER_KEYWORD ("class", LEXER_KEYW_CLASS), @@ -641,7 +641,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ has_escape = true; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (source_p + 5 <= source_end_p && source_p[1] == LIT_CHAR_LOWERCASE_U) { if (source_p[2] == LIT_CHAR_LEFT_BRACE) @@ -653,12 +653,12 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ code_point = lexer_hex_to_code_point (source_p + 2, 4); } } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (source_p + 6 <= source_end_p && source_p[1] == LIT_CHAR_LOWERCASE_U) { code_point = lexer_hex_to_code_point (source_p + 2, 4); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (code_point == UINT32_MAX) { @@ -693,13 +693,13 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ if (JERRY_UNLIKELY (code_point >= LIT_UTF8_2_BYTE_MARKER)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) utf8_length = lit_read_code_point_from_utf8 (source_p, (lit_utf8_size_t) (source_end_p - source_p), &code_point); decoded_length = utf8_length; - /* Only ES2015 supports code points outside of the basic plane which can be part of an identifier. */ + /* Only ES2015+ supports code points outside of the basic plane which can be part of an identifier. */ if ((code_point >= LIT_UTF16_HIGH_SURROGATE_MIN && code_point <= LIT_UTF16_HIGH_SURROGATE_MAX) && source_p + 3 < source_end_p) { @@ -722,7 +722,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ decoded_length = 2 * 3; has_escape = true; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (code_point < LIT_UTF8_4_BYTE_MARKER) { utf8_length = lit_read_code_point_from_utf8 (source_p, @@ -734,7 +734,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ { code_point = 0; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } if (length == 0) @@ -817,7 +817,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ if (JERRY_LIKELY (keyword_p->type < LEXER_FIRST_NON_RESERVED_KEYWORD)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (keyword_p->type == LEXER_KEYW_AWAIT)) { if (!(context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) @@ -838,7 +838,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ context_p->token.type = (uint8_t) LEXER_KEYW_AWAIT; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (ident_start_p == buffer_p) { @@ -850,7 +850,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (keyword_p->type == LEXER_KEYW_LET && (context_p->status_flags & PARSER_IS_STRICT)) { if (ident_start_p == buffer_p) @@ -876,7 +876,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ context_p->token.type = (uint8_t) LEXER_KEYW_YIELD; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (keyword_p->type >= LEXER_FIRST_FUTURE_STRICT_RESERVED_WORD && (context_p->status_flags & PARSER_IS_STRICT)) @@ -914,11 +914,11 @@ void lexer_parse_string (parser_context_t *context_p, /**< context */ lexer_string_options_t opts) /**< options */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) int32_t raw_length_adjust = 0; -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (opts); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint8_t str_end_character = context_p->source_p[0]; const uint8_t *source_p = context_p->source_p + 1; @@ -931,12 +931,12 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ size_t length = 0; uint8_t has_escape = false; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (str_end_character == LIT_CHAR_RIGHT_BRACE) { str_end_character = LIT_CHAR_GRAVE_ACCENT; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (true) { @@ -971,9 +971,9 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ if (source_p < source_end_p && *source_p == LIT_CHAR_LF) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) raw_length_adjust--; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ source_p++; } @@ -996,7 +996,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (opts & LEXER_STRING_RAW) { if ((*source_p == LIT_CHAR_GRAVE_ACCENT) || (*source_p == LIT_CHAR_BACKSLASH)) @@ -1007,7 +1007,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ } continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (*source_p == LIT_CHAR_0 && source_p + 1 < source_end_p @@ -1084,7 +1084,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ context_p->token.line = line; context_p->token.column = (parser_line_counter_t) (column - 1); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (source_p + 4 <= source_end_p && source_p[0] == LIT_CHAR_LOWERCASE_U && source_p[1] == LIT_CHAR_LEFT_BRACE) @@ -1094,14 +1094,14 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ } else { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (source_p + escape_length <= source_end_p) { code_point = lexer_hex_to_code_point (source_p + 1, escape_length - 1); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (code_point == UINT32_MAX) { @@ -1115,7 +1115,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ continue; } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (str_end_character == LIT_CHAR_GRAVE_ACCENT && source_p[0] == LIT_CHAR_DOLLAR_SIGN && source_p + 1 < source_end_p && @@ -1125,7 +1125,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ source_p++; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (*source_p >= LIT_UTF8_4_BYTE_MARKER) { @@ -1135,9 +1135,9 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ length += 2 * 3; has_escape = true; source_p += 4; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) raw_length_adjust += 2; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ column++; continue; } @@ -1147,7 +1147,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ /* Subtract -1 because column is increased below. */ column--; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (str_end_character == LIT_CHAR_GRAVE_ACCENT) { /* Newline (without backslash) is part of the string. @@ -1184,7 +1184,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ continue; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else if (*source_p == LIT_CHAR_CR || *source_p == LIT_CHAR_LF || (*source_p == LEXER_NEWLINE_LS_PS_BYTE_1 && LEXER_NEWLINE_LS_PS_BYTE_23 (source_p))) @@ -1206,24 +1206,24 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (opts & LEXER_STRING_RAW) { length = (size_t) ((source_p - string_start_p) + raw_length_adjust); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (length > PARSER_MAXIMUM_STRING_LENGTH) { parser_raise_error (context_p, PARSER_ERR_STRING_TOO_LONG); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context_p->token.type = ((str_end_character != LIT_CHAR_GRAVE_ACCENT) ? LEXER_LITERAL : LEXER_TEMPLATE_LITERAL); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ context_p->token.type = LEXER_LITERAL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Fill literal data. */ context_p->token.lit_location.char_p = string_start_p; @@ -1297,7 +1297,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ while (source_p < source_end_p && lit_char_is_hex_digit (source_p[0])); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (LEXER_TO_ASCII_LOWERCASE (source_p[1]) == LIT_CHAR_LOWERCASE_O) { context_p->token.extra_value = LEXER_NUMBER_OCTAL; @@ -1313,7 +1313,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ lexer_parse_octal_number (context_p, &source_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else if (source_p[1] >= LIT_CHAR_0 && source_p[1] <= LIT_CHAR_7) { @@ -1331,7 +1331,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ { parser_raise_error (context_p, PARSER_ERR_INVALID_NUMBER); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (LEXER_TO_ASCII_LOWERCASE (source_p[1]) == LIT_CHAR_LOWERCASE_B) { context_p->token.extra_value = LEXER_NUMBER_BINARY; @@ -1352,7 +1352,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ while (source_p < source_end_p && lit_char_is_binary_digit (source_p[0])); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { can_be_float = true; @@ -1552,7 +1552,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ return; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (length >= 3 && context_p->source_p[1] == LIT_CHAR_DOT && context_p->source_p[2] == LIT_CHAR_DOT) @@ -1561,7 +1561,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ length = 3; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context_p->token.type = LEXER_DOT; length = 1; @@ -1665,14 +1665,14 @@ lexer_next_token (parser_context_t *context_p) /**< context */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->source_p[1] == (uint8_t) LIT_CHAR_GREATER_THAN) { context_p->token.type = LEXER_ARROW; length = 2; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } context_p->token.type = LEXER_ASSIGN; @@ -1717,7 +1717,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->source_p[1] == (uint8_t) LIT_CHAR_ASTERISK) { if (length >= 3 && context_p->source_p[2] == (uint8_t) LIT_CHAR_EQUALS) @@ -1731,7 +1731,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ length = 2; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } context_p->token.type = LEXER_MULTIPLY; @@ -1758,9 +1758,9 @@ lexer_next_token (parser_context_t *context_p) /**< context */ case LIT_CHAR_SINGLE_QUOTE: case LIT_CHAR_DOUBLE_QUOTE: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LIT_CHAR_GRAVE_ACCENT: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { lexer_parse_string (context_p, LEXER_STRING_NO_OPTS); return; @@ -1867,9 +1867,9 @@ lexer_check_post_primary_exp (parser_context_t *context_p) /**< context */ case LIT_CHAR_DOT: case LIT_CHAR_LEFT_PAREN: case LIT_CHAR_LEFT_SQUARE: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LIT_CHAR_GRAVE_ACCENT: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { return true; } @@ -1880,19 +1880,19 @@ lexer_check_post_primary_exp (parser_context_t *context_p) /**< context */ && context_p->source_p + 1 < context_p->source_end_p && context_p->source_p[1] == context_p->source_p[0]); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LIT_CHAR_ASTERISK: { return (context_p->source_p + 1 < context_p->source_end_p && context_p->source_p[1] == (uint8_t) LIT_CHAR_ASTERISK); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } return false; } /* lexer_check_post_primary_exp */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Checks whether the next token is a type used for detecting arrow functions. @@ -2050,7 +2050,7 @@ lexer_update_await_yield (parser_context_t *context_p, /**< context */ } } /* lexer_update_await_yield */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Convert an ident with escapes to a utf8 string. @@ -2074,7 +2074,7 @@ lexer_convert_ident_to_cesu8 (uint8_t *destination_p, /**< destination string */ continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (*source_p >= LIT_UTF8_4_BYTE_MARKER) { lit_four_byte_utf8_char_to_cesu8 (destination_p, source_p); @@ -2083,7 +2083,7 @@ lexer_convert_ident_to_cesu8 (uint8_t *destination_p, /**< destination string */ source_p += 4; continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ *destination_p++ = *source_p++; } @@ -2129,17 +2129,17 @@ lexer_convert_literal_to_chars (parser_context_t *context_p, /**< context */ uint8_t str_end_character = source_p[-1]; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (str_end_character == LIT_CHAR_RIGHT_BRACE) { str_end_character = LIT_CHAR_GRAVE_ACCENT; } bool is_raw = (opts & LEXER_STRING_RAW) != 0; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (opts); bool is_raw = false; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (true) { @@ -2271,7 +2271,7 @@ lexer_convert_literal_to_chars (parser_context_t *context_p, /**< context */ continue; } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (str_end_character == LIT_CHAR_GRAVE_ACCENT) { if (source_p[0] == LIT_CHAR_DOLLAR_SIGN @@ -2303,7 +2303,7 @@ lexer_convert_literal_to_chars (parser_context_t *context_p, /**< context */ } } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (*source_p >= LIT_UTF8_4_BYTE_MARKER) { @@ -2477,12 +2477,12 @@ lexer_construct_number_object (parser_context_t *context_p, /**< context */ const uint8_t *src_end_p = src_p + length - 1; ecma_number_t multiplier = 8.0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.extra_value == LEXER_NUMBER_BINARY) { multiplier = 2.0; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ num = 0; do @@ -2659,7 +2659,7 @@ lexer_construct_function_object (parser_context_t *context_p, /**< context */ result_index = context_p->literal_count; context_p->literal_count++; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(extra_status_flags & PARSER_IS_ARROW_FUNCTION)) { compiled_code_p = parser_parse_function (context_p, extra_status_flags); @@ -2668,9 +2668,9 @@ lexer_construct_function_object (parser_context_t *context_p, /**< context */ { compiled_code_p = parser_parse_arrow_function (context_p, extra_status_flags); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ compiled_code_p = parser_parse_function (context_p, extra_status_flags); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ literal_p->u.bytecode_p = compiled_code_p; literal_p->type = LEXER_FUNCTION_LITERAL; @@ -2927,7 +2927,7 @@ lexer_expect_identifier (parser_context_t *context_p, /**< context */ return; } } -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) else if (context_p->status_flags & PARSER_MODULE_DEFAULT_CLASS_OR_FUNC) { /* When parsing default exports for modules, it is not required by functions or classes to have identifiers. @@ -2939,9 +2939,9 @@ lexer_expect_identifier (parser_context_t *context_p, /**< context */ context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_DEFAULT_CLASS_OR_FUNC); return; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_KEYW_YIELD) { parser_raise_error (context_p, PARSER_ERR_YIELD_NOT_ALLOWED); @@ -2950,7 +2950,7 @@ lexer_expect_identifier (parser_context_t *context_p, /**< context */ { parser_raise_error (context_p, PARSER_ERR_AWAIT_NOT_ALLOWED); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_raise_error (context_p, PARSER_ERR_IDENTIFIER_EXPECTED); } /* lexer_expect_identifier */ @@ -2968,11 +2968,11 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ parser_raise_error (context_p, PARSER_ERR_PROPERTY_IDENTIFIER_EXPECTED); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) int is_class_method = ((ident_opts & LEXER_OBJ_IDENT_CLASS_METHOD) && !(ident_opts & LEXER_OBJ_IDENT_ONLY_IDENTIFIERS) && (context_p->token.type != LEXER_KEYW_STATIC)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context_p->token.line = context_p->line; context_p->token.column = context_p->column; @@ -2986,11 +2986,11 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ context_p->token.flags = (uint8_t) (context_p->token.flags | LEXER_NO_SKIP_SPACES); if (context_p->source_p < context_p->source_end_p -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) && context_p->source_p[0] != LIT_CHAR_COMMA && context_p->source_p[0] != LIT_CHAR_RIGHT_BRACE && context_p->source_p[0] != LIT_CHAR_LEFT_PAREN -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ && context_p->source_p[0] != LIT_CHAR_COLON) { if (lexer_compare_literal_to_string (context_p, "get", 3)) @@ -3005,23 +3005,23 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ return; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (lexer_compare_literal_to_string (context_p, "async", 5)) { context_p->token.type = LEXER_KEYW_ASYNC; return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (is_class_method && lexer_compare_literal_to_string (context_p, "static", 6)) { context_p->token.type = LEXER_KEYW_STATIC; return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ create_literal_object = true; } @@ -3036,7 +3036,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ create_literal_object = true; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LIT_CHAR_LEFT_SQUARE: { lexer_consume_next_character (context_p); @@ -3061,7 +3061,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ lexer_consume_next_character (context_p); return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LIT_CHAR_RIGHT_BRACE: { if (ident_opts & LEXER_OBJ_IDENT_ONLY_IDENTIFIERS) @@ -3097,14 +3097,14 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ if (create_literal_object) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (is_class_method && lexer_compare_literal_to_string (context_p, "constructor", 11)) { context_p->token.type = LEXER_CLASS_CONSTRUCTOR; context_p->token.flags &= (uint8_t) ~LEXER_NO_SKIP_SPACES; return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_construct_literal_object (context_p, &context_p->token.lit_location, @@ -3151,12 +3151,12 @@ lexer_check_property_modifier (parser_context_t *context_p) /**< context */ context_p->token.flags = (uint8_t) (context_p->token.flags | LEXER_NO_SKIP_SPACES); if (context_p->source_p >= context_p->source_end_p -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) || context_p->source_p[0] == LIT_CHAR_COMMA || context_p->source_p[0] == LIT_CHAR_RIGHT_BRACE || context_p->source_p[0] == LIT_CHAR_LEFT_PAREN || context_p->source_p[0] == LIT_CHAR_EQUALS -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ || context_p->source_p[0] == LIT_CHAR_COLON) { return; @@ -3174,13 +3174,13 @@ lexer_check_property_modifier (parser_context_t *context_p) /**< context */ return; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (lexer_compare_literal_to_string (context_p, "async", 5)) { context_p->token.type = LEXER_KEYW_ASYNC; return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* lexer_check_property_modifier */ /** @@ -3386,7 +3386,7 @@ lexer_string_is_directive (parser_context_t *context_p) /**< context */ && context_p->token.type != LEXER_DOT)); } /* lexer_string_is_directive */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Compares the current token to an expected identifier. @@ -3443,7 +3443,7 @@ lexer_token_is_async (parser_context_t *context_p) /**< context */ && !context_p->token.lit_location.has_escape); } /* lexer_token_is_async */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Compares the current identifier or string to an expected string. @@ -3480,17 +3480,17 @@ lexer_convert_binary_lvalue_token_to_binary (uint8_t token) /**< binary lvalue t JERRY_ASSERT (LEXER_IS_BINARY_LVALUE_TOKEN (token)); JERRY_ASSERT (token != LEXER_ASSIGN); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (token <= LEXER_ASSIGN_EXPONENTIATION) { return (uint8_t) (LEXER_ADD + (token - LEXER_ASSIGN_ADD)); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (token <= LEXER_ASSIGN_MODULO) { return (uint8_t) (LEXER_ADD + (token - LEXER_ASSIGN_ADD)); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (token <= LEXER_ASSIGN_UNS_RIGHT_SHIFT) { diff --git a/jerry-core/parser/js/js-lexer.h b/jerry-core/parser/js/js-lexer.h index 6fe14c3cb..0e5db50ed 100644 --- a/jerry-core/parser/js/js-lexer.h +++ b/jerry-core/parser/js/js-lexer.h @@ -39,10 +39,10 @@ typedef enum LEXER_LIT_TRUE, /**< true (not a keyword!) */ LEXER_LIT_FALSE, /**< false (not a keyword!) */ LEXER_LIT_NULL, /**< null (not a keyword!) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_TEMPLATE_LITERAL, /**< multi segment template literal */ LEXER_THREE_DOTS, /**< ... (rest or spread operator) */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Unary operators * IMPORTANT: update CBC_UNARY_OP_TOKEN_TO_OPCODE and @@ -58,9 +58,9 @@ typedef enum LEXER_BIT_NOT, /**< "~" */ LEXER_KEYW_VOID, /**< void */ LEXER_KEYW_TYPEOF, /**< typeof */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_KEYW_AWAIT, /**< await */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ LEXER_KEYW_DELETE, /**< delete */ LEXER_INCREASE, /**< "++" */ LEXER_DECREASE, /**< "--" */ @@ -69,13 +69,13 @@ typedef enum * IMPORTANT: update CBC_BINARY_OP_TOKEN_TO_OPCODE, * CBC_BINARY_LVALUE_OP_TOKEN_TO_OPCODE and * parser_binary_precedence_table after changes. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define LEXER_IS_BINARY_OP_TOKEN(token_type) \ ((token_type) >= LEXER_ASSIGN && (token_type) <= LEXER_EXPONENTIATION) -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ #define LEXER_IS_BINARY_OP_TOKEN(token_type) \ ((token_type) >= LEXER_ASSIGN && (token_type) <= LEXER_MODULO) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #define LEXER_IS_BINARY_LVALUE_TOKEN(token_type) \ ((token_type) >= LEXER_ASSIGN && (token_type) <= LEXER_ASSIGN_BIT_XOR) @@ -88,9 +88,9 @@ typedef enum LEXER_ASSIGN_MULTIPLY, /**< "*=" (prec: 3) */ LEXER_ASSIGN_DIVIDE, /**< "/=" (prec: 3) */ LEXER_ASSIGN_MODULO, /**< "%=" (prec: 3) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_ASSIGN_EXPONENTIATION, /**< "**=" (prec: 3) */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ LEXER_ASSIGN_LEFT_SHIFT, /**< "<<=" (prec: 3) */ LEXER_ASSIGN_RIGHT_SHIFT, /**< ">>=" (prec: 3) */ LEXER_ASSIGN_UNS_RIGHT_SHIFT, /**< ">>>=" (prec: 3) */ @@ -121,9 +121,9 @@ typedef enum LEXER_MULTIPLY, /**< "*" (prec: 14) */ LEXER_DIVIDE, /**< "/" (prec: 14) */ LEXER_MODULO, /**< "%" (prec: 14) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_EXPONENTIATION, /**< "**" (prec: 15) */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ LEXER_LEFT_BRACE, /**< "{" */ LEXER_LEFT_PAREN, /**< "(" */ @@ -135,9 +135,9 @@ typedef enum LEXER_SEMICOLON, /**< ";" */ LEXER_COLON, /**< ":" */ LEXER_COMMA, /**< "," */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_ARROW, /**< "=>" */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ LEXER_KEYW_BREAK, /**< break */ LEXER_KEYW_DO, /**< do */ @@ -173,21 +173,21 @@ typedef enum LEXER_PROPERTY_GETTER, /**< property getter function */ LEXER_PROPERTY_SETTER, /**< property setter function */ LEXER_COMMA_SEP_LIST, /**< comma separated bracketed expression list */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) LEXER_ASSIGN_GROUP_EXPR, /**< indetifier for the assignment is located in a group expression */ LEXER_ASSIGN_CONST, /**< a const binding is reassigned */ LEXER_CLASS_CONSTRUCTOR, /**< special value for class constructor method */ LEXER_INVALID_PATTERN, /**< special value for invalid destructuring pattern */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Keywords which are not keyword tokens. */ #define LEXER_FIRST_NON_RESERVED_KEYWORD LEXER_KEYW_ASYNC LEXER_KEYW_ASYNC, /**< async */ -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* Keywords which are not keyword tokens. */ #define LEXER_FIRST_NON_RESERVED_KEYWORD LEXER_KEYW_EVAL -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Keywords which cannot be assigned in strict mode. */ #define LEXER_FIRST_NON_STRICT_ARGUMENTS LEXER_KEYW_EVAL diff --git a/jerry-core/parser/js/js-parser-expr.c b/jerry-core/parser/js/js-parser-expr.c index c2c3389c1..7059253c8 100644 --- a/jerry-core/parser/js/js-parser-expr.c +++ b/jerry-core/parser/js/js-parser-expr.c @@ -61,24 +61,24 @@ static const uint8_t parser_binary_precedence_table[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) 3, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 12, 12, 12, 13, 13, 14, 14, 14, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) 15, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ }; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_STATIC_ASSERT (sizeof (parser_binary_precedence_table) == 38, parser_binary_precedence_table_should_have_38_values_in_es2015); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_STATIC_ASSERT (sizeof (parser_binary_precedence_table) == 36, parser_binary_precedence_table_should_have_36_values_in_es51); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Generate byte code for operators with lvalue. @@ -132,7 +132,7 @@ parser_check_invalid_assign (parser_context_t *context_p) /**< context */ } } /* parser_check_invalid_assign */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Check and throw an error if the "new.target" is invalid as a left-hand side expression. @@ -155,7 +155,7 @@ parser_check_invalid_new_target (parser_context_t *context_p, /**< parser contex } } /* parser_check_invalid_new_target */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Emit identifier reference @@ -223,7 +223,7 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ parser_emit_ident_reference (context_p, unary_opcode); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (unary_opcode != CBC_DELETE_IDENT_PUSH_RESULT && scanner_literal_is_const_reg (context_p, context_p->last_cbc.literal_index)) { @@ -231,7 +231,7 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ context_p->last_cbc_opcode = CBC_PUSH_LITERAL; parser_emit_cbc_ext (context_p, CBC_EXT_THROW_ASSIGN_CONST_ERROR); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return; } @@ -251,7 +251,7 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ /* Invalid LeftHandSide expression. */ if (opcode == CBC_DELETE_PUSH_RESULT) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP_LITERAL) || context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP)) { @@ -259,15 +259,15 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ parser_emit_cbc (context_p, CBC_POP); return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc (context_p, CBC_POP); parser_emit_cbc (context_p, CBC_PUSH_TRUE); return; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_check_invalid_new_target (context_p, opcode); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_ext (context_p, CBC_EXT_THROW_REFERENCE_ERROR); } @@ -309,7 +309,7 @@ parser_parse_array_literal (parser_context_t *context_p) /**< context */ } else { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_THREE_DOTS) { opcode = (uint16_t) (PARSER_TO_EXT_OPCODE (CBC_EXT_SPREAD_ARRAY_APPEND)); @@ -317,7 +317,7 @@ parser_parse_array_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); parser_emit_cbc_ext (context_p, CBC_EXT_PUSH_SPREAD_ELEMENT); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA); @@ -339,15 +339,15 @@ parser_parse_array_literal (parser_context_t *context_p) /**< context */ if (pushed_items >= 64) { parser_emit_cbc_call (context_p, opcode, pushed_items); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) opcode = (uint16_t) CBC_ARRAY_APPEND; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ pushed_items = 0; } } } /* parser_parse_array_literal */ -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) /** * Object literal item types. */ @@ -444,9 +444,9 @@ parser_append_object_literal_item (parser_context_t *context_p, /**< context */ context_p->stack_top_uint8 = PARSER_OBJECT_PROPERTY_BOTH_ACCESSORS; } } /* parser_append_object_literal_item */ -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** Forward definition of parse array initializer. */ static void parser_parse_array_initializer (parser_context_t *context_p, parser_pattern_flags_t flags); @@ -769,10 +769,10 @@ parser_parse_class (parser_context_t *context_p, /**< context */ lexer_construct_literal_object (context_p, &context_p->token.lit_location, LEXER_STRING_LITERAL); class_name_index = context_p->lit_object.index; -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) parser_module_append_export_name (context_p); context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ lexer_next_token (context_p); } @@ -856,9 +856,9 @@ parser_parse_class (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); } /* parser_parse_class */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Parse object initializer method definition. * @@ -914,7 +914,7 @@ parser_reparse_as_common_identifier (parser_context_t *context_p, /**< context * LEXER_IDENT_LITERAL); } /* parser_reparse_as_common_identifier */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Parse object literal. @@ -926,13 +926,13 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ parser_emit_cbc (context_p, CBC_CREATE_OBJECT); -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) parser_stack_push_uint8 (context_p, PARSER_OBJECT_PROPERTY_START); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool proto_seen = false; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (true) { @@ -949,26 +949,26 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ { uint32_t status_flags; cbc_ext_opcode_t opcode; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) parser_object_literal_item_types_t item_type; -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ bool is_getter = context_p->token.type == LEXER_PROPERTY_GETTER; if (is_getter) { status_flags = PARSER_FUNCTION_CLOSURE | PARSER_IS_PROPERTY_GETTER; opcode = CBC_EXT_SET_GETTER; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) item_type = PARSER_OBJECT_PROPERTY_GETTER; -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ } else { status_flags = PARSER_FUNCTION_CLOSURE | PARSER_IS_PROPERTY_SETTER; opcode = CBC_EXT_SET_SETTER; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) item_type = PARSER_OBJECT_PROPERTY_SETTER; -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ } lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_ONLY_IDENTIFIERS); @@ -976,7 +976,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ /* This assignment is a nop for computed getters/setters. */ uint16_t literal_index = context_p->lit_object.index; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool is_computed = context_p->token.type == LEXER_RIGHT_SQUARE; if (is_computed) @@ -984,18 +984,18 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ opcode = ((opcode == CBC_EXT_SET_GETTER) ? CBC_EXT_SET_COMPUTED_GETTER : CBC_EXT_SET_COMPUTED_SETTER); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ parser_append_object_literal_item (context_p, literal_index, item_type); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint16_t function_literal_index = lexer_construct_function_object (context_p, status_flags); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (opcode >= CBC_EXT_SET_COMPUTED_GETTER) { literal_index = function_literal_index; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal (context_p, CBC_PUSH_LITERAL, @@ -1003,7 +1003,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (is_computed) { parser_emit_cbc_ext (context_p, is_getter ? CBC_EXT_SET_COMPUTED_GETTER_NAME @@ -1014,7 +1014,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ } parser_set_function_name (context_p, function_literal_index, literal_index, status_flags); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (opcode); context_p->last_cbc.value = function_literal_index; @@ -1022,7 +1022,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_RIGHT_SQUARE: { lexer_next_token (context_p); @@ -1120,10 +1120,10 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const lexer_lit_location_t *literal_p = (const lexer_lit_location_t *) context_p->lit_object.literal_p; bool is_proto = ((context_p->token.lit_location.type == LEXER_IDENT_LITERAL || context_p->token.lit_location.type == LEXER_STRING_LITERAL) @@ -1138,22 +1138,22 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ proto_seen = true; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint16_t literal_index = context_p->lit_object.index; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_line_counter_t start_line = context_p->token.line; parser_line_counter_t start_column = context_p->token.column; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ parser_append_object_literal_item (context_p, literal_index, PARSER_OBJECT_PROPERTY_VALUE); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_LEFT_PAREN && !is_proto) { parser_parse_object_method (context_p); @@ -1177,7 +1177,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_COLON) { @@ -1187,34 +1187,34 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (is_proto) { parser_emit_cbc_ext (context_p, CBC_EXT_SET__PROTO__); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->last_cbc.literal_type == LEXER_FUNCTION_LITERAL) { parser_set_function_name (context_p, context_p->last_cbc.literal_index, literal_index, 0); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context_p->last_cbc_opcode = CBC_SET_LITERAL_PROPERTY; context_p->last_cbc.value = literal_index; } else { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_FINALIZE_ANONYMOUS_CLASS)) { uint16_t name_index = scanner_save_literal (context_p, literal_index); parser_emit_cbc_ext_literal (context_p, CBC_EXT_SET_CLASS_NAME, name_index); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal (context_p, CBC_SET_PROPERTY, literal_index); } @@ -1232,14 +1232,14 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ } } -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) while (context_p->stack_top_uint8 != PARSER_OBJECT_PROPERTY_START) { parser_stack_pop (context_p, NULL, 3); } parser_stack_pop_uint8 (context_p); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ } /* parser_parse_object_literal */ /** @@ -1255,21 +1255,21 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ uint16_t function_literal_index; int32_t function_name_index = -1; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) JERRY_ASSERT (status_flags & PARSER_IS_FUNC_EXPRESSION); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (status_flags & PARSER_IS_FUNC_EXPRESSION) { -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_DEBUGGER) parser_line_counter_t debugger_line = context_p->token.line; parser_line_counter_t debugger_column = context_p->token.column; #endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint32_t parent_status_flags = context_p->status_flags; context_p->status_flags &= (uint32_t) ~(PARSER_IS_ASYNC_FUNCTION @@ -1288,7 +1288,7 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ context_p->status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (!lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN)) { @@ -1326,10 +1326,10 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ function_name_index = context_p->lit_object.index; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context_p->status_flags = parent_status_flags; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL) { @@ -1349,12 +1349,12 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ JERRY_ASSERT (context_p->last_cbc_opcode == PARSER_CBC_UNAVAILABLE); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (function_name_index != -1) { parser_set_function_name (context_p, function_literal_index, (uint16_t) function_name_index, 0); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (literals == 1) { @@ -1386,7 +1386,7 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ context_p->last_cbc.literal_keyword_type = LEXER_EOS; } /* parser_parse_function_expression */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Parse template literal. @@ -1590,7 +1590,7 @@ parser_abort_parsing_after_assignment_expression (parser_context_t *context_p) && context_p->token.type != LEXER_COMMA); } /* parser_abort_parsing_after_assignment_expression */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Parse and record unary operators, and parse the primary literal. @@ -1619,7 +1619,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ context_p->token.type = LEXER_NEGATE; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_AWAIT: { if (JERRY_UNLIKELY (context_p->token.lit_location.has_escape)) @@ -1628,7 +1628,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ } break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* Bracketed expressions are primary expressions. At this @@ -1636,13 +1636,13 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ * they are processed when their closing paren is reached. */ if (context_p->token.type == LEXER_LEFT_PAREN) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ (*grouping_level_p) += PARSER_GROUPING_LEVEL_INCREASE; new_was_seen = false; } @@ -1651,7 +1651,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* After 'new' unary operators are not allowed. */ new_was_seen = true; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Check if "new.target" is written here. */ if (scanner_try_scan_new_target (context_p)) { @@ -1665,7 +1665,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* Found "new.target" return here */ return false; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } else if (new_was_seen || (*grouping_level_p == PARSE_EXPR_LEFT_HAND_SIDE) @@ -1681,7 +1681,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* Parse primary expression. */ switch (context_p->token.type) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_TEMPLATE_LITERAL: { if (context_p->source_p[-1] != LIT_CHAR_GRAVE_ACCENT) @@ -1693,10 +1693,10 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* The string is a normal string literal. */ /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_LITERAL: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (context_p->next_scanner_info_p->source_p == context_p->source_p)) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); @@ -1734,7 +1734,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ parser_parse_function_expression (context_p, arrow_status_flags); return parser_abort_parsing_after_assignment_expression (context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint8_t type = context_p->token.lit_location.type; @@ -1744,14 +1744,14 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ &context_p->token.lit_location, context_p->token.lit_location.type); -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if ((context_p->status_flags & PARSER_MODULE_STORE_IDENT) && type == LEXER_IDENT_LITERAL) { context_p->module_identifier_lit_p = context_p->lit_object.literal_p; context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ } else if (type == LEXER_NUMBER_LITERAL) { @@ -1820,7 +1820,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_INITIALIZER); @@ -1833,14 +1833,14 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ scanner_release_next (context_p, sizeof (scanner_location_info_t)); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_parse_object_literal (context_p); break; } case LEXER_LEFT_SQUARE: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_INITIALIZER); @@ -1853,7 +1853,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ scanner_release_next (context_p, sizeof (scanner_location_info_t)); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_parse_array_literal (context_p); break; @@ -1886,18 +1886,18 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ } case LEXER_KEYW_THIS: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_ALLOW_SUPER_CALL) { parser_emit_cbc_ext (context_p, CBC_EXT_RESOLVE_LEXICAL_THIS); } else { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc (context_p, CBC_PUSH_THIS); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } case LEXER_LIT_TRUE: @@ -1915,7 +1915,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ parser_emit_cbc (context_p, CBC_PUSH_NULL); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_CLASS: { parser_parse_class (context_p, false); @@ -1986,7 +1986,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ return (context_p->token.type != LEXER_RIGHT_PAREN && context_p->token.type != LEXER_COMMA); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { bool is_left_hand_side = (*grouping_level_p == PARSE_EXPR_LEFT_HAND_SIDE); @@ -2036,13 +2036,13 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ context_p->last_cbc_opcode = PARSER_CBC_UNAVAILABLE; parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_PROP_THIS_LITERAL); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER)) { context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP_LITERAL); context_p->last_cbc.literal_index = context_p->lit_object.index; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_PROP_LITERAL); @@ -2055,14 +2055,14 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ { parser_push_result (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t last_cbc_opcode = context_p->last_cbc_opcode; if (last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER)) { context_p->last_cbc_opcode = PARSER_CBC_UNAVAILABLE; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); parser_parse_expression (context_p, PARSE_EXPR); @@ -2072,13 +2072,13 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER)) { parser_emit_cbc_ext (context_p, CBC_EXT_PUSH_SUPER_PROP); continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (PARSER_IS_MUTABLE_PUSH_LITERAL (context_p->last_cbc_opcode)) { @@ -2091,9 +2091,9 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_TEMPLATE_LITERAL: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_LEFT_PAREN: { size_t call_arguments = 0; @@ -2121,7 +2121,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ opcode = CBC_CALL_PROP; context_p->last_cbc_opcode = PARSER_PUSH_PROP_TO_PUSH_PROP_REFERENCE (context_p->last_cbc_opcode); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_CONSTRUCTOR)) { opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_CALL); @@ -2136,7 +2136,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_PROP_REFERENCE); opcode = CBC_CALL_PROP; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else if (JERRY_UNLIKELY (context_p->status_flags & PARSER_INSIDE_WITH) && PARSER_IS_PUSH_LITERALS_WITH_THIS (context_p->last_cbc_opcode) && context_p->last_cbc.literal_type == LEXER_IDENT_LITERAL) @@ -2147,7 +2147,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool has_spread_element = false; if (context_p->token.type == LEXER_TEMPLATE_LITERAL) @@ -2189,7 +2189,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ break; } } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); if (context_p->token.type != LEXER_RIGHT_PAREN) @@ -2215,7 +2215,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ parser_raise_error (context_p, PARSER_ERR_RIGHT_PAREN_EXPECTED); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); @@ -2223,7 +2223,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ { context_p->status_flags |= PARSER_LEXICAL_ENV_NEEDED; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t eval_flags = PARSER_SAVE_STATUS_FLAGS (context_p->status_flags); const uint32_t required_flags = PARSER_IS_FUNCTION | PARSER_LEXICAL_BLOCK_NEEDED; @@ -2244,14 +2244,14 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } else { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc (context_p, CBC_EVAL); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (has_spread_element) { uint16_t spread_opcode; @@ -2278,7 +2278,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ parser_emit_cbc_ext_call (context_p, spread_opcode, call_arguments); continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (call_arguments <= 1) { @@ -2346,9 +2346,9 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint8_t last_unary_token = LEXER_INCREASE; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Generate byte code for the unary operators. */ while (true) @@ -2356,20 +2356,20 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ uint8_t token = context_p->stack_top_uint8; if (!LEXER_IS_UNARY_OP_TOKEN (token)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_EXPONENTIATION && last_unary_token != LEXER_INCREASE && last_unary_token != LEXER_DECREASE) { parser_raise_error (context_p, PARSER_ERR_INVALID_EXPONENTIATION); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) last_unary_token = token; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_push_result (context_p); parser_stack_pop_uint8 (context_p); @@ -2386,12 +2386,12 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } parser_emit_unary_lvalue_opcode (context_p, (cbc_opcode_t) token); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (JERRY_UNLIKELY (token == LEXER_KEYW_AWAIT)) { parser_emit_cbc_ext (context_p, CBC_EXT_AWAIT); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { token = (uint8_t) (LEXER_UNARY_OP_TOKEN_TO_OPCODE (token)); @@ -2482,7 +2482,7 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< assign_opcode = CBC_ASSIGN_SET_IDENT; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(pattern_flags & (PARSER_PATTERN_LET | PARSER_PATTERN_CONST | PARSER_PATTERN_LOCAL))) { if (scanner_literal_is_const_reg (context_p, literal_index)) @@ -2507,7 +2507,7 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< assign_opcode = CBC_INIT_ARG_OR_CATCH; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_push_uint16 (context_p, literal_index); JERRY_ASSERT (CBC_SAME_ARGS (CBC_PUSH_LITERAL, assign_opcode)); @@ -2550,7 +2550,7 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< context_p->last_cbc_opcode = CBC_PUSH_THIS_LITERAL; } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP_LITERAL)) { context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_PROP_LITERAL_ASSIGNMENT_REFERENCE); @@ -2561,13 +2561,13 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_PROP_ASSIGNMENT_REFERENCE); assign_opcode = CBC_ASSIGN_SUPER; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { /* Invalid LeftHandSide expression. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_check_invalid_new_target (context_p, CBC_ASSIGN); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_ext (context_p, CBC_EXT_THROW_REFERENCE_ERROR); } @@ -2603,12 +2603,12 @@ parser_append_binary_token (parser_context_t *context_p) /**< context */ parser_emit_ident_reference (context_p, CBC_PUSH_IDENT_REFERENCE); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (scanner_literal_is_const_reg (context_p, context_p->last_cbc.literal_index)) { parser_stack_push_uint8 (context_p, LEXER_ASSIGN_CONST); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } else if (PARSER_IS_PUSH_PROP (context_p->last_cbc_opcode)) { @@ -2617,9 +2617,9 @@ parser_append_binary_token (parser_context_t *context_p) /**< context */ else { /* Invalid LeftHandSide expression. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_check_invalid_new_target (context_p, CBC_ASSIGN); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_ext (context_p, CBC_EXT_THROW_REFERENCE_ERROR); parser_emit_cbc (context_p, CBC_PUSH_PROP_REFERENCE); @@ -2690,7 +2690,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ index = parser_stack_pop_uint16 (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool group_expr_assingment = false; if (JERRY_UNLIKELY (context_p->stack_top_uint8 == LEXER_ASSIGN_GROUP_EXPR)) @@ -2704,11 +2704,11 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ parser_stack_pop_uint8 (context_p); parser_emit_cbc_ext (context_p, CBC_EXT_THROW_ASSIGN_CONST_ERROR); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (index != UINT16_MAX) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!group_expr_assingment) { uint16_t function_literal_index = parser_check_anonymous_function_declaration (context_p); @@ -2723,7 +2723,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ parser_set_function_name (context_p, function_literal_index, (uint16_t) index, 0); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL && opcode == CBC_ASSIGN_SET_IDENT) @@ -2795,7 +2795,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ } } /* parser_process_binary_opcodes */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * End position marker of a pattern. */ @@ -3089,9 +3089,9 @@ parser_pattern_process_assignment (parser_context_t *context_p, /**< context */ } context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_FUNCTION_ARGUMENT; } -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) parser_module_append_export_name (context_p); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_LITERAL); lexer_next_token (context_p); @@ -3249,9 +3249,9 @@ parser_parse_object_initializer (parser_context_t *context_p, /**< context */ context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_FUNCTION_ARGUMENT; } -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) parser_module_append_export_name (context_p); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_LITERAL); parser_pattern_form_assignment (context_p, flags, push_prop_opcode, prop_index, start_line); @@ -3307,7 +3307,7 @@ parser_parse_initializer_by_next_char (parser_context_t *context_p, /**< context } } /* parser_parse_initializer_by_next_char */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Process ternary expression. @@ -3404,7 +3404,7 @@ parser_process_group_expression (parser_context_t *context_p, /**< context */ parser_stack_pop_uint8 (context_p); lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Lookahead for anonymous function declaration after '=' token when the assignment base is LHS expression with a single indentifier in it. e.g.: (a) = function () {} */ if (JERRY_UNLIKELY (context_p->token.type == LEXER_ASSIGN @@ -3414,7 +3414,7 @@ parser_process_group_expression (parser_context_t *context_p, /**< context */ { parser_stack_push_uint8 (context_p, LEXER_ASSIGN_GROUP_EXPR); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* parser_process_group_expression */ @@ -3495,7 +3495,7 @@ process_unary_expression: { min_prec_treshold = parser_binary_precedence_table[context_p->token.type - LEXER_FIRST_BINARY_OP]; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Check for BINARY_LVALUE tokens + LEXER_LOGICAL_OR + LEXER_LOGICAL_AND + LEXER_EXPONENTIATION */ if ((min_prec_treshold == PARSER_RIGHT_TO_LEFT_ORDER_EXPONENTIATION) || (min_prec_treshold <= PARSER_RIGHT_TO_LEFT_ORDER_MAX_PRECEDENCE @@ -3504,7 +3504,7 @@ process_unary_expression: /* Right-to-left evaluation order. */ min_prec_treshold++; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /* Check for BINARY_LVALUE tokens + LEXER_LOGICAL_OR + LEXER_LOGICAL_AND */ if (min_prec_treshold <= PARSER_RIGHT_TO_LEFT_ORDER_MAX_PRECEDENCE && min_prec_treshold != PARSER_RIGHT_TO_LEFT_ORDER_TERNARY_PRECEDENCE) @@ -3512,7 +3512,7 @@ process_unary_expression: /* Right-to-left evaluation order. */ min_prec_treshold++; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } parser_process_binary_opcodes (context_p, min_prec_treshold); diff --git a/jerry-core/parser/js/js-parser-internal.h b/jerry-core/parser/js/js-parser-internal.h index 539615de3..bf3ef8345 100644 --- a/jerry-core/parser/js/js-parser-internal.h +++ b/jerry-core/parser/js/js-parser-internal.h @@ -57,7 +57,7 @@ typedef enum * after the last byte code */ PARSER_DEBUGGER_BREAKPOINT_APPENDED = (1u << 11), /**< pending (unsent) breakpoint * info is available */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) PARSER_LEXICAL_BLOCK_NEEDED = (1u << 12), /**< global script: needs a lexical environment for let and const * function: needs a lexical environment for arguments */ PARSER_IS_ARROW_FUNCTION = (1u << 13), /**< an arrow function is parsed */ @@ -75,11 +75,11 @@ typedef enum * Note: PARSER_CLASS_CONSTRUCTOR must be present */ PARSER_ALLOW_NEW_TARGET = (1u << 23), /**< allow new.target parsing in the current context */ -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_MODULE_SYSTEM) PARSER_MODULE_DEFAULT_CLASS_OR_FUNC = (1u << 24), /**< parsing a function or class default export */ PARSER_MODULE_STORE_IDENT = (1u << 25), /**< store identifier of the current export statement */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ PARSER_HAS_LATE_LIT_INIT = (1u << 30), /**< there are identifier or string literals which construction * is postponed after the local parser data is freed */ #ifndef JERRY_NDEBUG @@ -124,10 +124,10 @@ typedef enum typedef enum { PARSER_CHECK_BLOCK_CONTEXT, /**< check block context */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) PARSER_CHECK_GLOBAL_CONTEXT, /**< check global context */ PARSER_CHECK_FUNCTION_CONTEXT, /**< check function context */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } parser_check_context_type_t; /** @@ -152,7 +152,7 @@ typedef enum #define PARSER_MAX_BRANCH_LENGTH 3 #endif /* PARSER_MAXIMUM_CODE_SIZE <= UINT16_MAX */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Offset of PARSER_ALLOW_SUPER */ @@ -201,7 +201,7 @@ typedef enum #define PARSER_GET_EVAL_FLAG(type) \ ((type) >> JERRY_LOG2 (ECMA_PARSE_ALLOW_SUPER)) -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /** * All flags that affect exotic arguments object creation. @@ -209,7 +209,7 @@ typedef enum #define PARSER_ARGUMENTS_RELATED_FLAGS \ (PARSER_ARGUMENTS_NEEDED | PARSER_IS_STRICT) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Checks whether unmapped arguments are needed. */ #define PARSER_NEEDS_MAPPED_ARGUMENTS(status_flags) \ @@ -397,7 +397,7 @@ typedef struct */ #define PARSER_SCOPE_STACK_FUNC 0xffff -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Mask for decoding the register index of map_to @@ -420,7 +420,7 @@ typedef struct */ #define PARSER_SCOPE_STACK_IS_LOCAL_CREATED (PARSER_SCOPE_STACK_IS_CONST_REG) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Starting literal index for registers. @@ -489,10 +489,10 @@ typedef struct parser_saved_context_t uint16_t scope_stack_size; /**< size of scope stack */ uint16_t scope_stack_top; /**< preserved top of scope stack */ uint16_t scope_stack_reg_top; /**< preserved top register of scope stack */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t scope_stack_global_end; /**< end of global declarations of a function */ ecma_value_t tagged_template_literal_cp; /**< compessed pointer to the tagged template literal collection */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #ifndef JERRY_NDEBUG uint16_t context_stack_depth; /**< current context stack depth */ @@ -523,10 +523,10 @@ typedef struct parser_saved_context_t *last_context_p; /**< last saved context */ parser_stack_iterator_t last_statement; /**< last statement position */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) ecma_module_node_t *module_current_node_p; /**< import / export node that is being processed */ lexer_literal_t *module_identifier_lit_p; /**< the literal for the identifier of the current element */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ /* Lexer members. */ lexer_token_t token; /**< current token */ @@ -561,10 +561,10 @@ typedef struct uint16_t scope_stack_size; /**< size of scope stack */ uint16_t scope_stack_top; /**< current top of scope stack */ uint16_t scope_stack_reg_top; /**< current top register of scope stack */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t scope_stack_global_end; /**< end of global declarations of a function */ ecma_value_t tagged_template_literal_cp; /**< compessed pointer to the tagged template literal collection */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint8_t stack_top_uint8; /**< top byte stored on the stack */ #ifndef JERRY_NDEBUG @@ -702,14 +702,14 @@ bool lexer_check_next_characters (parser_context_t *context_p, lit_utf8_byte_t c lit_utf8_byte_t character2); uint8_t lexer_consume_next_character (parser_context_t *context_p); bool lexer_check_post_primary_exp (parser_context_t *context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void lexer_skip_empty_statements (parser_context_t *context_p); bool lexer_check_arrow (parser_context_t *context_p); bool lexer_check_arrow_param (parser_context_t *context_p); bool lexer_check_yield_no_arg (parser_context_t *context_p); bool lexer_consume_generator (parser_context_t *context_p); void lexer_update_await_yield (parser_context_t *context_p, uint32_t status_flags); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ void lexer_parse_string (parser_context_t *context_p, lexer_string_options_t opts); void lexer_expect_identifier (parser_context_t *context_p, uint8_t literal_type); bool lexer_scan_identifier (parser_context_t *context_p); @@ -732,12 +732,12 @@ bool lexer_compare_identifiers (parser_context_t *context_p, const lexer_lit_loc bool lexer_current_is_literal (parser_context_t *context_p, const lexer_lit_location_t *right_ident_p); bool lexer_string_is_use_strict (parser_context_t *context_p); bool lexer_string_is_directive (parser_context_t *context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool lexer_token_is_identifier (parser_context_t *context_p, const char *identifier_p, size_t identifier_length); bool lexer_token_is_let (parser_context_t *context_p); bool lexer_token_is_async (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ bool lexer_compare_literal_to_string (parser_context_t *context_p, const char *string_p, size_t string_length); uint8_t lexer_convert_binary_lvalue_token_to_binary (uint8_t token); @@ -753,11 +753,11 @@ uint8_t lexer_convert_binary_lvalue_token_to_binary (uint8_t token); void parser_parse_block_expression (parser_context_t *context_p, int options); void parser_parse_expression_statement (parser_context_t *context_p, int options); void parser_parse_expression (parser_context_t *context_p, int options); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void parser_parse_class (parser_context_t *context_p, bool is_statement); void parser_parse_initializer (parser_context_t *context_p, parser_pattern_flags_t flags); void parser_parse_initializer_by_next_char (parser_context_t *context_p, parser_pattern_flags_t flags); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} @@ -776,20 +776,20 @@ void scanner_reverse_info_list (parser_context_t *context_p); void scanner_cleanup (parser_context_t *context_p); bool scanner_is_context_needed (parser_context_t *context_p, parser_check_context_type_t check_type); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool scanner_scope_find_let_declaration (parser_context_t *context_p, lexer_lit_location_t *literal_p); bool scanner_try_scan_new_target (parser_context_t *context_p); void scanner_check_variables (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ void scanner_create_variables (parser_context_t *context_p, uint32_t option_flags); void scanner_get_location (scanner_location_t *location_p, parser_context_t *context_p); void scanner_set_location (parser_context_t *context_p, scanner_location_t *location_p); uint16_t scanner_decode_map_to (parser_scope_stack_t *stack_item_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool scanner_literal_is_const_reg (parser_context_t *context_p, uint16_t literal_index); bool scanner_literal_is_created (parser_context_t *context_p, uint16_t literal_index); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ void scanner_scan_all (parser_context_t *context_p, const uint8_t *arg_list_p, const uint8_t *arg_list_end_p, const uint8_t *source_p, const uint8_t *source_end_p); @@ -804,7 +804,7 @@ void scanner_scan_all (parser_context_t *context_p, const uint8_t *arg_list_p, c void parser_parse_statements (parser_context_t *context_p); void parser_free_jumps (parser_stack_iterator_t iterator); -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) /** * @} * @@ -830,7 +830,7 @@ void parser_module_add_names_to_node (parser_context_t *context_p, ecma_string_t *imex_name_p, ecma_string_t *local_name_p); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ /** * @} @@ -840,14 +840,14 @@ void parser_module_add_names_to_node (parser_context_t *context_p, */ ecma_compiled_code_t *parser_parse_function (parser_context_t *context_p, uint32_t status_flags); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_compiled_code_t *parser_parse_arrow_function (parser_context_t *context_p, uint32_t status_flags); void parser_set_function_name (parser_context_t *context_p, uint16_t function_literal_index, uint16_t name_index, uint32_t status_flags); void parser_compiled_code_set_function_name (parser_context_t *context_p, ecma_compiled_code_t *bytecode_p, uint16_t name_index, uint32_t status_flags); uint16_t parser_check_anonymous_function_declaration (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Error management. */ diff --git a/jerry-core/parser/js/js-parser-module.c b/jerry-core/parser/js/js-parser-module.c index 79cf61968..2e6cc9329 100644 --- a/jerry-core/parser/js/js-parser-module.c +++ b/jerry-core/parser/js/js-parser-module.c @@ -15,7 +15,7 @@ #include "js-parser-internal.h" -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) #include "jcontext.h" #include "jerryscript-port.h" @@ -463,13 +463,13 @@ parser_module_parse_import_clause (parser_context_t *context_p) /**< parser cont parser_raise_error (context_p, PARSER_ERR_IDENTIFIER_EXPECTED); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED); parser_raise_error (context_p, PARSER_ERR_VARIABLE_REDECLARED); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_string_t *import_name_p = NULL; ecma_string_t *local_name_p = NULL; @@ -490,13 +490,13 @@ parser_module_parse_import_clause (parser_context_t *context_p) /**< parser cont parser_raise_error (context_p, PARSER_ERR_IDENTIFIER_EXPECTED); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED); parser_raise_error (context_p, PARSER_ERR_VARIABLE_REDECLARED); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_construct_literal_object (context_p, &context_p->token.lit_location, LEXER_NEW_IDENT_LITERAL); @@ -615,4 +615,4 @@ module_found: lexer_next_token (context_p); } /* parser_module_handle_module_specifier */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ diff --git a/jerry-core/parser/js/js-parser-statm.c b/jerry-core/parser/js/js-parser-statm.c index 9d0c1ef5d..9f609ae68 100644 --- a/jerry-core/parser/js/js-parser-statm.c +++ b/jerry-core/parser/js/js-parser-statm.c @@ -43,12 +43,12 @@ typedef enum { PARSER_STATEMENT_START, PARSER_STATEMENT_BLOCK, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) PARSER_STATEMENT_BLOCK_SCOPE, PARSER_STATEMENT_PRIVATE_SCOPE, PARSER_STATEMENT_BLOCK_CONTEXT, PARSER_STATEMENT_PRIVATE_CONTEXT, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ PARSER_STATEMENT_LABEL, PARSER_STATEMENT_IF, PARSER_STATEMENT_ELSE, @@ -58,9 +58,9 @@ typedef enum PARSER_STATEMENT_WHILE, PARSER_STATEMENT_FOR, PARSER_STATEMENT_FOR_IN, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) PARSER_STATEMENT_FOR_OF, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ PARSER_STATEMENT_WITH, PARSER_STATEMENT_TRY, } parser_statement_type_t; @@ -88,7 +88,7 @@ static const uint8_t parser_statement_flags[] = PARSER_STATM_HAS_BLOCK, /* PARSER_STATEMENT_BLOCK, */ PARSER_STATM_HAS_BLOCK, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* PARSER_STATEMENT_BLOCK_SCOPE, */ PARSER_STATM_HAS_BLOCK, /* PARSER_STATEMENT_PRIVATE_SCOPE, */ @@ -97,7 +97,7 @@ static const uint8_t parser_statement_flags[] = PARSER_STATM_HAS_BLOCK | PARSER_STATM_CONTEXT_BREAK, /* PARSER_STATEMENT_PRIVATE_CONTEXT, */ PARSER_STATM_CONTEXT_BREAK, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* PARSER_STATEMENT_LABEL */ PARSER_STATM_SINGLE_STATM, /* PARSER_STATEMENT_IF */ @@ -116,17 +116,17 @@ static const uint8_t parser_statement_flags[] = PARSER_STATM_BREAK_TARGET | PARSER_STATM_CONTINUE_TARGET | PARSER_STATM_SINGLE_STATM, /* PARSER_STATEMENT_FOR_IN */ PARSER_STATM_BREAK_TARGET | PARSER_STATM_CONTINUE_TARGET | PARSER_STATM_SINGLE_STATM | PARSER_STATM_CONTEXT_BREAK, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* PARSER_STATEMENT_FOR_OF */ PARSER_STATM_BREAK_TARGET | PARSER_STATM_CONTINUE_TARGET | PARSER_STATM_SINGLE_STATM | PARSER_STATM_CONTEXT_BREAK, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* PARSER_STATEMENT_WITH */ PARSER_STATM_CONTEXT_BREAK | PARSER_STATM_SINGLE_STATM, /* PARSER_STATEMENT_TRY */ PARSER_STATM_HAS_BLOCK | PARSER_STATM_CONTEXT_BREAK }; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Block statement. */ @@ -144,7 +144,7 @@ typedef struct parser_branch_t branch; /**< branch to the end */ } parser_block_context_t; -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ /** * Loop statement. @@ -260,7 +260,7 @@ parser_statement_length (uint8_t type) /**< type of statement */ { /* PARSER_STATEMENT_BLOCK */ 1, -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* PARSER_STATEMENT_BLOCK_SCOPE */ (uint8_t) (sizeof (parser_block_statement_t) + 1), /* PARSER_STATEMENT_PRIVATE_SCOPE */ @@ -269,7 +269,7 @@ parser_statement_length (uint8_t type) /**< type of statement */ (uint8_t) (sizeof (parser_block_statement_t) + sizeof (parser_block_context_t) + 1), /* PARSER_STATEMENT_PRIVATE_CONTEXT */ (uint8_t) (sizeof (parser_block_statement_t) + sizeof (parser_block_context_t) + 1), -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* PARSER_STATEMENT_LABEL */ (uint8_t) (sizeof (parser_label_statement_t) + 1), /* PARSER_STATEMENT_IF */ @@ -288,10 +288,10 @@ parser_statement_length (uint8_t type) /**< type of statement */ (uint8_t) (sizeof (parser_for_statement_t) + sizeof (parser_loop_statement_t) + 1), /* PARSER_STATEMENT_FOR_IN */ (uint8_t) (sizeof (parser_for_in_of_statement_t) + sizeof (parser_loop_statement_t) + 1), -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* PARSER_STATEMENT_FOR_OF */ (uint8_t) (sizeof (parser_for_in_of_statement_t) + sizeof (parser_loop_statement_t) + 1), -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* PARSER_STATEMENT_WITH */ (uint8_t) (sizeof (parser_with_statement_t) + 1 + 1), /* PARSER_STATEMENT_TRY */ @@ -365,7 +365,7 @@ parser_parse_enclosed_expr (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); } /* parser_parse_enclosed_expr */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Create a block context. @@ -471,7 +471,7 @@ parser_validate_lexical_context (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_LEXICAL_SINGLE_STATEMENT); } } /* parser_validate_lexical_context */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Parse var statement. @@ -483,18 +483,18 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ || context_p->token.type == LEXER_KEYW_LET || context_p->token.type == LEXER_KEYW_CONST); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint8_t declaration_type = context_p->token.type; if (declaration_type != LEXER_KEYW_VAR) { parser_validate_lexical_context (context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (true) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (lexer_check_next_characters (context_p, LIT_CHAR_LEFT_SQUARE, LIT_CHAR_LEFT_BRACE)) { parser_pattern_flags_t flags = PARSER_PATTERN_BINDING; @@ -512,7 +512,7 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ } else { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_expect_identifier (context_p, LEXER_IDENT_LITERAL); JERRY_ASSERT (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL); @@ -521,11 +521,11 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ parser_line_counter_t ident_line_counter = context_p->token.line; #endif /* ENABLED (JERRY_DEBUGGER) || ENABLED (JERRY_LINE_INFO) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) parser_module_append_export_name (context_p); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (declaration_type != LEXER_KEYW_VAR && context_p->token.keyword_type == LEXER_KEYW_LET) { @@ -537,7 +537,7 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED); parser_raise_error (context_p, PARSER_ERR_VARIABLE_REDECLARED); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); @@ -570,7 +570,7 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ cbc_opcode_t opcode = CBC_ASSIGN_SET_IDENT; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t function_literal_index = parser_check_anonymous_function_declaration (context_p); if (function_literal_index == PARSER_ANONYMOUS_CLASS) @@ -597,11 +597,11 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ opcode = CBC_INIT_CONST; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal (context_p, (uint16_t) opcode, index); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (declaration_type == LEXER_KEYW_LET) { parser_emit_cbc (context_p, CBC_PUSH_UNDEFINED); @@ -622,7 +622,7 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_MISSING_ASSIGN_AFTER_CONST); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_COMMA) { @@ -630,9 +630,9 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ } } -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ } /* parser_parse_var_statement */ /** @@ -643,7 +643,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ { JERRY_ASSERT (context_p->token.type == LEXER_KEYW_FUNCTION); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (parser_statement_flags[context_p->stack_top_uint8] & PARSER_STATM_SINGLE_STATM)) { if (context_p->status_flags & PARSER_IS_STRICT) @@ -689,39 +689,39 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_LEXICAL_SINGLE_STATEMENT); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_DEBUGGER) parser_line_counter_t debugger_line = context_p->token.line; parser_line_counter_t debugger_column = context_p->token.column; #endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool is_generator_function = false; if (lexer_consume_generator (context_p)) { is_generator_function = true; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_expect_identifier (context_p, LEXER_NEW_IDENT_LITERAL); JERRY_ASSERT (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p && context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED) { parser_raise_error (context_p, PARSER_ERR_VARIABLE_REDECLARED); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) uint16_t function_name_index = context_p->lit_object.index; parser_module_append_export_name (context_p); context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ uint32_t status_flags = PARSER_FUNCTION_CLOSURE; @@ -730,7 +730,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ status_flags |= PARSER_HAS_NON_STRICT_ARG; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (is_generator_function) { status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; @@ -740,7 +740,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ { status_flags |= PARSER_IS_ASYNC_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_DEBUGGER) if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) @@ -771,7 +771,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ JERRY_ASSERT (scope_stack_p[1].map_from == PARSER_SCOPE_STACK_FUNC); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(context_p->status_flags & PARSER_IS_STRICT) && (scope_stack_p >= context_p->scope_stack_p + context_p->scope_stack_global_end)) { @@ -822,7 +822,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ parser_pop_block_context (context_p); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_literal_t *literal_p = PARSER_GET_LITERAL ((size_t) scope_stack_p[1].map_to); @@ -839,9 +839,9 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ literal_p->u.bytecode_p = compiled_code_p; literal_p->type = LEXER_FUNCTION_LITERAL; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_compiled_code_set_function_name (context_p, compiled_code_p, function_name_index, 0); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); } /* parser_parse_function_statement */ @@ -1208,7 +1208,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ parser_for_in_of_statement_t for_in_of_statement; scanner_location_t start_location, end_location; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FOR_IN || context_p->next_scanner_info_p->type == SCANNER_TYPE_FOR_OF); @@ -1260,7 +1260,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ } scanner_set_location (context_p, &end_location); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FOR_IN); bool is_for_in = true; @@ -1268,7 +1268,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ scanner_set_location (context_p, &((scanner_location_info_t *) context_p->next_scanner_info_p)->location); scanner_release_next (context_p, sizeof (scanner_location_info_t)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* The length of both 'in' and 'of' is two. */ const uint8_t *source_end_p = context_p->source_p - 2; @@ -1296,12 +1296,12 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->last_cbc_opcode == PARSER_CBC_UNAVAILABLE); for_in_of_statement.start_offset = context_p->byte_code_size; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (has_context) { parser_emit_cbc_ext (context_p, CBC_EXT_CLONE_CONTEXT); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* The expression parser must not read the 'in' or 'of' tokens. */ scanner_get_location (&end_location, context_p); @@ -1311,26 +1311,26 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ context_p->source_end_p = source_end_p; scanner_seek (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (token_type == LEXER_EOS) { lexer_next_token (context_p); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); uint8_t token_type = context_p->token.type; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ switch (token_type) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_LET: case LEXER_KEYW_CONST: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_KEYW_VAR: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (lexer_check_next_characters (context_p, LIT_CHAR_LEFT_SQUARE, LIT_CHAR_LEFT_BRACE)) { parser_emit_cbc_ext (context_p, is_for_in ? CBC_EXT_FOR_IN_GET_NEXT @@ -1357,7 +1357,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ parser_parse_initializer_by_next_char (context_p, flags); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_expect_identifier (context_p, LEXER_IDENT_LITERAL); JERRY_ASSERT (context_p->token.type == LEXER_LITERAL @@ -1368,12 +1368,12 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ if (context_p->token.type == LEXER_ASSIGN) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_IS_STRICT) { parser_raise_error (context_p, PARSER_ERR_FOR_IN_OF_DECLARATION); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_branch_t branch; /* Initialiser is never executed. */ @@ -1385,7 +1385,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ parser_emit_cbc_ext (context_p, is_for_in ? CBC_EXT_FOR_IN_GET_NEXT : CBC_EXT_FOR_OF_GET_NEXT); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #ifndef JERRY_NDEBUG if (literal_index < PARSER_REGISTER_START && has_context @@ -1397,9 +1397,9 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ uint16_t opcode = (has_context ? CBC_ASSIGN_LET_CONST : CBC_ASSIGN_SET_IDENT); parser_emit_cbc_literal (context_p, opcode, literal_index); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal (context_p, CBC_ASSIGN_SET_IDENT, literal_index); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } default: @@ -1427,11 +1427,11 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ if (context_p->token.type != LEXER_EOS) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_raise_error (context_p, is_for_in ? PARSER_ERR_IN_EXPECTED : PARSER_ERR_OF_EXPECTED); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ parser_raise_error (context_p, PARSER_ERR_IN_EXPECTED); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } parser_flush_cbc (context_p); @@ -1443,12 +1443,12 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ parser_stack_push (context_p, &for_in_of_statement, sizeof (parser_for_in_of_statement_t)); parser_stack_push (context_p, &loop, sizeof (parser_loop_statement_t)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_stack_push_uint8 (context_p, is_for_in ? PARSER_STATEMENT_FOR_IN : PARSER_STATEMENT_FOR_OF); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ parser_stack_push_uint8 (context_p, PARSER_STATEMENT_FOR_IN); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_iterator_init (context_p, &context_p->last_statement); return; } @@ -1457,13 +1457,13 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ if (context_p->token.type != LEXER_SEMICOLON) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t *source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ switch (context_p->token.type) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_LITERAL: { if (!lexer_token_is_let (context_p)) @@ -1496,7 +1496,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ } /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_KEYW_VAR: { parser_parse_var_statement (context_p); @@ -1590,7 +1590,7 @@ parser_parse_for_statement_end (parser_context_t *context_p) /**< context */ parser_stack_iterator_skip (&iterator, sizeof (parser_loop_statement_t)); parser_stack_iterator_read (&iterator, &for_statement, sizeof (parser_for_statement_t)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool has_block_context = false; uint8_t next_statement_type; @@ -1612,7 +1612,7 @@ parser_parse_for_statement_end (parser_context_t *context_p) /**< context */ parser_set_continues_to_current_position (context_p, loop.branch_list_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (has_block_context) { parser_emit_cbc_ext (context_p, CBC_EXT_CLONE_FULL_CONTEXT); @@ -1667,7 +1667,7 @@ parser_parse_for_statement_end (parser_context_t *context_p) /**< context */ parser_emit_cbc_backward_branch (context_p, (uint16_t) opcode, for_statement.start_offset); parser_set_breaks_to_current_position (context_p, loop.branch_list_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_CONTEXT) { @@ -1704,12 +1704,12 @@ parser_parse_switch_statement_start (parser_context_t *context_p) /**< context * parser_raise_error (context_p, PARSER_ERR_LEFT_BRACE_EXPECTED); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p - 1) { parser_push_block_context (context_p, true); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (context_p->next_scanner_info_p->source_p == context_p->source_p && context_p->next_scanner_info_p->type == SCANNER_TYPE_SWITCH); @@ -1876,10 +1876,10 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ parser_stack_iterator_skip (&iterator, 1); parser_stack_iterator_read (&iterator, &try_statement, sizeof (parser_try_statement_t)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context_p->scope_stack_top = try_statement.scope_stack_top; context_p->scope_stack_reg_top = try_statement.scope_stack_reg_top; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); @@ -1900,10 +1900,10 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ if (try_statement.type == parser_catch_block) { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) context_p->scope_stack_top = try_statement.scope_stack_top; context_p->scope_stack_reg_top = try_statement.scope_stack_reg_top; -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_KEYW_FINALLY) { @@ -1970,7 +1970,7 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_NO_OPTS); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (lexer_check_next_characters (context_p, LIT_CHAR_LEFT_SQUARE, LIT_CHAR_LEFT_BRACE)) { parser_pattern_flags_t flags = (PARSER_PATTERN_BINDING @@ -1981,28 +1981,28 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ } else { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_expect_identifier (context_p, LEXER_IDENT_LITERAL); JERRY_ASSERT (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t literal_index = context_p->lit_object.index; parser_emit_cbc_literal (context_p, (literal_index >= PARSER_REGISTER_START) ? CBC_ASSIGN_SET_IDENT : CBC_ASSIGN_LET_CONST, literal_index); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal (context_p, CBC_ASSIGN_SET_IDENT, context_p->lit_object.index); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); #ifndef JERRY_NDEBUG JERRY_ASSERT (block_found); #endif /* !JERRY_NDEBUG */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_RIGHT_PAREN) { @@ -2034,7 +2034,7 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ CBC_EXT_FINALLY, &try_statement.branch); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_BLOCK); @@ -2046,7 +2046,7 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_NO_OPTS); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } lexer_next_token (context_p); @@ -2320,7 +2320,7 @@ parser_parse_continue_statement (parser_context_t *context_p) /**< context */ } } /* parser_parse_continue_statement */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) /** * Parse import statement. * Note: See 15.2.2 @@ -2563,7 +2563,7 @@ parser_parse_export_statement (parser_context_t *context_p) /**< context */ parser_module_add_export_node_to_context (context_p); context_p->module_current_node_p = NULL; } /* parser_parse_export_statement */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ /** * Parse label statement. @@ -2715,13 +2715,13 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ } #endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (strict_mode != PARSER_USE_STRICT_NOT_FOUND && (context_p->status_flags & PARSER_FUNCTION_HAS_NON_SIMPLE_PARAM)) { parser_raise_error (context_p, PARSER_ERR_USE_STRICT_NOT_ALLOWED); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type == LEXER_SEMICOLON) { @@ -2754,10 +2754,10 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->stack_depth == context_p->context_stack_depth); #endif /* !JERRY_NDEBUG */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (context_p->stack_top_uint8 != PARSER_STATEMENT_PRIVATE_SCOPE && context_p->stack_top_uint8 != PARSER_STATEMENT_PRIVATE_CONTEXT); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_DEBUGGER) if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED @@ -2815,7 +2815,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->next_scanner_info_p->source_p == context_p->source_p) { parser_push_block_context (context_p, false); @@ -2824,9 +2824,9 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ { parser_stack_push_uint8 (context_p, PARSER_STATEMENT_BLOCK); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ parser_stack_push_uint8 (context_p, PARSER_STATEMENT_BLOCK); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_iterator_init (context_p, &context_p->last_statement); lexer_next_token (context_p); @@ -2834,25 +2834,25 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ } case LEXER_KEYW_VAR: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_LET: case LEXER_KEYW_CONST: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { parser_parse_var_statement (context_p); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_CLASS: { parser_validate_lexical_context (context_p); parser_parse_class (context_p, true); goto consume_last_statement; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) case LEXER_KEYW_IMPORT: { parser_parse_import_statement (context_p); @@ -2864,7 +2864,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ parser_parse_export_statement (context_p); break; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ case LEXER_KEYW_FUNCTION: { @@ -2940,7 +2940,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ CBC_EXT_TRY_CREATE_CONTEXT, &try_statement.branch); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) try_statement.scope_stack_top = context_p->scope_stack_top; try_statement.scope_stack_reg_top = context_p->scope_stack_reg_top; @@ -2955,7 +2955,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_NO_OPTS); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_push (context_p, &try_statement, sizeof (parser_try_statement_t)); parser_stack_push_uint8 (context_p, PARSER_STATEMENT_TRY); @@ -3014,13 +3014,13 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ || context_p->token.type == LEXER_EOS || context_p->token.type == LEXER_RIGHT_BRACE) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) { parser_emit_cbc_ext (context_p, CBC_EXT_RETURN_PROMISE_UNDEFINED); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc (context_p, CBC_RETURN_WITH_BLOCK); break; @@ -3028,13 +3028,13 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ parser_parse_expression (context_p, PARSE_EXPR); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) { parser_emit_cbc_ext (context_p, CBC_EXT_RETURN_PROMISE); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL) { @@ -3071,7 +3071,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (lexer_token_is_let (context_p))) { if (context_p->next_scanner_info_p->source_p == context_p->source_p) @@ -3126,7 +3126,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ continue; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* FALLTHRU */ } @@ -3165,14 +3165,14 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ parser_stack_iterator_init (context_p, &context_p->last_statement); lexer_next_token (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (context_p->stack_top_uint8 == PARSER_STATEMENT_BLOCK_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_BLOCK_CONTEXT) { parser_pop_block_context (context_p); lexer_next_token (context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else if (context_p->stack_top_uint8 == PARSER_STATEMENT_SWITCH || context_p->stack_top_uint8 == PARSER_STATEMENT_SWITCH_NO_DEFAULT) { @@ -3195,13 +3195,13 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ parser_set_breaks_to_current_position (context_p, loop.branch_list_p); lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_CONTEXT) { parser_pop_block_context (context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } else if (context_p->stack_top_uint8 == PARSER_STATEMENT_TRY) { @@ -3291,18 +3291,18 @@ consume_last_statement: } case PARSER_STATEMENT_FOR_IN: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case PARSER_STATEMENT_FOR_OF: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { parser_for_in_of_statement_t for_in_of_statement; parser_loop_statement_t loop; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool is_for_in = (context_p->stack_top_uint8 == PARSER_STATEMENT_FOR_IN); #else bool is_for_in = true; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_pop_uint8 (context_p); parser_stack_pop (context_p, &loop, sizeof (parser_loop_statement_t)); @@ -3328,13 +3328,13 @@ consume_last_statement: parser_set_breaks_to_current_position (context_p, loop.branch_list_p); parser_set_branch_to_current_position (context_p, &for_in_of_statement.branch); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_CONTEXT) { parser_pop_block_context (context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ continue; } @@ -3418,9 +3418,9 @@ parser_free_jumps (parser_stack_iterator_t iterator) /**< iterator position */ case PARSER_STATEMENT_WHILE: case PARSER_STATEMENT_FOR: case PARSER_STATEMENT_FOR_IN: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case PARSER_STATEMENT_FOR_OF: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { parser_loop_statement_t loop; diff --git a/jerry-core/parser/js/js-parser-tagged-template-literal.c b/jerry-core/parser/js/js-parser-tagged-template-literal.c index 3ed96751e..b34f6afb4 100644 --- a/jerry-core/parser/js/js-parser-tagged-template-literal.c +++ b/jerry-core/parser/js/js-parser-tagged-template-literal.c @@ -31,7 +31,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Append the cooked and raw string to the corresponding array */ @@ -143,7 +143,7 @@ parser_tagged_template_literal_finalize (ecma_object_t *template_obj_p, /**< tem parser_tagged_template_literal_freeze_array (template_obj_p); parser_tagged_template_literal_freeze_array (raw_strings_p); } /* parser_tagged_template_literal_finalize */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/parser/js/js-parser-tagged-template-literal.h b/jerry-core/parser/js/js-parser-tagged-template-literal.h index b4fe9a59d..cda003ac1 100644 --- a/jerry-core/parser/js/js-parser-tagged-template-literal.h +++ b/jerry-core/parser/js/js-parser-tagged-template-literal.h @@ -30,7 +30,7 @@ #include "ecma-globals.h" #include "js-parser-internal.h" -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_object_t * parser_new_tagged_template_literal (ecma_object_t **raw_strings_p); @@ -40,7 +40,7 @@ parser_tagged_template_literal_append_strings (parser_context_t *context_p, ecma void parser_tagged_template_literal_finalize (ecma_object_t *template_obj_p, ecma_object_t *raw_strings_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #endif /* ECMA_TAGGED_TEMPLATE_LITERAL_H */ diff --git a/jerry-core/parser/js/js-parser-util.c b/jerry-core/parser/js/js-parser-util.c index 14b56057e..3b7b375a9 100644 --- a/jerry-core/parser/js/js-parser-util.c +++ b/jerry-core/parser/js/js-parser-util.c @@ -838,12 +838,12 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Invalid hexadecimal digit."; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case PARSER_ERR_INVALID_BIN_DIGIT: { return "Invalid binary digit."; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case PARSER_ERR_INVALID_ESCAPE_SEQUENCE: { return "Invalid escape sequence."; @@ -944,7 +944,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Arguments is not allowed to be used here in strict mode."; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case PARSER_ERR_USE_STRICT_NOT_ALLOWED: { return "The 'use strict' directive is not allowed for functions with non-simple arguments."; @@ -965,7 +965,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Duplicate __proto__ fields are not allowed in object literals."; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case PARSER_ERR_DELETE_IDENT_NOT_ALLOWED: { return "Deleting identifier is not allowed in strict mode."; @@ -1122,7 +1122,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Non-strict argument definition."; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case PARSER_ERR_VARIABLE_REDECLARED: { return "Local variable is redeclared."; @@ -1211,8 +1211,8 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "new.target expression is not allowed here."; } -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_MODULE_SYSTEM) case PARSER_ERR_FILE_NOT_FOUND: { return "Requested module not found."; @@ -1257,7 +1257,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Duplicated imported binding name."; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ default: { diff --git a/jerry-core/parser/js/js-parser.c b/jerry-core/parser/js/js-parser.c index fe0c9680f..254ee355e 100644 --- a/jerry-core/parser/js/js-parser.c +++ b/jerry-core/parser/js/js-parser.c @@ -26,7 +26,7 @@ JERRY_STATIC_ASSERT ((int) ECMA_PARSE_STRICT_MODE == (int) PARSER_IS_STRICT, ecma_parse_strict_mode_must_be_equal_to_parser_is_strict); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_STATIC_ASSERT (PARSER_SAVE_STATUS_FLAGS (PARSER_ALLOW_SUPER) == 0x1, incorrect_saving_of_ecma_parse_allow_super); JERRY_STATIC_ASSERT (PARSER_RESTORE_STATUS_FLAGS (ECMA_PARSE_ALLOW_SUPER) == PARSER_ALLOW_SUPER, @@ -34,7 +34,7 @@ JERRY_STATIC_ASSERT (PARSER_RESTORE_STATUS_FLAGS (ECMA_PARSE_ALLOW_SUPER) == PAR JERRY_STATIC_ASSERT (PARSER_RESTORE_STATUS_FLAGS (ECMA_PARSE_FUNCTION_CONTEXT) == 0, ecma_parse_function_context_must_not_be_transformed); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** \addtogroup parser Parser * @{ @@ -539,12 +539,12 @@ parse_print_literal (ecma_compiled_code_t *compiled_code_p, /**< compiled code * ident_end = args_p->ident_end; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (compiled_code_p->status_flags & CBC_CODE_FLAGS_REST_PARAMETER) { argument_end++; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (literal_index < argument_end) { @@ -674,7 +674,7 @@ parse_print_final_cbc (ecma_compiled_code_t *compiled_code_p, /**< compiled code JERRY_DEBUG_MSG (",no_lexical_env"); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (compiled_code_p->status_flags & CBC_CODE_FLAGS_ARROW_FUNCTION) { JERRY_DEBUG_MSG (",arrow"); @@ -689,7 +689,7 @@ parse_print_final_cbc (ecma_compiled_code_t *compiled_code_p, /**< compiled code { JERRY_DEBUG_MSG (",generator"); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_DEBUG_MSG ("]\n"); @@ -923,7 +923,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ ecma_value_t *literal_pool_p; uint8_t *dst_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if ((context_p->status_flags & (PARSER_IS_FUNCTION | PARSER_LEXICAL_BLOCK_NEEDED)) == (PARSER_IS_FUNCTION | PARSER_LEXICAL_BLOCK_NEEDED)) { @@ -940,7 +940,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ parser_stack_pop (context_p, &branch, sizeof (parser_branch_t)); parser_set_branch_to_current_position (context_p, &branch); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (context_p->stack_depth == 0); #ifndef JERRY_NDEBUG @@ -1022,13 +1022,13 @@ parser_post_processing (parser_context_t *context_p) /**< context */ PARSER_NEXT_BYTE (page_p, offset); length++; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ext_opcode == CBC_EXT_RETURN_PROMISE || ext_opcode == CBC_EXT_RETURN_PROMISE_UNDEFINED) { last_opcode = CBC_RETURN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_LINE_INFO) if (ext_opcode == CBC_EXT_LINE) @@ -1166,12 +1166,12 @@ parser_post_processing (parser_context_t *context_p) /**< context */ { context_p->status_flags &= (uint32_t) ~PARSER_NO_END_LABEL; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) { length++; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ length++; } @@ -1196,7 +1196,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ total_size += context_p->argument_count * sizeof (ecma_value_t); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* function.name */ if (!(context_p->status_flags & PARSER_CLASS_CONSTRUCTOR)) { @@ -1207,7 +1207,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ { total_size += sizeof (ecma_value_t); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_RESOURCE_NAME) if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED) @@ -1240,13 +1240,13 @@ parser_post_processing (parser_context_t *context_p) /**< context */ compiled_code_p->refs = 1; compiled_code_p->status_flags = CBC_CODE_FLAGS_FUNCTION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_FUNCTION_HAS_REST_PARAM) { JERRY_ASSERT (context_p->argument_count > 0); context_p->argument_count--; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (needs_uint16_arguments) { @@ -1316,7 +1316,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ compiled_code_p->status_flags |= CBC_CODE_FLAGS_LEXICAL_ENV_NOT_NEEDED; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & (PARSER_IS_PROPERTY_GETTER | PARSER_IS_PROPERTY_SETTER)) { compiled_code_p->status_flags |= CBC_CODE_FLAGS_ACCESSOR; @@ -1352,7 +1352,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ JERRY_ASSERT (!(context_p->status_flags & PARSER_IS_FUNCTION)); compiled_code_p->status_flags |= CBC_CODE_FLAGS_LEXICAL_BLOCK_NEEDED; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ literal_pool_p = ((ecma_value_t *) byte_code_p) - context_p->register_count; byte_code_p += literal_length; @@ -1543,14 +1543,14 @@ parser_post_processing (parser_context_t *context_p) /**< context */ { *dst_p++ = CBC_RETURN_WITH_BLOCK; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) { dst_p[-1] = CBC_EXT_OPCODE; dst_p[0] = CBC_EXT_RETURN_PROMISE_UNDEFINED; dst_p++; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } JERRY_ASSERT (dst_p == byte_code_p + length); @@ -1640,12 +1640,12 @@ parser_post_processing (parser_context_t *context_p) /**< context */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (!(context_p->status_flags & PARSER_CLASS_CONSTRUCTOR)) { *(--base_p) = ECMA_VALUE_EMPTY; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_RESOURCE_NAME) if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED) @@ -1654,12 +1654,12 @@ parser_post_processing (parser_context_t *context_p) /**< context */ } #endif /* ENABLED (JERRY_RESOURCE_NAME) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->tagged_template_literal_cp != JMEM_CP_NULL) { base_p[-1] = (ecma_value_t) context_p->tagged_template_literal_cp; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_DEBUGGER) if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) @@ -1701,7 +1701,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (context_p->status_flags & PARSER_IS_FUNCTION); JERRY_ASSERT (!(context_p->status_flags & PARSER_LEXICAL_BLOCK_NEEDED)); @@ -1713,11 +1713,11 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ { context_p->status_flags &= (uint32_t) ~PARSER_IS_ASYNC_FUNCTION; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type == end_type) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_IS_GENERATOR_FUNCTION) { parser_emit_cbc_ext (context_p, CBC_EXT_CREATE_GENERATOR); @@ -1725,25 +1725,25 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ } context_p->status_flags &= (uint32_t) ~PARSER_DISALLOW_AWAIT_YIELD; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_NO_OPTS); return; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) bool has_mapped_arguments = (context_p->next_scanner_info_p->u8_arg & SCANNER_FUNCTION_MAPPED_ARGUMENTS) != 0; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_IS_FUNCTION_ARGS); scanner_set_active (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context_p->status_flags |= PARSER_FUNCTION_IS_PARSING_ARGS; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (true) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_FUNCTION_HAS_REST_PARAM) { parser_raise_error (context_p, PARSER_ERR_FORMAL_PARAM_AFTER_REST_PARAMETER); @@ -1810,7 +1810,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -1829,14 +1829,14 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ if (JERRY_UNLIKELY (context_p->lit_object.literal_p->status_flags & LEXER_FLAG_FUNCTION_ARGUMENT)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if ((context_p->status_flags & PARSER_FUNCTION_HAS_NON_SIMPLE_PARAM) || (context_p->status_flags & PARSER_IS_ARROW_FUNCTION)) { parser_raise_error (context_p, PARSER_ERR_DUPLICATED_ARGUMENT_NAMES); } has_duplicated_arg_names = true; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context_p->status_flags |= PARSER_HAS_NON_STRICT_ARG; } @@ -1847,7 +1847,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t literal_index = context_p->lit_object.index; if (context_p->token.type == LEXER_ASSIGN) @@ -1906,7 +1906,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ (uint16_t) (PARSER_REGISTER_START + context_p->argument_count), literal_index); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context_p->argument_count++; if (context_p->argument_count >= PARSER_MAXIMUM_NUMBER_OF_REGISTERS) @@ -1932,7 +1932,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ scanner_revert_active (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (!has_mapped_arguments || !(context_p->status_flags & PARSER_FUNCTION_HAS_NON_SIMPLE_PARAM)); if (context_p->status_flags & PARSER_IS_GENERATOR_FUNCTION) @@ -1963,7 +1963,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ } context_p->status_flags &= (uint32_t) ~(PARSER_DISALLOW_AWAIT_YIELD | PARSER_FUNCTION_IS_PARSING_ARGS); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_IS_FUNCTION_BODY); } /* parser_parse_function_arguments */ @@ -2004,18 +2004,18 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ if (arg_list_p != NULL) { context.status_flags |= PARSER_IS_FUNCTION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (parse_opts & ECMA_PARSE_GENERATOR_FUNCTION) { context.status_flags |= PARSER_IS_GENERATOR_FUNCTION; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context.status_flags |= PARSER_RESTORE_STATUS_FLAGS (parse_opts); context.tagged_template_literal_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context.stack_depth = 0; context.stack_limit = 0; @@ -2050,10 +2050,10 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ context.scope_stack_size = 0; context.scope_stack_top = 0; context.scope_stack_reg_top = 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context.scope_stack_global_end = 0; context.tagged_template_literal_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #ifndef JERRY_NDEBUG context.context_stack_depth = 0; @@ -2112,14 +2112,14 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ context.breakpoint_info_count = 0; #endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (context.global_status_flags & ECMA_PARSE_MODULE) { context.status_flags |= PARSER_IS_STRICT; } context.module_current_node_p = NULL; -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ PARSER_TRY (context.try_buffer) { @@ -2145,18 +2145,18 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ lexer_next_token (&context); } -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) else if (parse_opts & ECMA_PARSE_MODULE) { scanner_create_variables (&context, SCANNER_CREATE_VARS_NO_OPTS); } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ else { JERRY_ASSERT (context.next_scanner_info_p->source_p == source_p && context.next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (scanner_is_context_needed (&context, PARSER_CHECK_GLOBAL_CONTEXT)) { context.status_flags |= PARSER_LEXICAL_BLOCK_NEEDED; @@ -2166,7 +2166,7 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ { scanner_check_variables (&context); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_create_variables (&context, SCANNER_CREATE_VARS_IS_SCRIPT); } @@ -2219,7 +2219,7 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ scanner_cleanup (&context); -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (context.module_current_node_p != NULL) { ecma_module_release_module_nodes (context.module_current_node_p); @@ -2276,12 +2276,12 @@ parser_save_context (parser_context_t *context_p, /**< context */ } #endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_FUNCTION_IS_PARSING_ARGS) { context_p->status_flags |= PARSER_LEXICAL_BLOCK_NEEDED; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Save private part of the context. */ @@ -2302,10 +2302,10 @@ parser_save_context (parser_context_t *context_p, /**< context */ saved_context_p->scope_stack_size = context_p->scope_stack_size; saved_context_p->scope_stack_top = context_p->scope_stack_top; saved_context_p->scope_stack_reg_top = context_p->scope_stack_reg_top; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) saved_context_p->scope_stack_global_end = context_p->scope_stack_global_end; saved_context_p->tagged_template_literal_cp = context_p->tagged_template_literal_cp; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #ifndef JERRY_NDEBUG saved_context_p->context_stack_depth = context_p->context_stack_depth; @@ -2330,10 +2330,10 @@ parser_save_context (parser_context_t *context_p, /**< context */ context_p->scope_stack_size = 0; context_p->scope_stack_top = 0; context_p->scope_stack_reg_top = 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context_p->scope_stack_global_end = 0; context_p->tagged_template_literal_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #ifndef JERRY_NDEBUG context_p->context_stack_depth = 0; @@ -2375,10 +2375,10 @@ parser_restore_context (parser_context_t *context_p, /**< context */ context_p->scope_stack_size = saved_context_p->scope_stack_size; context_p->scope_stack_top = saved_context_p->scope_stack_top; context_p->scope_stack_reg_top = saved_context_p->scope_stack_reg_top; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context_p->scope_stack_global_end = saved_context_p->scope_stack_global_end; context_p->tagged_template_literal_cp = saved_context_p->tagged_template_literal_cp; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #ifndef JERRY_NDEBUG context_p->context_stack_depth = saved_context_p->context_stack_depth; @@ -2400,20 +2400,20 @@ parser_parse_function (parser_context_t *context_p, /**< context */ JERRY_ASSERT (status_flags & PARSER_IS_FUNCTION); parser_save_context (context_p, &saved_context); context_p->status_flags |= status_flags; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) context_p->status_flags |= PARSER_ALLOW_NEW_TARGET; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) if (context_p->is_show_opcodes) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_DEBUG_MSG ("\n--- %s parsing start ---\n\n", (context_p->status_flags & PARSER_CLASS_CONSTRUCTOR) ? "Class constructor" : "Function"); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_DEBUG_MSG ("\n--- Function parsing start ---\n\n"); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } #endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ @@ -2468,13 +2468,13 @@ parser_parse_function (parser_context_t *context_p, /**< context */ #if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) if (context_p->is_show_opcodes) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_DEBUG_MSG ("\n--- %s parsing end ---\n\n", (context_p->status_flags & PARSER_CLASS_CONSTRUCTOR) ? "Class constructor" : "Function"); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_DEBUG_MSG ("\n--- Function parsing end ---\n\n"); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } #endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ @@ -2483,7 +2483,7 @@ parser_parse_function (parser_context_t *context_p, /**< context */ return compiled_code_p; } /* parser_parse_function */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Parse arrow function code @@ -2712,7 +2712,7 @@ parser_compiled_code_set_function_name (parser_context_t *context_p, /**< contex } } /* parser_compiled_code_set_function_name */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Raise a parse error. @@ -2749,24 +2749,24 @@ parser_raise_error (parser_context_t *context_p, /**< context */ parser_free_jumps (saved_context_p->last_statement); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (saved_context_p->tagged_template_literal_cp != JMEM_CP_NULL) { ecma_collection_free (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, saved_context_p->tagged_template_literal_cp)); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ saved_context_p = saved_context_p->prev_context_p; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->tagged_template_literal_cp != JMEM_CP_NULL) { ecma_collection_free (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, context_p->tagged_template_literal_cp)); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ context_p->error = error; PARSER_THROW (context_p->try_buffer); @@ -2816,7 +2816,7 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ if (!*bytecode_data_p) { -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (JERRY_CONTEXT (module_top_context_p) != NULL) { ecma_module_cleanup (); @@ -2870,7 +2870,7 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ #endif /* ENABLED (JERRY_ERROR_MESSAGES) */ } -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (JERRY_CONTEXT (module_top_context_p) != NULL) { ecma_value_t ret_value = ecma_module_parse_modules (); @@ -2884,7 +2884,7 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ return ret_value; } } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ #if ENABLED (JERRY_DEBUGGER) if ((JERRY_CONTEXT (debugger_flags) & (JERRY_DEBUGGER_CONNECTED | JERRY_DEBUGGER_PARSER_WAIT)) diff --git a/jerry-core/parser/js/js-parser.h b/jerry-core/parser/js/js-parser.h index c883ac09f..22a1f6eeb 100644 --- a/jerry-core/parser/js/js-parser.h +++ b/jerry-core/parser/js/js-parser.h @@ -44,9 +44,9 @@ typedef enum PARSER_ERR_INVALID_CHARACTER, /**< unexpected character */ PARSER_ERR_INVALID_OCTAL_DIGIT, /**< invalid octal digit */ PARSER_ERR_INVALID_HEX_DIGIT, /**< invalid hexadecimal digit */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) PARSER_ERR_INVALID_BIN_DIGIT, /**< invalid binary digit */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ PARSER_ERR_INVALID_ESCAPE_SEQUENCE, /**< invalid escape sequence */ PARSER_ERR_INVALID_UNICODE_ESCAPE_SEQUENCE, /**< invalid unicode escape sequence */ PARSER_ERR_INVALID_IDENTIFIER_START, /**< character cannot be start of an identifier */ @@ -77,13 +77,13 @@ typedef enum PARSER_ERR_STRICT_IDENT_NOT_ALLOWED, /**< identifier name is reserved in strict mode */ PARSER_ERR_EVAL_NOT_ALLOWED, /**< eval is not allowed here in strict mode */ PARSER_ERR_ARGUMENTS_NOT_ALLOWED, /**< arguments is not allowed here in strict mode */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) PARSER_ERR_USE_STRICT_NOT_ALLOWED, /**< use strict directive is not allowed */ PARSER_ERR_YIELD_NOT_ALLOWED, /**< yield expression is not allowed */ PARSER_ERR_AWAIT_NOT_ALLOWED, /**< await expression is not allowed */ PARSER_ERR_FOR_IN_OF_DECLARATION, /**< variable declaration in for-in or for-of loop */ PARSER_ERR_DUPLICATED_PROTO, /**< duplicated __proto__ fields are not allowed */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ PARSER_ERR_DELETE_IDENT_NOT_ALLOWED, /**< identifier delete is not allowed in strict mode */ PARSER_ERR_EVAL_CANNOT_ASSIGNED, /**< eval cannot be assigned in strict mode */ PARSER_ERR_ARGUMENTS_CANNOT_ASSIGNED, /**< arguments cannot be assigned in strict mode */ @@ -125,7 +125,7 @@ typedef enum PARSER_ERR_INVALID_RIGHT_SQUARE, /**< right square must terminate a block */ PARSER_ERR_DUPLICATED_LABEL, /**< duplicated label */ PARSER_ERR_OBJECT_PROPERTY_REDEFINED, /**< property of object literal redefined */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) PARSER_ERR_VARIABLE_REDECLARED, /**< a variable redeclared */ PARSER_ERR_LEXICAL_SINGLE_STATEMENT, /**< lexical declaration in single statement context */ PARSER_ERR_LABELLED_FUNC_NOT_IN_BLOCK, /**< labelled functions are only allowed inside blocks */ @@ -151,8 +151,8 @@ typedef enum PARSER_ERR_INVALID_EXPONENTIATION, /**< left operand of ** operator cannot be unary expression */ PARSER_ERR_NEW_TARGET_EXPECTED, /**< expected new.target expression */ PARSER_ERR_NEW_TARGET_NOT_ALLOWED, /**< new.target is not allowed in the given context */ -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_MODULE_SYSTEM) PARSER_ERR_FILE_NOT_FOUND, /**< file not found*/ PARSER_ERR_FROM_EXPECTED, /**< from expected */ PARSER_ERR_FROM_COMMA_EXPECTED, /**< from or comma expected */ @@ -164,7 +164,7 @@ typedef enum PARSER_ERR_RIGHT_BRACE_COMMA_EXPECTED, /**< right brace or comma expected */ PARSER_ERR_DUPLICATED_EXPORT_IDENTIFIER, /**< duplicated export identifier name */ PARSER_ERR_DUPLICATED_IMPORT_BINDING, /**< duplicated import binding name */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ PARSER_ERR_NON_STRICT_ARG_DEFINITION /**< non-strict argument definition */ } parser_error_t; diff --git a/jerry-core/parser/js/js-scanner-internal.h b/jerry-core/parser/js/js-scanner-internal.h index 3dbaf97a8..cad703391 100644 --- a/jerry-core/parser/js/js-scanner-internal.h +++ b/jerry-core/parser/js/js-scanner-internal.h @@ -41,12 +41,12 @@ typedef enum SCAN_MODE_VAR_STATEMENT, /**< scanning var statement */ SCAN_MODE_PROPERTY_NAME, /**< scanning property name */ SCAN_MODE_FUNCTION_ARGUMENTS, /**< scanning function arguments */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCAN_MODE_CONTINUE_FUNCTION_ARGUMENTS, /**< continue scanning function arguments */ SCAN_MODE_BINDING, /**< array or object binding */ SCAN_MODE_CLASS_DECLARATION, /**< scanning class declaration */ SCAN_MODE_CLASS_METHOD, /**< scanning class method */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scan_modes_t; /** @@ -60,9 +60,9 @@ typedef enum SCAN_STACK_FUNCTION_STATEMENT, /**< function statement */ SCAN_STACK_FUNCTION_EXPRESSION, /**< function expression */ SCAN_STACK_FUNCTION_PROPERTY, /**< function expression in an object literal or class */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCAN_STACK_FUNCTION_ARROW, /**< arrow function expression */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ SCAN_STACK_SWITCH_BLOCK, /**< block part of "switch" statement */ SCAN_STACK_IF_STATEMENT, /**< statement part of "if" statements */ SCAN_STACK_WITH_STATEMENT, /**< statement part of "with" statements */ @@ -72,19 +72,19 @@ typedef enum SCAN_STACK_WHILE_EXPRESSION, /**< expression part of "while" iterator */ SCAN_STACK_PAREN_EXPRESSION, /**< expression in brackets */ SCAN_STACK_STATEMENT_WITH_EXPR, /**< statement which starts with expression enclosed in brackets */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCAN_STACK_BINDING_INIT, /**< post processing after a single initializer */ SCAN_STACK_BINDING_LIST_INIT, /**< post processing after an initializer list */ SCAN_STACK_LET, /**< let statement */ SCAN_STACK_CONST, /**< const statement */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* The SCANNER_IS_FOR_START macro needs to be updated when the following constants are reordered. */ SCAN_STACK_VAR, /**< var statement */ SCAN_STACK_FOR_VAR_START, /**< start of "for" iterator with var statement */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCAN_STACK_FOR_LET_START, /**< start of "for" iterator with let statement */ SCAN_STACK_FOR_CONST_START, /**< start of "for" iterator with const statement */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ SCAN_STACK_FOR_START, /**< start of "for" iterator */ SCAN_STACK_FOR_CONDITION, /**< condition part of "for" iterator */ SCAN_STACK_FOR_EXPRESSION, /**< expression part of "for" iterator */ @@ -96,7 +96,7 @@ typedef enum SCAN_STACK_ARRAY_LITERAL, /**< array literal or destructuring assignment or binding */ SCAN_STACK_OBJECT_LITERAL, /**< object literal group */ SCAN_STACK_PROPERTY_ACCESSOR, /**< property accessor in square brackets */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* These four must be in this order. */ SCAN_STACK_COMPUTED_PROPERTY, /**< computed property name */ SCAN_STACK_COMPUTED_GENERATOR, /**< computed generator function */ @@ -115,7 +115,7 @@ typedef enum SCAN_STACK_CLASS_EXTENDS, /**< class extends expression */ SCAN_STACK_FUNCTION_PARAMETERS, /**< function parameter initializer */ SCAN_STACK_USE_ASYNC, /**< an "async" identifier is used */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scan_stack_modes_t; /** @@ -124,9 +124,9 @@ typedef enum typedef enum { SCANNER_CONTEXT_NO_FLAGS = 0, /**< no flags are set */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_CONTEXT_THROW_ERR_ASYNC_FUNCTION = (1 << 0), /**< throw async function error */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_DEBUGGER) SCANNER_CONTEXT_DEBUGGER_ENABLED = (1 << 1), /**< debugger is enabled */ #endif /* ENABLED (JERRY_DEBUGGER) */ @@ -161,24 +161,24 @@ typedef enum { SCANNER_LITERAL_IS_ARG = (1 << 0), /**< literal is argument */ SCANNER_LITERAL_IS_VAR = (1 << 1), /**< literal is var */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** literal is a destructured argument binding of a possible arrow function */ SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG = SCANNER_LITERAL_IS_VAR, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ SCANNER_LITERAL_IS_FUNC = (1 << 2), /**< literal is function */ SCANNER_LITERAL_NO_REG = (1 << 3), /**< literal cannot be stored in a register */ SCANNER_LITERAL_IS_LET = (1 << 4), /**< literal is let */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** literal is a function declared in this block (prevents declaring let/const with the same name) */ SCANNER_LITERAL_IS_FUNC_DECLARATION = SCANNER_LITERAL_IS_LET, -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ SCANNER_LITERAL_IS_CONST = (1 << 5), /**< literal is const */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** literal is a destructured argument binding */ SCANNER_LITERAL_IS_DESTRUCTURED_ARG = SCANNER_LITERAL_IS_CONST, SCANNER_LITERAL_IS_USED = (1 << 6), /**< literal is used */ SCANNER_LITERAL_EARLY_CREATE = (1 << 7), /**< binding should be created early with ECMA_VALUE_UNINITIALIZED */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scanner_literal_type_flags_t; /* @@ -222,7 +222,7 @@ typedef struct scanner_case_info_t **last_case_p; /**< last case info */ } scanner_switch_statement_t; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Types of scanner destructuring bindings. @@ -263,7 +263,7 @@ typedef struct scanner_binding_list_t bool is_nested; /**< is nested binding declaration */ } scanner_binding_list_t; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Flags for scanner_literal_pool_t structure. @@ -275,19 +275,19 @@ typedef enum SCANNER_LITERAL_POOL_IS_STRICT = (1 << 2), /**< literal pool represents a strict mode code block */ SCANNER_LITERAL_POOL_CAN_EVAL = (1 << 3), /**< prepare for executing eval in this block */ SCANNER_LITERAL_POOL_NO_ARGUMENTS = (1 << 4), /**< arguments object must not be constructed */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_LITERAL_POOL_ARGUMENTS_UNMAPPED = (1 << 5), /**< arguments object should be unmapped */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ SCANNER_LITERAL_POOL_IN_WITH = (1 << 6), /**< literal pool is in a with statement */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) SCANNER_LITERAL_POOL_IN_EXPORT = (1 << 7), /**< the declared variables are exported by the module system */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ -#if ENABLED (JERRY_ES2015) +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#if ENABLED (JERRY_ESNEXT) SCANNER_LITERAL_POOL_FUNCTION_STATEMENT = (1 << 8), /**< function statement */ SCANNER_LITERAL_POOL_GENERATOR = (1 << 9), /**< generator function */ SCANNER_LITERAL_POOL_ASYNC = (1 << 10), /**< async function */ SCANNER_LITERAL_POOL_ASYNC_ARROW = (1 << 11), /**< can be an async arrow function */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scanner_literal_pool_flags_t; /** @@ -327,27 +327,27 @@ struct scanner_context_t { uint32_t context_status_flags; /**< original status flags of the context */ uint8_t mode; /**< scanner mode */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint8_t binding_type; /**< current destructuring binding type */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint16_t status_flags; /**< scanner status flags */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_binding_list_t *active_binding_list_p; /**< currently active binding list */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_literal_pool_t *active_literal_pool_p; /**< currently active literal pool */ scanner_switch_statement_t active_switch_statement; /**< currently active switch statement */ scanner_info_t *end_arguments_p; /**< position of end arguments */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t *async_source_p; /**< source position for async functions */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ }; /* Scanner utils. */ void scanner_raise_error (parser_context_t *context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void scanner_raise_redeclaration_error (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ void *scanner_malloc (parser_context_t *context_p, size_t size); void scanner_free (void *ptr, size_t size); @@ -359,34 +359,34 @@ scanner_info_t *scanner_insert_info_before (parser_context_t *context_p, const u scanner_literal_pool_t *scanner_push_literal_pool (parser_context_t *context_p, scanner_context_t *scanner_context_p, uint16_t status_flags); void scanner_pop_literal_pool (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void scanner_construct_global_block (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ void scanner_filter_arguments (parser_context_t *context_p, scanner_context_t *scanner_context_p); lexer_lit_location_t *scanner_add_custom_literal (parser_context_t *context_p, scanner_literal_pool_t *literal_pool_p, const lexer_lit_location_t *literal_location_p); lexer_lit_location_t *scanner_add_literal (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_add_reference (parser_context_t *context_p, scanner_context_t *scanner_context_p); lexer_lit_location_t *scanner_append_argument (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void scanner_detect_invalid_var (parser_context_t *context_p, scanner_context_t *scanner_context_p, lexer_lit_location_t *var_literal_p); void scanner_detect_invalid_let (parser_context_t *context_p, lexer_lit_location_t *let_literal_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ void scanner_detect_eval_call (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void scanner_push_class_declaration (parser_context_t *context_p, scanner_context_t *scanner_context_p, uint8_t stack_mode); void scanner_push_destructuring_pattern (parser_context_t *context_p, scanner_context_t *scanner_context_p, uint8_t binding_type, bool is_nested); void scanner_pop_binding_list (scanner_context_t *scanner_context_p); void scanner_append_hole (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Scanner operations. */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) void scanner_add_async_literal (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_check_arrow (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_scan_simple_arrow (parser_context_t *context_p, scanner_context_t *scanner_context_p, @@ -394,7 +394,7 @@ void scanner_scan_simple_arrow (parser_context_t *context_p, scanner_context_t * void scanner_check_arrow_arg (parser_context_t *context_p, scanner_context_t *scanner_context_p); bool scanner_check_async_function (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_check_function_after_if (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ void scanner_scan_bracket (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_check_directives (parser_context_t *context_p, scanner_context_t *scanner_context_p); diff --git a/jerry-core/parser/js/js-scanner-ops.c b/jerry-core/parser/js/js-scanner-ops.c index 325b3786d..c789f2522 100644 --- a/jerry-core/parser/js/js-scanner-ops.c +++ b/jerry-core/parser/js/js-scanner-ops.c @@ -29,7 +29,7 @@ * @{ */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Add the "async" literal to the literal pool. @@ -343,7 +343,7 @@ typedef enum SCANNER_SCAN_BRACKET_ARROW_WITH_ONE_ARG, /**< arrow function with one argument */ } scanner_scan_bracket_arrow_type_t; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Scan bracketed expressions. @@ -353,19 +353,19 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ scanner_context_t *scanner_context_p) /**< scanner context */ { size_t depth = 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t *arrow_source_p; const uint8_t *async_source_p = NULL; scanner_scan_bracket_arrow_type_t arrow_type = SCANNER_SCAN_BRACKET_NO_ARROW; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (context_p->token.type == LEXER_LEFT_PAREN); do { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) arrow_source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ depth++; lexer_next_token (context_p); } @@ -379,13 +379,13 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ { if (context_p->token.lit_location.type != LEXER_IDENT_LITERAL) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) arrow_source_p = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t *source_p = context_p->source_p; if (lexer_check_arrow (context_p)) @@ -396,7 +396,7 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ } size_t total_depth = depth; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (depth > 0 && lexer_check_next_character (context_p, LIT_CHAR_RIGHT_PAREN)) { @@ -407,16 +407,16 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ if (context_p->token.keyword_type == LEXER_KEYW_EVAL && lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* A function call cannot be an eval function. */ arrow_source_p = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_context_p->active_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_CAN_EVAL; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (total_depth == depth) { if (lexer_check_arrow_param (context_p)) @@ -446,10 +446,10 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ } arrow_source_p = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_THREE_DOTS: case LEXER_LEFT_SQUARE: case LEXER_LEFT_BRACE: @@ -459,23 +459,23 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ depth--; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) arrow_source_p = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (scanner_context_p->async_source_p != NULL) && (arrow_source_p == NULL || depth > 0)) { scanner_context_p->async_source_p = NULL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (depth > 0) { @@ -483,7 +483,7 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ depth--; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (arrow_source_p != NULL) { JERRY_ASSERT (async_source_p == NULL); @@ -531,7 +531,7 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ scanner_context_p->async_source_p = async_source_p; scanner_check_async_function (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* scanner_scan_bracket */ /** diff --git a/jerry-core/parser/js/js-scanner-util.c b/jerry-core/parser/js/js-scanner-util.c index 2e401d0dd..88793f1f2 100644 --- a/jerry-core/parser/js/js-scanner-util.c +++ b/jerry-core/parser/js/js-scanner-util.c @@ -34,7 +34,7 @@ JERRY_STATIC_ASSERT (PARSER_MAXIMUM_NUMBER_OF_LITERALS + PARSER_MAXIMUM_NUMBER_OF_REGISTERS < PARSER_REGISTER_START, maximum_number_of_literals_plus_registers_must_be_less_than_register_start); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_STATIC_ASSERT ((SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG & SCANNER_LITERAL_IS_LOCAL) == 0, is_arrow_arg_binding_flag_must_not_use_local_flags); @@ -57,7 +57,7 @@ JERRY_STATIC_ASSERT (SCANNER_LITERAL_IS_FUNC_DECLARATION != SCANNER_LITERAL_IS_D JERRY_STATIC_ASSERT (PARSER_SCOPE_STACK_IS_CONST_REG == PARSER_SCOPE_STACK_IS_LOCAL_CREATED, scope_stack_is_const_reg_and_scope_stack_is_local_created_must_be_the_same); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Raise a scanner error. @@ -70,7 +70,7 @@ scanner_raise_error (parser_context_t *context_p) /**< context */ JERRY_ASSERT (0); } /* scanner_raise_error */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Raise a variable redeclaration error. @@ -84,7 +84,7 @@ scanner_raise_redeclaration_error (parser_context_t *context_p) /**< context */ scanner_raise_error (context_p); } /* scanner_raise_redeclaration_error */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Allocate memory for scanner. @@ -138,24 +138,24 @@ scanner_get_stream_size (scanner_info_t *info_p, /**< scanner info block */ switch (data_p[0] & SCANNER_STREAM_TYPE_MASK) { case SCANNER_STREAM_TYPE_VAR: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_LET: case SCANNER_STREAM_TYPE_CONST: case SCANNER_STREAM_TYPE_LOCAL: -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_MODULE_SYSTEM) case SCANNER_STREAM_TYPE_IMPORT: -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ case SCANNER_STREAM_TYPE_ARG: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_ARG_VAR: case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG: case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR: -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ case SCANNER_STREAM_TYPE_ARG_FUNC: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCANNER_STREAM_TYPE_FUNC: { break; @@ -404,17 +404,17 @@ scanner_push_literal_pool (parser_context_t *context_p, /**< context */ JERRY_ASSERT (prev_literal_pool_p != NULL); status_flags |= SCANNER_LITERAL_POOL_NO_ARGUMENTS; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint16_t copied_flags = (SCANNER_LITERAL_POOL_IN_WITH | SCANNER_LITERAL_POOL_GENERATOR | SCANNER_LITERAL_POOL_ASYNC); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ const uint16_t copied_flags = SCANNER_LITERAL_POOL_IN_WITH; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ status_flags |= (uint16_t) (prev_literal_pool_p->status_flags & copied_flags); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else { context_p->status_flags &= (uint32_t) ~(PARSER_IS_GENERATOR_FUNCTION | PARSER_IS_ASYNC_FUNCTION); @@ -429,7 +429,7 @@ scanner_push_literal_pool (parser_context_t *context_p, /**< context */ context_p->status_flags |= PARSER_IS_ASYNC_FUNCTION; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (prev_literal_pool_p != NULL) { @@ -493,12 +493,12 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ == SCANNER_LITERAL_POOL_CAN_EVAL); uint8_t can_eval_types = 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (prev_literal_pool_p == NULL && !(context_p->global_status_flags & ECMA_PARSE_DIRECT_EVAL)) { can_eval_types |= SCANNER_LITERAL_IS_FUNC; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if ((status_flags & SCANNER_LITERAL_POOL_CAN_EVAL) && prev_literal_pool_p != NULL) { @@ -545,7 +545,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if ((status_flags & SCANNER_LITERAL_POOL_FUNCTION) && (type & (SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_FUNC_DECLARATION)) == SCANNER_LITERAL_IS_FUNC) { @@ -565,7 +565,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ type &= (uint8_t) ~SCANNER_LITERAL_IS_FUNC; literal_p->type = type; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if ((type & SCANNER_LITERAL_IS_LOCAL) || ((type & (SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_ARG)) @@ -592,7 +592,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { no_declarations++; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if ((type & (SCANNER_LITERAL_IS_CONST | SCANNER_LITERAL_IS_ARG)) == SCANNER_LITERAL_IS_CONST) { JERRY_ASSERT (type & SCANNER_LITERAL_IS_LET); @@ -601,14 +601,14 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ literal_p->type = (uint8_t) (type & ~SCANNER_LITERAL_IS_FUNC); no_declarations--; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (type & SCANNER_LITERAL_IS_LOCAL) { /* Catch parameters cannot be functions. */ literal_p->type = (uint8_t) (type & ~SCANNER_LITERAL_IS_FUNC); no_declarations--; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } intptr_t diff = (intptr_t) (literal_p->char_p - prev_source_p); @@ -629,9 +629,9 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ prev_source_p = literal_p->char_p + literal_p->length; if ((status_flags & SCANNER_LITERAL_POOL_FUNCTION) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) || ((type & SCANNER_LITERAL_IS_FUNC) && (status_flags & SCANNER_LITERAL_POOL_IS_STRICT)) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ || !(type & (SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC))) { continue; @@ -651,7 +651,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ extended_type |= SCANNER_LITERAL_NO_REG; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) extended_type |= SCANNER_LITERAL_IS_USED; if (status_flags & SCANNER_LITERAL_POOL_FUNCTION_STATEMENT) @@ -669,7 +669,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ * for speculative arrow parameters and local (non-var) functions. */ type = 0; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ type = (uint8_t) (type & (SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC)); JERRY_ASSERT (type == 0 || !(status_flags & SCANNER_LITERAL_POOL_FUNCTION)); @@ -716,11 +716,11 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ no_declarations++; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint16_t is_unmapped = SCANNER_LITERAL_POOL_IS_STRICT | SCANNER_LITERAL_POOL_ARGUMENTS_UNMAPPED; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ const uint16_t is_unmapped = SCANNER_LITERAL_POOL_IS_STRICT; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (status_flags & is_unmapped) { @@ -732,7 +732,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (status_flags & SCANNER_LITERAL_POOL_ASYNC) { u8_arg |= SCANNER_FUNCTION_ASYNC; @@ -747,7 +747,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { u8_arg |= SCANNER_FUNCTION_LEXICAL_ENV_NEEDED; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ info_p->u8_arg = u8_arg; info_p->u16_arg = (uint16_t) no_declarations; @@ -792,19 +792,19 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { type = SCANNER_STREAM_TYPE_ARG_FUNC; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (literal_p->type & SCANNER_LITERAL_IS_DESTRUCTURED_ARG) { type = SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } } else if (literal_p->type & SCANNER_LITERAL_IS_ARG) { type = SCANNER_STREAM_TYPE_ARG; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (literal_p->type & SCANNER_LITERAL_IS_DESTRUCTURED_ARG) { type = SCANNER_STREAM_TYPE_DESTRUCTURED_ARG; @@ -817,9 +817,9 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ JERRY_ASSERT (type == SCANNER_STREAM_TYPE_ARG_VAR || type == SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (literal_p->type & SCANNER_LITERAL_IS_LET) { if (!(literal_p->type & SCANNER_LITERAL_IS_CONST)) @@ -831,12 +831,12 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ literal_p->type |= SCANNER_LITERAL_EARLY_CREATE; } } -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) else if (prev_literal_pool_p == NULL) { type = SCANNER_STREAM_TYPE_IMPORT; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ else { type = SCANNER_STREAM_TYPE_LOCAL; @@ -856,7 +856,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { type |= SCANNER_STREAM_NO_REG | SCANNER_STREAM_EARLY_CREATE; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (literal_p->has_escape) { @@ -923,7 +923,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ context_p->status_flags &= (uint32_t) ~PARSER_IS_STRICT; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (prev_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_GENERATOR) { context_p->status_flags |= PARSER_IS_GENERATOR_FUNCTION; @@ -941,7 +941,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { context_p->status_flags &= (uint32_t) ~PARSER_IS_ASYNC_FUNCTION; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scanner_context_p->active_literal_pool_p = literal_pool_p->prev_p; @@ -976,17 +976,17 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ while ((literal_p = (lexer_lit_location_t *) parser_list_iterator_next (&literal_iterator)) != NULL) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (can_eval || (literal_p->type & SCANNER_LITERAL_EARLY_CREATE)) { literal_p->type |= SCANNER_LITERAL_NO_REG | SCANNER_LITERAL_EARLY_CREATE; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (can_eval) { literal_p->type |= SCANNER_LITERAL_NO_REG; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint8_t type = literal_p->type; @@ -995,12 +995,12 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (type & (SCANNER_LITERAL_IS_DESTRUCTURED_ARG | SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG)) { break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } if (literal_p == NULL) @@ -1022,10 +1022,10 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ parser_list_iterator_init (&literal_pool_p->literal_pool, &literal_iterator); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Destructured args are placed after the other arguments because of register assignments. */ bool has_destructured_arg = false; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while ((literal_p = (lexer_lit_location_t *) parser_list_iterator_next (&literal_iterator)) != NULL) { @@ -1033,7 +1033,7 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ if ((type & SCANNER_LITERAL_IS_ARG) || (has_arguments && scanner_literal_is_arguments (literal_p))) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (can_eval || (literal_p->type & SCANNER_LITERAL_EARLY_CREATE)) { type |= SCANNER_LITERAL_NO_REG | SCANNER_LITERAL_EARLY_CREATE; @@ -1055,12 +1055,12 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ literal_p->type = type; continue; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (can_eval) { literal_p->type |= SCANNER_LITERAL_NO_REG; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_lit_location_t *new_literal_p; new_literal_p = (lexer_lit_location_t *) parser_list_append (context_p, &new_literal_pool_p->literal_pool); @@ -1074,15 +1074,15 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ literal_p); type |= SCANNER_LITERAL_NO_REG; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) type |= SCANNER_LITERAL_IS_USED; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ literal_location_p->type |= type; } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (has_destructured_arg) { parser_list_iterator_init (&literal_pool_p->literal_pool, &literal_iterator); @@ -1099,7 +1099,7 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ } } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ new_literal_pool_p->prev_p = prev_literal_pool_p; @@ -1193,9 +1193,9 @@ scanner_add_reference (parser_context_t *context_p, /**< context */ lexer_lit_location_t *lit_location_p = scanner_add_custom_literal (context_p, scanner_context_p->active_literal_pool_p, &context_p->token.lit_location); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) lit_location_p->type |= SCANNER_LITERAL_IS_USED; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (scanner_context_p->active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_WITH) { @@ -1260,12 +1260,12 @@ scanner_append_argument (parser_context_t *context_p, /**< context */ { literal_p->length = 0; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (literal_p->type & SCANNER_LITERAL_IS_USED) { literal_type = SCANNER_LITERAL_IS_ARG | SCANNER_LITERAL_EARLY_CREATE; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } literal_p = (lexer_lit_location_t *) parser_list_append (context_p, &literal_pool_p->literal_pool); @@ -1290,7 +1290,7 @@ scanner_detect_eval_call (parser_context_t *context_p, /**< context */ } } /* scanner_detect_eval_call */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Find a let/const declaration of a given literal. @@ -1558,7 +1558,7 @@ scanner_append_hole (parser_context_t *context_p, scanner_context_t *scanner_con literal_p->has_escape = 0; } /* scanner_append_hole */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Reverse the scanner info chain after the scanning is completed. @@ -1625,13 +1625,13 @@ scanner_cleanup (parser_context_t *context_p) /**< context */ } case SCANNER_TYPE_WHILE: case SCANNER_TYPE_FOR_IN: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_TYPE_FOR_OF: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCANNER_TYPE_CASE: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_TYPE_INITIALIZER: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { size = sizeof (scanner_location_info_t); break; @@ -1649,15 +1649,15 @@ scanner_cleanup (parser_context_t *context_p) /**< context */ } default: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (scanner_info_p->type == SCANNER_TYPE_END_ARGUMENTS || scanner_info_p->type == SCANNER_TYPE_LET_EXPRESSION || scanner_info_p->type == SCANNER_TYPE_CLASS_CONSTRUCTOR || scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED || scanner_info_p->type == SCANNER_TYPE_ERR_ASYNC_FUNCTION); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (scanner_info_p->type == SCANNER_TYPE_END_ARGUMENTS); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } } @@ -1685,13 +1685,13 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ JERRY_UNUSED (check_type); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT ((check_type == PARSER_CHECK_BLOCK_CONTEXT ? info_p->type == SCANNER_TYPE_BLOCK : info_p->type == SCANNER_TYPE_FUNCTION)); uint32_t scope_stack_reg_top = (check_type != PARSER_CHECK_GLOBAL_CONTEXT ? context_p->scope_stack_reg_top : 0); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (check_type == PARSER_CHECK_BLOCK_CONTEXT); JERRY_ASSERT (info_p->type == SCANNER_TYPE_BLOCK); @@ -1702,7 +1702,7 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ { uint8_t data = data_p[0]; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint32_t type = data & SCANNER_STREAM_TYPE_MASK; if (JERRY_UNLIKELY (type == SCANNER_STREAM_TYPE_HOLE)) @@ -1755,9 +1755,9 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ } #endif /* !JERRY_NDEBUG */ -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT ((data & SCANNER_STREAM_TYPE_MASK) == SCANNER_STREAM_TYPE_VAR); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (!(data & SCANNER_STREAM_UINT16_DIFF)) { @@ -1775,7 +1775,7 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ data_p += 2 + 2; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (check_type == PARSER_CHECK_GLOBAL_CONTEXT) && (type == SCANNER_STREAM_TYPE_VAR || (type == SCANNER_STREAM_TYPE_FUNC && !(context_p->global_status_flags & ECMA_PARSE_DIRECT_EVAL)) @@ -1807,7 +1807,7 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ continue; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if ((data & SCANNER_STREAM_NO_REG) || scope_stack_reg_top >= PARSER_MAXIMUM_NUMBER_OF_REGISTERS) @@ -1821,7 +1821,7 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ return false; } /* scanner_is_context_needed */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Try to scan/parse the ".target" part in the "new.target" expression. @@ -1859,7 +1859,7 @@ scanner_try_scan_new_target (parser_context_t *context_p) /**< parser/scanner co return false; } /* scanner_try_scan_new_target */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Description of "arguments" literal string. @@ -1889,7 +1889,7 @@ scanner_create_unused_literal (parser_context_t *context_p, /**< context */ context_p->literal_count++; } /* scanner_create_unused_literal */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Emit checks for redeclared bindings in the global lexical scope. */ @@ -1947,12 +1947,12 @@ scanner_check_variables (parser_context_t *context_p) /**< context */ lexer_construct_literal_object (context_p, &literal, LEXER_NEW_IDENT_LITERAL); literal.char_p += data_p[1]; -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (type == SCANNER_STREAM_TYPE_IMPORT) { continue; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_USED; @@ -1971,7 +1971,7 @@ scanner_check_variables (parser_context_t *context_p) /**< context */ parser_flush_cbc (context_p); } /* scanner_check_variables */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Create and/or initialize var/let/const/function/etc. variables. @@ -2034,9 +2034,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ && !SCANNER_STREAM_TYPE_IS_ARG (type) && !SCANNER_STREAM_TYPE_IS_ARG_FUNC (type))); -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) JERRY_ASSERT (type != SCANNER_STREAM_TYPE_IMPORT || (data_p[0] & SCANNER_STREAM_NO_REG)); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ if (type == SCANNER_STREAM_TYPE_HOLE) { @@ -2091,7 +2091,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { if (option_flags & SCANNER_CREATE_VARS_IS_FUNCTION_BODY) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if ((context_p->status_flags & PARSER_LEXICAL_BLOCK_NEEDED) && (type == SCANNER_STREAM_TYPE_ARG_VAR || type == SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR)) { @@ -2107,7 +2107,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ parser_emit_cbc_ext_literal_from_token (context_p, CBC_EXT_COPY_FROM_ARG); } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ literal.char_p += data_p[1]; continue; @@ -2131,9 +2131,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { JERRY_ASSERT (scope_stack_p >= context_p->scope_stack_p + 2); JERRY_ASSERT (context_p->status_flags & PARSER_IS_FUNCTION); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (!(context_p->status_flags & PARSER_FUNCTION_IS_PARSING_ARGS)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_scope_stack_t *function_map_p = scope_stack_p - 2; uint16_t literal_index = context_p->lit_object.index; @@ -2149,13 +2149,13 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ cbc_opcode_t opcode = CBC_SET_VAR_FUNC; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (context_p->status_flags & PARSER_LEXICAL_BLOCK_NEEDED) && (function_map_p[0].map_to & PARSER_SCOPE_STACK_REGISTER_MASK) == 0) { opcode = CBC_INIT_ARG_OR_FUNC; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal_value (context_p, (uint16_t) opcode, @@ -2172,19 +2172,19 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ scope_stack_p->map_from = context_p->lit_object.index; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (info_type == SCANNER_TYPE_FUNCTION) { if (type != SCANNER_STREAM_TYPE_LET -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) && type != SCANNER_STREAM_TYPE_IMPORT -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ && type != SCANNER_STREAM_TYPE_CONST) { context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_GLOBAL; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ uint16_t map_to; uint16_t func_init_opcode = CBC_INIT_ARG_OR_FUNC; @@ -2194,14 +2194,14 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { map_to = (uint16_t) (PARSER_REGISTER_START + scope_stack_reg_top); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scope_stack_p->map_to = (uint16_t) (scope_stack_reg_top + 1); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ scope_stack_p->map_to = map_to; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scope_stack_reg_top++; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) switch (type) { case SCANNER_STREAM_TYPE_CONST: @@ -2223,18 +2223,18 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ } func_init_opcode = CBC_SET_VAR_FUNC; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } else { context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_USED; map_to = context_p->lit_object.index; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t scope_stack_map_to = 0; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ scope_stack_p->map_to = map_to; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (info_type == SCANNER_TYPE_FUNCTION) { @@ -2243,7 +2243,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ switch (type) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_LET: case SCANNER_STREAM_TYPE_CONST: case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG: @@ -2260,14 +2260,14 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ /* FALLTHRU */ } case SCANNER_STREAM_TYPE_LOCAL: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCANNER_STREAM_TYPE_VAR: { #if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); #endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t opcode; switch (type) @@ -2308,44 +2308,44 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ break; } } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ uint16_t opcode = ((option_flags & SCANNER_CREATE_VARS_IS_SCRIPT) ? CBC_CREATE_VAR_EVAL : CBC_CREATE_VAR); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal (context_p, opcode, map_to); break; } case SCANNER_STREAM_TYPE_ARG: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_ARG_VAR: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCANNER_STREAM_TYPE_ARG_FUNC: { #if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); #endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scope_stack_map_to |= PARSER_SCOPE_STACK_NO_FUNCTION_COPY; /* Argument initializers of functions with mapped arguments (e.g. function f(a,b,a) {}) are * generated here. The other initializers are handled by parser_parse_function_arguments(). */ if (info_u8_arg & SCANNER_FUNCTION_MAPPED_ARGUMENTS) { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_emit_cbc_literal_value (context_p, CBC_INIT_ARG_OR_FUNC, (uint16_t) (PARSER_REGISTER_START + scope_stack_reg_top), map_to); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } else if (data_p[0] & SCANNER_STREAM_EARLY_CREATE) { parser_emit_cbc_literal (context_p, CBC_CREATE_LOCAL, map_to); scope_stack_map_to |= PARSER_SCOPE_STACK_IS_LOCAL_CREATED; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (scope_stack_reg_top < PARSER_MAXIMUM_NUMBER_OF_REGISTERS) { @@ -2355,9 +2355,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scope_stack_p->map_to = scope_stack_map_to; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scope_stack_p++; @@ -2381,7 +2381,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { if (func_init_opcode == CBC_INIT_ARG_OR_FUNC && (option_flags & SCANNER_CREATE_VARS_IS_SCRIPT)) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) literal.char_p -= data_p[1]; if (!(context_p->global_status_flags & ECMA_PARSE_DIRECT_EVAL) || !scanner_scope_find_let_declaration (context_p, &literal)) @@ -2394,9 +2394,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ } } literal.char_p += data_p[1]; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ func_init_opcode = CBC_CREATE_VAR_FUNC_EVAL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } parser_emit_cbc_literal_value (context_p, func_init_opcode, context_p->literal_count, map_to); @@ -2426,23 +2426,23 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ lexer_construct_literal_object (context_p, &lexer_arguments_literal, lexer_arguments_literal.type); scope_stack_p->map_from = context_p->lit_object.index; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scope_stack_p->map_to = 0; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ scope_stack_p->map_to = context_p->lit_object.index; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scope_stack_p++; } context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); context_p->scope_stack_reg_top = (uint16_t) scope_stack_reg_top; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (info_type == SCANNER_TYPE_FUNCTION) { context_p->scope_stack_global_end = context_p->scope_stack_top; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->register_count < scope_stack_reg_top) { @@ -2488,15 +2488,15 @@ scanner_decode_map_to (parser_scope_stack_t *stack_item_p) /**< scope stack item { JERRY_ASSERT (stack_item_p->map_from != PARSER_SCOPE_STACK_FUNC); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t value = (stack_item_p->map_to & PARSER_SCOPE_STACK_REGISTER_MASK); return (value == 0) ? stack_item_p->map_from : (uint16_t) (value + (PARSER_REGISTER_START - 1)); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ return stack_item_p->map_to; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } /* scanner_decode_map_to */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Find the given literal index in the scope stack @@ -2586,7 +2586,7 @@ scanner_literal_is_created (parser_context_t *context_p, /**< context */ return (scope_stack_p->map_to & PARSER_SCOPE_STACK_IS_LOCAL_CREATED) != 0; } /* scanner_literal_is_created */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c index 83770f626..0e7fd63bc 100644 --- a/jerry-core/parser/js/js-scanner.c +++ b/jerry-core/parser/js/js-scanner.c @@ -42,13 +42,13 @@ typedef enum /** * Checks whether token type is "of". */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) #define SCANNER_IDENTIFIER_IS_OF() (lexer_token_is_identifier (context_p, "of", 2)) #else #define SCANNER_IDENTIFIER_IS_OF() (false) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_STATIC_ASSERT (SCANNER_FROM_LITERAL_POOL_TO_COMPUTED (SCANNER_LITERAL_POOL_GENERATOR) == SCAN_STACK_COMPUTED_GENERATOR, @@ -64,7 +64,7 @@ JERRY_STATIC_ASSERT (SCANNER_FROM_COMPUTED_TO_LITERAL_POOL (SCAN_STACK_COMPUTED_ == SCANNER_LITERAL_POOL_ASYNC, scanner_invalid_conversion_from_computed_async_to_literal_pool_async); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Scan primary expression. @@ -83,12 +83,12 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ { scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_AFTER_NEW; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (scanner_try_scan_new_target (context_p)) { scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } case LEXER_DIVIDE: @@ -102,7 +102,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ { uint16_t status_flags = SCANNER_LITERAL_POOL_FUNCTION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (scanner_context_p->async_source_p != NULL) { status_flags |= SCANNER_LITERAL_POOL_ASYNC; @@ -112,7 +112,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ { status_flags |= SCANNER_LITERAL_POOL_GENERATOR; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_push_literal_pool (context_p, scanner_context_p, status_flags); @@ -135,9 +135,9 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_SQUARE: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_push_destructuring_pattern (context_p, scanner_context_p, SCANNER_BINDING_NONE, false); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_push_uint8 (context_p, SCAN_STACK_ARRAY_LITERAL); scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; @@ -145,15 +145,15 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_push_destructuring_pattern (context_p, scanner_context_p, SCANNER_BINDING_NONE, false); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_push_uint8 (context_p, SCAN_STACK_OBJECT_LITERAL); scanner_context_p->mode = SCAN_MODE_PROPERTY_NAME; return SCAN_KEEP_TOKEN; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_TEMPLATE_LITERAL: { if (context_p->source_p[-1] != LIT_CHAR_GRAVE_ACCENT) @@ -166,10 +166,10 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ /* The string is a normal string literal. */ /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_LITERAL: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t *source_p = context_p->source_p; if (context_p->token.lit_location.type == LEXER_IDENT_LITERAL @@ -184,7 +184,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_check_async_function (context_p, scanner_context_p); return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.lit_location.type == LEXER_IDENT_LITERAL) { @@ -201,7 +201,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_CLASS: { scanner_push_class_declaration (context_p, scanner_context_p, SCAN_STACK_CLASS_EXPRESSION); @@ -212,7 +212,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_RIGHT_SQUARE: { if (stack_top != SCAN_STACK_ARRAY_LITERAL) @@ -223,7 +223,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END; return SCAN_KEEP_TOKEN; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_THREE_DOTS: { /* Elision or spread arguments */ @@ -234,7 +234,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_COMMA: { if (stack_top != SCAN_STACK_ARRAY_LITERAL) @@ -243,15 +243,15 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (scanner_context_p->binding_type != SCANNER_BINDING_NONE) { scanner_context_p->mode = SCAN_MODE_BINDING; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_YIELD: { lexer_next_token (context_p); @@ -267,7 +267,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_RIGHT_PAREN: { if (stack_top == SCAN_STACK_PAREN_EXPRESSION) @@ -317,7 +317,7 @@ scanner_scan_post_primary_expression (parser_context_t *context_p, /**< context scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; return true; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_TEMPLATE_LITERAL: { if (JERRY_UNLIKELY (context_p->source_p[-1] != LIT_CHAR_GRAVE_ACCENT)) @@ -327,7 +327,7 @@ scanner_scan_post_primary_expression (parser_context_t *context_p, /**< context } return true; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_LEFT_SQUARE: { parser_stack_push_uint8 (context_p, SCAN_STACK_PROPERTY_ACCESSOR); @@ -391,15 +391,15 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * switch (stack_top) { case SCAN_STACK_VAR: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_LET: case SCAN_STACK_CONST: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCAN_STACK_FOR_VAR_START: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_FOR_LET_START: case SCAN_STACK_FOR_CONST_START: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { scanner_context_p->mode = SCAN_MODE_VAR_STATEMENT; return SCAN_NEXT_TOKEN; @@ -409,7 +409,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * scanner_raise_error (context_p); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_BINDING_INIT: case SCAN_STACK_BINDING_LIST_INIT: { @@ -442,7 +442,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * return SCAN_NEXT_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCAN_STACK_OBJECT_LITERAL: { scanner_context_p->mode = SCAN_MODE_PROPERTY_NAME; @@ -518,12 +518,12 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 == SCAN_STACK_USE_ASYNC) { scanner_add_async_literal (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; return SCAN_NEXT_TOKEN; @@ -537,18 +537,18 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 == SCAN_STACK_IF_STATEMENT) { scanner_check_function_after_if (context_p, scanner_context_p); return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_context_p->mode = SCAN_MODE_STATEMENT; return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_BINDING_LIST_INIT: { parser_stack_pop_uint8 (context_p); @@ -604,25 +604,25 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCAN_STACK_VAR: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_LET: case SCAN_STACK_CONST: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) scanner_context_p->active_literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_IN_EXPORT; -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ parser_stack_pop_uint8 (context_p); return SCAN_KEEP_TOKEN; } case SCAN_STACK_FOR_VAR_START: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_FOR_LET_START: case SCAN_STACK_FOR_CONST_START: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCAN_STACK_FOR_START: { if (type == LEXER_KEYW_IN || SCANNER_IDENTIFIER_IS_OF ()) @@ -636,16 +636,16 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * location_info = (scanner_location_info_t *) scanner_insert_info (context_p, for_statement.u.source_p, sizeof (scanner_location_info_t)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) location_info->info.type = (type == LEXER_KEYW_IN) ? SCANNER_TYPE_FOR_IN : SCANNER_TYPE_FOR_OF; if (stack_top == SCAN_STACK_FOR_LET_START || stack_top == SCAN_STACK_FOR_CONST_START) { parser_stack_push_uint8 (context_p, SCAN_STACK_PRIVATE_BLOCK_EARLY); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ location_info->info.type = SCANNER_TYPE_FOR_IN; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_get_location (&location_info->location, context_p); @@ -664,12 +664,12 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); parser_stack_pop (context_p, NULL, sizeof (scanner_for_statement_t)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (stack_top == SCAN_STACK_FOR_LET_START || stack_top == SCAN_STACK_FOR_CONST_START) { parser_stack_push_uint8 (context_p, SCAN_STACK_PRIVATE_BLOCK); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ for_statement.u.source_p = context_p->source_p; parser_stack_push (context_p, &for_statement, sizeof (scanner_for_statement_t)); @@ -754,11 +754,11 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, SCANNER_LITERAL_POOL_BLOCK); literal_pool_p->source_p = context_p->source_p - 1; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_pop_uint8 (context_p); @@ -820,7 +820,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_ARRAY_LITERAL: case SCAN_STACK_OBJECT_LITERAL: { @@ -893,9 +893,9 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * } return SCAN_NEXT_TOKEN; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ case SCAN_STACK_ARRAY_LITERAL: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCAN_STACK_PROPERTY_ACCESSOR: { if (type != LEXER_RIGHT_SQUARE) @@ -907,7 +907,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); return SCAN_NEXT_TOKEN; } -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) case SCAN_STACK_OBJECT_LITERAL: { if (type != LEXER_RIGHT_BRACE) @@ -919,8 +919,8 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); return SCAN_NEXT_TOKEN; } -#endif /* !ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015) +#endif /* !ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_COMPUTED_PROPERTY: { if (type != LEXER_RIGHT_SQUARE) @@ -1055,7 +1055,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * scanner_context_p->mode = SCAN_MODE_CONTINUE_FUNCTION_ARGUMENTS; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { scanner_context_p->mode = SCAN_MODE_STATEMENT_END; @@ -1087,13 +1087,13 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, SCANNER_LITERAL_POOL_BLOCK); literal_pool_p->source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_context_p->mode = SCAN_MODE_STATEMENT_OR_TERMINATOR; parser_stack_push_uint8 (context_p, SCAN_STACK_BLOCK_STATEMENT); @@ -1114,13 +1114,13 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, SCANNER_LITERAL_POOL_BLOCK); literal_pool_p->source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_context_p->mode = SCAN_MODE_STATEMENT_OR_TERMINATOR; parser_stack_push_uint8 (context_p, SCAN_STACK_TRY_STATEMENT); @@ -1194,9 +1194,9 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t *source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ switch (context_p->token.type) { @@ -1212,7 +1212,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ return_type = SCAN_NEXT_TOKEN; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_LITERAL: { if (!lexer_token_is_let (context_p)) @@ -1267,7 +1267,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ : SCAN_STACK_FOR_LET_START); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } parser_stack_push (context_p, &for_statement, sizeof (scanner_for_statement_t)); @@ -1280,7 +1280,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ parser_stack_push_uint8 (context_p, SCAN_STACK_VAR); return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_LET: { scanner_context_p->mode = SCAN_MODE_VAR_STATEMENT; @@ -1293,7 +1293,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ parser_stack_push_uint8 (context_p, SCAN_STACK_CONST); return SCAN_NEXT_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_KEYW_THROW: { scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; @@ -1370,7 +1370,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ } case LEXER_KEYW_FUNCTION: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint16_t status_flags = SCANNER_LITERAL_POOL_FUNCTION | SCANNER_LITERAL_POOL_FUNCTION_STATEMENT; if (scanner_context_p->async_source_p != NULL) @@ -1378,17 +1378,17 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_context_p->status_flags |= SCANNER_CONTEXT_THROW_ERR_ASYNC_FUNCTION; status_flags |= SCANNER_LITERAL_POOL_ASYNC; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_MULTIPLY) { status_flags |= SCANNER_LITERAL_POOL_GENERATOR; lexer_next_token (context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -1398,7 +1398,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ lexer_lit_location_t *literal_p = scanner_add_literal (context_p, scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t mask = (SCANNER_LITERAL_IS_ARG | SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LOCAL); if ((literal_p->type & SCANNER_LITERAL_IS_LOCAL) @@ -1415,7 +1415,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ literal_p->type |= SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC; uint16_t status_flags = SCANNER_LITERAL_POOL_FUNCTION; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_push_literal_pool (context_p, scanner_context_p, status_flags); @@ -1423,7 +1423,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ parser_stack_push_uint8 (context_p, SCAN_STACK_FUNCTION_STATEMENT); return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_CLASS: { scanner_push_class_declaration (context_p, scanner_context_p, SCAN_STACK_CLASS_STATEMENT); @@ -1438,18 +1438,18 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_detect_invalid_let (context_p, literal_p); literal_p->type |= SCANNER_LITERAL_IS_LET; -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (scanner_context_p->active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_EXPORT) { literal_p->type |= SCANNER_LITERAL_NO_REG; scanner_context_p->active_literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_IN_EXPORT; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ return SCAN_NEXT_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_MODULE_SYSTEM) case LEXER_KEYW_IMPORT: { if (stack_top != SCAN_STACK_SCRIPT) @@ -1475,12 +1475,12 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ { lexer_lit_location_t *literal_p = scanner_add_literal (context_p, scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_detect_invalid_let (context_p, literal_p); literal_p->type |= SCANNER_LITERAL_IS_LOCAL | SCANNER_LITERAL_NO_REG; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ literal_p->type |= SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_NO_REG; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); @@ -1514,12 +1514,12 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ lexer_lit_location_t *literal_p = scanner_add_literal (context_p, scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_detect_invalid_let (context_p, literal_p); literal_p->type |= SCANNER_LITERAL_IS_LOCAL | SCANNER_LITERAL_NO_REG; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ literal_p->type |= SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_NO_REG; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); } @@ -1535,9 +1535,9 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const uint8_t *source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (lexer_check_next_character (context_p, LIT_CHAR_LOWERCASE_A)) { @@ -1556,14 +1556,14 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } lexer_lit_location_t *literal_p = scanner_add_literal (context_p, scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (literal_p->type & (SCANNER_LITERAL_IS_ARG | SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_LOCAL)) @@ -1578,9 +1578,9 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ } literal_p->type |= SCANNER_LITERAL_IS_LOCAL | SCANNER_LITERAL_NO_REG; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ literal_p->type |= SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_NO_REG; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); @@ -1641,16 +1641,16 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ { lexer_lit_location_t *location_p = scanner_add_literal (context_p, scanner_context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (location_p->type & SCANNER_LITERAL_IS_LOCAL && !(location_p->type & SCANNER_LITERAL_IS_FUNC)) { scanner_raise_redeclaration_error (context_p); } location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ location_p->type |= SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); } @@ -1660,11 +1660,11 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ location_p = scanner_add_custom_literal (context_p, scanner_context_p->active_literal_pool_p, &lexer_default_literal); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ location_p->type |= SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scanner_push_literal_pool (context_p, scanner_context_p, SCANNER_LITERAL_POOL_FUNCTION); @@ -1673,7 +1673,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_FUNCTION_ARGUMENTS; return SCAN_KEEP_TOKEN; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_KEYW_CLASS) { scanner_push_class_declaration (context_p, scanner_context_p, SCAN_STACK_CLASS_STATEMENT); @@ -1695,7 +1695,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ literal_p->type |= SCANNER_LITERAL_IS_LET | SCANNER_LITERAL_NO_REG; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Assignment expression. */ lexer_lit_location_t *location_p; @@ -1795,11 +1795,11 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ switch (context_p->token.type) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LEXER_KEYW_CLASS: case LEXER_KEYW_LET: case LEXER_KEYW_CONST: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case LEXER_KEYW_VAR: { scanner_context_p->active_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_IN_EXPORT; @@ -1810,7 +1810,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_STATEMENT; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ default: { break; @@ -1831,7 +1831,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ JERRY_ASSERT (context_p->token.flags & LEXER_NO_SKIP_SPACES); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* The colon needs to be checked first because the parser also checks * it first, and this check skips the spaces which affects source_p. */ if (JERRY_UNLIKELY (lexer_check_arrow (context_p))) @@ -1885,7 +1885,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ } return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_add_reference (context_p, scanner_context_p); @@ -1930,9 +1930,9 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ break; } case SCAN_STACK_BLOCK_STATEMENT: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_CLASS_STATEMENT: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCAN_STACK_FUNCTION_STATEMENT: { if (type != LEXER_RIGHT_BRACE) @@ -1940,17 +1940,17 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 != SCAN_STACK_CLASS_STATEMENT) { scanner_pop_literal_pool (context_p, scanner_context_p); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (context_p->stack_top_uint8 == SCAN_STACK_FUNCTION_STATEMENT) { scanner_pop_literal_pool (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ terminator_found = true; parser_stack_pop_uint8 (context_p); @@ -1958,9 +1958,9 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ continue; } case SCAN_STACK_FUNCTION_EXPRESSION: -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_FUNCTION_ARROW: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { if (type != LEXER_RIGHT_BRACE) { @@ -1968,12 +1968,12 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ } scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 == SCAN_STACK_FUNCTION_ARROW) { scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_pop_literal_pool (context_p, scanner_context_p); parser_stack_pop_uint8 (context_p); @@ -1989,14 +1989,14 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_pop_literal_pool (context_p, scanner_context_p); parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->stack_top_uint8 == SCAN_STACK_EXPLICIT_CLASS_CONSTRUCTOR || context_p->stack_top_uint8 == SCAN_STACK_IMPLICIT_CLASS_CONSTRUCTOR) { scanner_context_p->mode = SCAN_MODE_CLASS_METHOD; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (context_p->stack_top_uint8 == SCAN_STACK_OBJECT_LITERAL); @@ -2030,9 +2030,9 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_context_p->active_switch_statement = switch_statement; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_pop_literal_pool (context_p, scanner_context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ terminator_found = true; lexer_next_token (context_p); @@ -2045,13 +2045,13 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ if (type == LEXER_KEYW_ELSE && (terminator_found || (context_p->token.flags & LEXER_WAS_NEWLINE))) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_check_function_after_if (context_p, scanner_context_p); return SCAN_KEEP_TOKEN; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ scanner_context_p->mode = SCAN_MODE_STATEMENT; return SCAN_NEXT_TOKEN; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } continue; } @@ -2097,7 +2097,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ terminator_found = true; continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_STACK_PRIVATE_BLOCK_EARLY: { parser_list_iterator_t literal_iterator; @@ -2121,7 +2121,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_pop_literal_pool (context_p, scanner_context_p); continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (context_p->stack_top_uint8 == SCAN_STACK_TRY_STATEMENT @@ -2136,14 +2136,14 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ parser_stack_pop_uint8 (context_p); lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_pop_literal_pool (context_p, scanner_context_p); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ if (stack_top == SCAN_STACK_CATCH_STATEMENT) { scanner_pop_literal_pool (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* A finally statement is optional after a try or catch statement. */ if (context_p->token.type == LEXER_KEYW_FINALLY) @@ -2155,13 +2155,13 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, SCANNER_LITERAL_POOL_BLOCK); literal_pool_p->source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_push_uint8 (context_p, SCAN_STACK_BLOCK_STATEMENT); scanner_context_p->mode = SCAN_MODE_STATEMENT_OR_TERMINATOR; @@ -2194,7 +2194,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); parser_stack_push_uint8 (context_p, SCAN_STACK_CATCH_STATEMENT); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_LEFT_SQUARE || context_p->token.type == LEXER_LEFT_BRACE) { scanner_push_destructuring_pattern (context_p, scanner_context_p, SCANNER_BINDING_CATCH, false); @@ -2210,7 +2210,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_PROPERTY_NAME; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -2277,16 +2277,16 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.status_flags |= SCANNER_CONTEXT_DEBUGGER_ENABLED; } #endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_context.binding_type = SCANNER_BINDING_NONE; scanner_context.active_binding_list_p = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_context.active_literal_pool_p = NULL; scanner_context.active_switch_statement.last_case_p = NULL; scanner_context.end_arguments_p = NULL; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) scanner_context.async_source_p = NULL; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* This assignment must be here because of Apple compilers. */ context_p->u.scanner_context_p = &scanner_context; @@ -2330,12 +2330,12 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ status_flags |= SCANNER_LITERAL_POOL_IS_STRICT; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->status_flags & PARSER_IS_GENERATOR_FUNCTION) { status_flags |= SCANNER_LITERAL_POOL_GENERATOR; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ scanner_push_literal_pool (context_p, &scanner_context, status_flags); scanner_context.mode = SCAN_MODE_FUNCTION_ARGUMENTS; @@ -2370,7 +2370,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_MODE_CLASS_DECLARATION: { if (context_p->token.type == LEXER_KEYW_EXTENDS) @@ -2505,7 +2505,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCAN_MODE_POST_PRIMARY_EXPRESSION: { if (scanner_scan_post_primary_expression (context_p, &scanner_context, type, stack_top)) @@ -2556,7 +2556,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } case SCAN_MODE_VAR_STATEMENT: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (type == LEXER_LEFT_SQUARE || type == LEXER_LEFT_BRACE) { uint8_t binding_type = SCANNER_BINDING_VAR; @@ -2583,7 +2583,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PROPERTY_NAME; continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -2593,7 +2593,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_lit_location_t *literal_p = scanner_add_literal (context_p, &scanner_context); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (stack_top != SCAN_STACK_VAR && stack_top != SCAN_STACK_FOR_VAR_START) { scanner_detect_invalid_let (context_p, literal_p); @@ -2638,7 +2638,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ literal_p->type |= SCANNER_LITERAL_IS_VAR; if (scanner_context.active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_WITH) @@ -2647,14 +2647,14 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } lexer_next_token (context_p); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (scanner_context.active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_EXPORT) { literal_p->type |= SCANNER_LITERAL_NO_REG; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ switch (context_p->token.type) { @@ -2672,9 +2672,9 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ if (SCANNER_IS_FOR_START (stack_top)) { -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) JERRY_ASSERT (!(scanner_context.active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_EXPORT)); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ if (context_p->token.type != LEXER_SEMICOLON && context_p->token.type != LEXER_KEYW_IN @@ -2687,15 +2687,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (stack_top == SCAN_STACK_VAR || stack_top == SCAN_STACK_LET || stack_top == SCAN_STACK_CONST); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (stack_top == SCAN_STACK_VAR); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) scanner_context.active_literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_IN_EXPORT; -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ scanner_context.mode = SCAN_MODE_STATEMENT_END; parser_stack_pop_uint8 (context_p); @@ -2714,14 +2714,14 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ literal_pool_p->source_p = context_p->source_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (scanner_context.async_source_p != NULL)) { literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_ASYNC; literal_pool_p->source_p = scanner_context.async_source_p; scanner_context.async_source_p = NULL; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (type != LEXER_LEFT_PAREN) { @@ -2729,21 +2729,21 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* FALLTHRU */ } case SCAN_MODE_CONTINUE_FUNCTION_ARGUMENTS: { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_RIGHT_PAREN && context_p->token.type != LEXER_EOS) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) lexer_lit_location_t *argument_literal_p; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ while (true) { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_THREE_DOTS) { scanner_context.active_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_ARGUMENTS_UNMAPPED; @@ -2756,7 +2756,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ argument_literal_p = NULL; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -2764,11 +2764,11 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) argument_literal_p = scanner_append_argument (context_p, &scanner_context); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ scanner_append_argument (context_p, &scanner_context); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); @@ -2779,7 +2779,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (argument_literal_p == NULL) { scanner_context.active_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_ARGUMENTS_UNMAPPED; @@ -2820,7 +2820,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ parser_stack_push_uint8 (context_p, SCAN_STACK_BINDING_INIT); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } if (context_p->token.type == LEXER_EOS && stack_top == SCAN_STACK_SCRIPT_FUNCTION) @@ -2870,14 +2870,14 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_check_property_modifier (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_LEFT_SQUARE) { parser_stack_push_uint8 (context_p, SCAN_STACK_COMPUTED_PROPERTY); scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type == LEXER_RIGHT_BRACE) { @@ -2886,15 +2886,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } if (context_p->token.type == LEXER_PROPERTY_GETTER -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) || context_p->token.type == LEXER_KEYW_ASYNC || context_p->token.type == LEXER_MULTIPLY -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ || context_p->token.type == LEXER_PROPERTY_SETTER) { uint16_t literal_pool_flags = SCANNER_LITERAL_POOL_FUNCTION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_MULTIPLY) { literal_pool_flags |= SCANNER_LITERAL_POOL_GENERATOR; @@ -2908,19 +2908,19 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ literal_pool_flags |= SCANNER_LITERAL_POOL_GENERATOR; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ parser_stack_push_uint8 (context_p, SCAN_STACK_FUNCTION_PROPERTY); lexer_scan_identifier (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_LEFT_SQUARE) { parser_stack_push_uint8 (context_p, SCANNER_FROM_LITERAL_POOL_TO_COMPUTED (literal_pool_flags)); scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_LITERAL) { @@ -2937,15 +2937,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) parser_line_counter_t start_line = context_p->token.line; parser_line_counter_t start_column = context_p->token.column; bool is_ident = (context_p->token.lit_location.type == LEXER_IDENT_LITERAL); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ lexer_next_token (context_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (context_p->token.type == LEXER_LEFT_PAREN) { scanner_push_literal_pool (context_p, &scanner_context, SCANNER_LITERAL_POOL_FUNCTION); @@ -2993,7 +2993,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION_END; continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (context_p->token.type != LEXER_COLON) { @@ -3002,15 +3002,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (scanner_context.binding_type != SCANNER_BINDING_NONE) { scanner_context.mode = SCAN_MODE_BINDING; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCAN_MODE_BINDING: { JERRY_ASSERT (scanner_context.binding_type == SCANNER_BINDING_VAR @@ -3133,7 +3133,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } lexer_next_token (context_p); @@ -3148,9 +3148,9 @@ scan_completed: scanner_pop_literal_pool (context_p, &scanner_context); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) JERRY_ASSERT (scanner_context.active_binding_list_p == NULL); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (scanner_context.active_literal_pool_p == NULL); #ifndef JERRY_NDEBUG @@ -3159,12 +3159,12 @@ scan_completed: } PARSER_CATCH { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) while (scanner_context.active_binding_list_p != NULL) { scanner_pop_binding_list (&scanner_context); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (JERRY_UNLIKELY (context_p->error != PARSER_ERR_OUT_OF_MEMORY)) { @@ -3174,7 +3174,7 @@ scan_completed: /* The following code may allocate memory, so it is enclosed in a try/catch. */ PARSER_TRY (context_p->try_buffer) { - #if ENABLED (JERRY_ES2015) + #if ENABLED (JERRY_ESNEXT) if (scanner_context.status_flags & SCANNER_CONTEXT_THROW_ERR_ASYNC_FUNCTION) { JERRY_ASSERT (scanner_context.async_source_p != NULL); @@ -3183,7 +3183,7 @@ scan_completed: info_p = scanner_insert_info (context_p, scanner_context.async_source_p, sizeof (scanner_info_t)); info_p->type = SCANNER_TYPE_ERR_ASYNC_FUNCTION; } - #endif /* ENABLED (JERRY_ES2015) */ + #endif /* ENABLED (JERRY_ESNEXT) */ while (scanner_context.active_literal_pool_p != NULL) { @@ -3271,7 +3271,7 @@ scan_completed: JERRY_DEBUG_MSG (" VAR "); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_LET: { JERRY_DEBUG_MSG (" LET "); @@ -3287,20 +3287,20 @@ scan_completed: JERRY_DEBUG_MSG (" LOCAL "); break; } -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_MODULE_SYSTEM) case SCANNER_STREAM_TYPE_IMPORT: { JERRY_DEBUG_MSG (" IMPORT "); break; } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ case SCANNER_STREAM_TYPE_ARG: { JERRY_DEBUG_MSG (" ARG "); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_ARG_VAR: { JERRY_DEBUG_MSG (" ARG_VAR "); @@ -3316,19 +3316,19 @@ scan_completed: JERRY_DEBUG_MSG (" DESTRUCTURED_ARG_VAR "); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCANNER_STREAM_TYPE_ARG_FUNC: { JERRY_DEBUG_MSG (" ARG_FUNC "); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC: { JERRY_DEBUG_MSG (" DESTRUCTURED_ARG_FUNC "); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCANNER_STREAM_TYPE_FUNC: { JERRY_DEBUG_MSG (" FUNC "); @@ -3371,13 +3371,13 @@ scan_completed: length = 2 + 2; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (data_p[0] & SCANNER_STREAM_EARLY_CREATE) { JERRY_ASSERT (data_p[0] & SCANNER_STREAM_NO_REG); JERRY_DEBUG_MSG ("*"); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (data_p[0] & SCANNER_STREAM_NO_REG) { @@ -3415,14 +3415,14 @@ scan_completed: print_location = true; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_TYPE_FOR_OF: { name_p = "FOR-OF"; print_location = true; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case SCANNER_TYPE_SWITCH: { JERRY_DEBUG_MSG (" SWITCH: source:%d\n", @@ -3447,7 +3447,7 @@ scan_completed: print_location = true; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case SCANNER_TYPE_INITIALIZER: { name_p = "INITIALIZER"; @@ -3479,7 +3479,7 @@ scan_completed: (int) (info_p->source_p - source_start_p)); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } if (print_location) diff --git a/jerry-core/parser/js/js-scanner.h b/jerry-core/parser/js/js-scanner.h index c2b08e172..963efa938 100644 --- a/jerry-core/parser/js/js-scanner.h +++ b/jerry-core/parser/js/js-scanner.h @@ -39,18 +39,18 @@ typedef enum SCANNER_TYPE_WHILE, /**< while statement */ SCANNER_TYPE_FOR, /**< for statement */ SCANNER_TYPE_FOR_IN, /**< for-in statement */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_TYPE_FOR_OF, /**< for-of statement */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ SCANNER_TYPE_SWITCH, /**< switch statement */ SCANNER_TYPE_CASE, /**< case statement */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_TYPE_INITIALIZER, /**< destructuring binding or assignment pattern with initializer */ SCANNER_TYPE_CLASS_CONSTRUCTOR, /**< class constructor */ SCANNER_TYPE_LET_EXPRESSION, /**< let expression */ SCANNER_TYPE_ERR_REDECLARED, /**< syntax error: a variable is redeclared */ SCANNER_TYPE_ERR_ASYNC_FUNCTION, /**< an invalid async function follows */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scanner_info_type_t; /** @@ -146,30 +146,30 @@ typedef enum SCANNER_STREAM_TYPE_END, /**< end of scanner data */ SCANNER_STREAM_TYPE_HOLE, /**< no name is assigned to this argument */ SCANNER_STREAM_TYPE_VAR, /**< var declaration */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_STREAM_TYPE_LET, /**< let declaration */ SCANNER_STREAM_TYPE_CONST, /**< const declaration */ SCANNER_STREAM_TYPE_LOCAL, /**< local declaration (e.g. catch block) */ -#endif /* ENABLED (JERRY_ES2015) */ -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#endif /* ENABLED (JERRY_ESNEXT) */ +#if ENABLED (JERRY_MODULE_SYSTEM) SCANNER_STREAM_TYPE_IMPORT, /**< module import */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ /* The next four types must be in this order (see SCANNER_STREAM_TYPE_IS_ARG). */ SCANNER_STREAM_TYPE_ARG, /**< argument declaration */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_STREAM_TYPE_ARG_VAR, /**< argument declaration which is later copied * into a variable declared by var statement */ SCANNER_STREAM_TYPE_DESTRUCTURED_ARG, /**< destructuring argument declaration */ SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR, /**< destructuring argument declaration which is later * copied into a variable declared by var statement */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Function types should be at the end. See the SCANNER_STREAM_TYPE_IS_FUNCTION macro. */ SCANNER_STREAM_TYPE_ARG_FUNC, /**< argument declaration which * is later initialized with a function */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC, /**< destructuring argument declaration which * is later initialized with a function */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ SCANNER_STREAM_TYPE_FUNC, /**< function declaration */ } scanner_compressed_stream_types_t; @@ -183,7 +183,7 @@ typedef enum */ #define SCANNER_STREAM_TYPE_IS_FUNCTION(type) ((type) >= SCANNER_STREAM_TYPE_ARG_FUNC) -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Checks whether the decoded type represents a function argument. @@ -197,7 +197,7 @@ typedef enum #define SCANNER_STREAM_TYPE_IS_ARG_FUNC(type) \ ((type) == SCANNER_STREAM_TYPE_ARG_FUNC || (type) == SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC) -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ /** * Checks whether the decoded type represents a function argument. @@ -209,7 +209,7 @@ typedef enum */ #define SCANNER_STREAM_TYPE_IS_ARG_FUNC(type) ((type) == SCANNER_STREAM_TYPE_ARG_FUNC) -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Constants for u8_arg flags in scanner_function_info_t. @@ -218,12 +218,12 @@ typedef enum { SCANNER_FUNCTION_ARGUMENTS_NEEDED = (1 << 0), /**< arguments object needs to be created */ SCANNER_FUNCTION_MAPPED_ARGUMENTS = (1 << 1), /**< arguments object should be mapped */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) SCANNER_FUNCTION_LEXICAL_ENV_NEEDED = (1 << 2), /**< lexical environment is needed for the function body */ SCANNER_FUNCTION_STATEMENT = (1 << 3), /**< function is function statement (not arrow expression) * this flag must be combined with the type of function (e.g. async) */ SCANNER_FUNCTION_ASYNC = (1 << 4), /**< function is async function */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } scanner_function_flags_t; /** diff --git a/jerry-core/parser/regexp/re-bytecode.c b/jerry-core/parser/regexp/re-bytecode.c index 151d1baa5..015894518 100644 --- a/jerry-core/parser/regexp/re-bytecode.c +++ b/jerry-core/parser/regexp/re-bytecode.c @@ -275,22 +275,22 @@ void re_append_char (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */ const lit_code_point_t cp) /**< code point */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const size_t size = (re_ctx_p->flags & RE_FLAG_UNICODE) ? sizeof (lit_code_point_t) : sizeof (ecma_char_t); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (re_ctx_p); const size_t size = sizeof (ecma_char_t); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ uint8_t *dest_p = re_bytecode_reserve (re_ctx_p, size); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { re_encode_u32 (dest_p, cp); return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (cp <= LIT_UTF16_CODE_UNIT_MAX); re_encode_u16 (dest_p, (ecma_char_t) cp); @@ -304,22 +304,22 @@ re_insert_char (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */ const uint32_t offset, /**< bytecode offset */ const lit_code_point_t cp) /**< code point*/ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) const size_t size = (re_ctx_p->flags & RE_FLAG_UNICODE) ? sizeof (lit_code_point_t) : sizeof (ecma_char_t); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_UNUSED (re_ctx_p); const size_t size = sizeof (ecma_char_t); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ uint8_t *dest_p = re_bytecode_insert (re_ctx_p, offset, size); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { re_encode_u32 (dest_p, cp); return; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (cp <= LIT_UTF16_CODE_UNIT_MAX); re_encode_u16 (dest_p, (ecma_char_t) cp); @@ -336,16 +336,16 @@ re_get_char (const uint8_t **bc_p, /**< reference to bytecode pointer */ { lit_code_point_t cp; -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) JERRY_UNUSED (unicode); -#else /* ENABLED (JERRY_ES2015) */ +#else /* ENABLED (JERRY_ESNEXT) */ if (unicode) { cp = re_decode_u32 (*bc_p); *bc_p += sizeof (lit_code_point_t); } else -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { cp = re_decode_u16 (*bc_p); *bc_p += sizeof (ecma_char_t); @@ -592,13 +592,13 @@ re_dump_bytecode (re_compiler_ctx_t *re_ctx_p) /**< RegExp bytecode context */ JERRY_DEBUG_MSG ("\n"); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case RE_OP_UNICODE_PERIOD: { JERRY_DEBUG_MSG ("UNICODE_PERIOD\n"); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case RE_OP_PERIOD: { JERRY_DEBUG_MSG ("PERIOD\n"); diff --git a/jerry-core/parser/regexp/re-bytecode.h b/jerry-core/parser/regexp/re-bytecode.h index 2a293a198..2466faef9 100644 --- a/jerry-core/parser/regexp/re-bytecode.h +++ b/jerry-core/parser/regexp/re-bytecode.h @@ -86,9 +86,9 @@ typedef enum RE_OP_CLASS_ESCAPE, /**< class escape */ RE_OP_CHAR_CLASS, /**< character class */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) RE_OP_UNICODE_PERIOD, /**< period in full unicode mode */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ RE_OP_PERIOD, /**< period in non-unicode mode */ RE_OP_CHAR, /**< any code point */ RE_OP_BYTE, /**< 1-byte utf8 character */ diff --git a/jerry-core/parser/regexp/re-parser.c b/jerry-core/parser/regexp/re-parser.c index 22d07d7f8..25ff65366 100644 --- a/jerry-core/parser/regexp/re-parser.c +++ b/jerry-core/parser/regexp/re-parser.c @@ -394,7 +394,7 @@ re_count_groups (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context */ } } /* re_count_groups */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Check if a code point is a Syntax character * @@ -419,7 +419,7 @@ re_is_syntax_char (lit_code_point_t cp) /**< code point */ || cp == LIT_CHAR_RIGHT_BRACE || cp == LIT_CHAR_VLINE); } /* re_is_syntax_char */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * Parse a Character Escape or a Character Class Escape. @@ -445,12 +445,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context return ECMA_VALUE_EMPTY; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid escape sequence")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Legacy octal escape sequence */ if (lit_char_is_octal_digit (*re_ctx_p->input_curr_p)) @@ -547,12 +547,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid control escape sequence")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ re_ctx_p->token.value = LIT_CHAR_BACKSLASH; re_ctx_p->input_curr_p--; @@ -570,12 +570,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid hex escape sequence")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ re_ctx_p->token.value = LIT_CHAR_LOWERCASE_X; break; @@ -589,7 +589,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context re_ctx_p->token.value = hex_value; re_ctx_p->input_curr_p += 4; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE && lit_is_code_point_utf16_high_surrogate (re_ctx_p->token.value) && re_ctx_p->input_curr_p + 6 <= re_ctx_p->input_end_p @@ -604,12 +604,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context re_ctx_p->input_curr_p += 6; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { if (re_ctx_p->input_curr_p + 1 < re_ctx_p->input_end_p @@ -639,7 +639,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid unicode escape sequence")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ re_ctx_p->token.value = LIT_CHAR_LOWERCASE_U; break; @@ -647,7 +647,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context /* Identity escape */ default: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /* Must be '/', or one of SyntaxCharacter */ if (re_ctx_p->flags & RE_FLAG_UNICODE && ch != LIT_CHAR_SLASH @@ -655,7 +655,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid escape")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ re_ctx_p->token.value = ch; } } @@ -832,12 +832,12 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * return ecma_raise_syntax_error (ECMA_ERR_MSG ("Nothing to repeat.")); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Lone quantifier bracket.")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ re_ctx_p->input_curr_p++; re_ctx_p->token.type = RE_TOK_CHAR; @@ -846,7 +846,7 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * /* Check quantifier */ break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case LIT_CHAR_RIGHT_SQUARE: case LIT_CHAR_RIGHT_BRACE: { @@ -857,13 +857,13 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { re_ctx_p->token.type = RE_TOK_CHAR; re_ctx_p->token.value = ch; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE && lit_is_code_point_utf16_high_surrogate (ch) && re_ctx_p->input_curr_p < re_ctx_p->input_end_p) @@ -875,7 +875,7 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * re_ctx_p->input_curr_p += LIT_UTF8_MAX_BYTES_IN_CODE_UNIT; } } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* Check quantifier */ break; @@ -996,13 +996,13 @@ re_parse_char_class (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * re_ctx_p->input_curr_p++; current = LIT_CHAR_BS; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (*re_ctx_p->input_curr_p == LIT_CHAR_MINUS) { re_ctx_p->input_curr_p++; current = LIT_CHAR_MINUS; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else if ((re_ctx_p->flags & RE_FLAG_UNICODE) == 0 && *re_ctx_p->input_curr_p == LIT_CHAR_LOWERCASE_C && re_ctx_p->input_curr_p + 1 < re_ctx_p->input_end_p @@ -1032,12 +1032,12 @@ re_parse_char_class (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * } } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) else if (re_ctx_p->flags & RE_FLAG_UNICODE) { current = ecma_regexp_unicode_advance (&re_ctx_p->input_curr_p, re_ctx_p->input_end_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ else { current = lit_cesu8_read_next (&re_ctx_p->input_curr_p); @@ -1059,12 +1059,12 @@ re_parse_char_class (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid character class")); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (start != RE_INVALID_CP) { @@ -1204,11 +1204,11 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context } case RE_TOK_PERIOD: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) re_append_opcode (re_ctx_p, (re_ctx_p->flags & RE_FLAG_UNICODE) ? RE_OP_UNICODE_PERIOD : RE_OP_PERIOD); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ re_append_opcode (re_ctx_p, RE_OP_PERIOD); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ re_insert_atom_iterator (re_ctx_p, atom_offset); break; @@ -1255,7 +1255,7 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context return result; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (re_ctx_p->flags & RE_FLAG_UNICODE) { re_ctx_p->token.qmin = 1; @@ -1263,7 +1263,7 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context re_ctx_p->token.greedy = true; } else -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ { re_parse_quantifier (re_ctx_p); diff --git a/jerry-core/profiles/README.md b/jerry-core/profiles/README.md index d0be53eed..21d608ec9 100644 --- a/jerry-core/profiles/README.md +++ b/jerry-core/profiles/README.md @@ -2,7 +2,7 @@ Specify compile definitions in profile files to use when compiling the `jerry-core` target. -The default profile is ``es5.1`` which disables the ES2015 features. +The default profile is ``es.next`` which enables all of the currently implemented features. ### Using profiles with the build system @@ -29,12 +29,12 @@ Alternatively, if you want to use a custom profile at `/absolute/path/to/my.profile`: ``` -# Turn off every ES2015 feature EXCEPT the module system -JERRY_ES2015_BUILTIN_DATAVIEW=0 -JERRY_ES2015_BUILTIN_MAP=0 -JERRY_ES2015_BUILTIN_PROMISE=0 -JERRY_ES2015_BUILTIN_SET=0 -JERRY_ES2015_BUILTIN_TYPEDARRAY=0 +# Disable not needed features +JERRY_BUILTIN_DATAVIEW=0 +JERRY_BUILTIN_MAP=0 +JERRY_BUILTIN_PROMISE=0 +JERRY_BUILTIN_SET=0 +JERRY_BUILTIN_TYPEDARRAY=0 ``` Run the build script as follows (assuming that you are in the project root @@ -96,21 +96,21 @@ defined to `1`. * `JERRY_BUILTIN_REGEXP` * `JERRY_BUILTIN_STRING` -#### ES6 (ES 2015) features +#### ES2015+ features -* `JERRY_ES2015_BUILTIN_DATAVIEW`: +* `JERRY_BUILTIN_DATAVIEW`: Enables or disables the [DataView](https://www.ecma-international.org/ecma-262/6.0/#sec-dataview-objects) built-in. -* `JERRY_ES2015_BUILTIN_MAP`: +* `JERRY_BUILTIN_MAP`: Enables or disables the [Map](http://www.ecma-international.org/ecma-262/6.0/#sec-keyed-collection) built-ins. -* `JERRY_ES2015_BUILTIN_SET`: +* `JERRY_BUILTIN_SET`: Enables or disables the [SET](https://www.ecma-international.org/ecma-262/6.0/#sec-set-objects) built-in. -* `JERRY_ES2015_BUILTIN_PROMISE`: +* `JERRY_BUILTIN_PROMISE`: Enables or disables the [Promise](http://www.ecma-international.org/ecma-262/6.0/#sec-promise-objects) built-in. -* `JERRY_ES2015_BUILTIN_TYPEDARRAY`: +* `JERRY_BUILTIN_TYPEDARRAY`: Enables or disables the [ArrayBuffer](http://www.ecma-international.org/ecma-262/6.0/#sec-arraybuffer-objects) and [TypedArray](http://www.ecma-international.org/ecma-262/6.0/#sec-typedarray-objects) built-ins. -* `JERRY_ES2015_MODULE_SYSTEM`: +* `JERRY_MODULE_SYSTEM`: Enables or disable the [module system](http://www.ecma-international.org/ecma-262/6.0/#sec-modules) language element. -* `JERRY_ES2015`: Enables or disable all of the implemented [ECMAScript2015 features](http://www.ecma-international.org/ecma-262/6.0/). +* `JERRY_ESNEXT`: Enables or disables all of the implemented [ECMAScript2015+ features](http://www.ecma-international.org/ecma-262/10.0/). * [arrow functions](http://www.ecma-international.org/ecma-262/6.0/#sec-arrow-function-definitions) language element. * [class](https://www.ecma-international.org/ecma-262/6.0/#sec-class-definitions) language element. * [default value](http://www.ecma-international.org/ecma-262/6.0/#sec-function-definitions) for formal parameters. @@ -123,13 +123,13 @@ defined to `1`. * [rest parameter](http://www.ecma-international.org/ecma-262/6.0/#sec-function-definitions) language element. * [symbol](https://www.ecma-international.org/ecma-262/6.0/#sec-symbol-objects) language element. * [template strings](http://www.ecma-international.org/ecma-262/6.0/#sec-static-semantics-templatestrings) language element. - Furthermore all builtins follow the ES2015 specification including those which behave differently in ES5.1. - This option is evaulated first, any other `JERRY_ES2015_` defines will override that specific entry. - Equivalent with setting the following defines to the `JERRY_ES2015` value: - * `JERRY_ES2015_BUILTIN_DATAVIEW` - * `JERRY_ES2015_BUILTIN_MAP` - * `JERRY_ES2015_BUILTIN_SET` - * `JERRY_ES2015_BUILTIN_PROMISE` - * `JERRY_ES2015_BUILTIN_TYPEDARRAY` - * `JERRY_ES2015_MODULE_SYSTEM` + Furthermore all builtins follow the latest ECMAScript specification including those which behave differently in ES5.1. + This option is evaulated first, any other `JERRY_` defines will override that specific entry. + Equivalent with setting the following defines to the `JERRY_ESNEXT` value: + * `JERRY_BUILTIN_DATAVIEW` + * `JERRY_BUILTIN_MAP` + * `JERRY_BUILTIN_SET` + * `JERRY_BUILTIN_PROMISE` + * `JERRY_BUILTIN_TYPEDARRAY` + * `JERRY_MODULE_SYSTEM` diff --git a/jerry-core/profiles/es.next.profile b/jerry-core/profiles/es.next.profile new file mode 100644 index 000000000..189ce13a4 --- /dev/null +++ b/jerry-core/profiles/es.next.profile @@ -0,0 +1 @@ +# All features are enabled by default. diff --git a/jerry-core/profiles/es5.1.profile b/jerry-core/profiles/es5.1.profile index 6e6f71348..fbe0e34b1 100644 --- a/jerry-core/profiles/es5.1.profile +++ b/jerry-core/profiles/es5.1.profile @@ -1 +1 @@ -JERRY_ES2015=0 +JERRY_ESNEXT=0 diff --git a/jerry-core/profiles/minimal.profile b/jerry-core/profiles/minimal.profile index 1574612c6..d431bfe6d 100644 --- a/jerry-core/profiles/minimal.profile +++ b/jerry-core/profiles/minimal.profile @@ -1,3 +1,3 @@ JERRY_BUILTINS=0 -JERRY_ES2015=0 +JERRY_ESNEXT=0 JERRY_UNICODE_CASE_CONVERSION=0 diff --git a/jerry-core/vm/opcodes-ecma-arithmetics.c b/jerry-core/vm/opcodes-ecma-arithmetics.c index 68c118be1..89482a365 100644 --- a/jerry-core/vm/opcodes-ecma-arithmetics.c +++ b/jerry-core/vm/opcodes-ecma-arithmetics.c @@ -74,13 +74,13 @@ do_number_arithmetic (number_arithmetic_op op, /**< number arithmetic operation result = ecma_op_number_remainder (num_left, num_right); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case NUMBER_ARITHMETIC_EXPONENTIATION: { result = ecma_number_pow (num_left, num_right); break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } ret_value = ecma_make_number_value (result); diff --git a/jerry-core/vm/opcodes-ecma-relational-equality.c b/jerry-core/vm/opcodes-ecma-relational-equality.c index 5fe14577d..ffc2344fc 100644 --- a/jerry-core/vm/opcodes-ecma-relational-equality.c +++ b/jerry-core/vm/opcodes-ecma-relational-equality.c @@ -110,7 +110,7 @@ opfunc_instanceof (ecma_value_t left_value, /**< left value */ return ecma_raise_type_error (ECMA_ERR_MSG ("Expected an object in 'instanceof' check.")); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t has_instance_method = ecma_op_get_method_by_symbol_id (right_value, LIT_GLOBAL_SYMBOL_HAS_INSTANCE); if (ECMA_IS_VALUE_ERROR (has_instance_method)) { @@ -134,7 +134,7 @@ opfunc_instanceof (ecma_value_t left_value, /**< left value */ return ecma_make_boolean_value (has_instance); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *right_value_obj_p = ecma_get_object_from_value (right_value); return ecma_op_object_has_instance (right_value_obj_p, left_value); diff --git a/jerry-core/vm/opcodes.c b/jerry-core/vm/opcodes.c index abecd5e60..088ef0162 100644 --- a/jerry-core/vm/opcodes.c +++ b/jerry-core/vm/opcodes.c @@ -56,12 +56,12 @@ vm_var_decl (ecma_object_t *lex_env_p, /**< target lexical environment */ { ecma_value_t has_binding = ecma_op_has_binding (lex_env_p, var_name_str_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (has_binding)) { return has_binding; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_false (has_binding)) { @@ -192,12 +192,12 @@ vm_op_delete_prop (ecma_value_t object, /**< base object */ ecma_value_t property, /**< property name */ bool is_strict) /**< strict mode */ { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) if (ecma_is_value_undefined (object)) { return ECMA_VALUE_TRUE; } -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ ecma_value_t check_coercible = ecma_op_check_object_coercible (object); if (ECMA_IS_VALUE_ERROR (check_coercible)) @@ -244,12 +244,12 @@ vm_op_delete_var (ecma_value_t name_literal, /**< name literal */ ecma_object_t *ref_base_lex_env_p = ecma_op_resolve_reference_base (lex_env_p, var_name_str_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (JERRY_UNLIKELY (ref_base_lex_env_p == ECMA_OBJECT_POINTER_ERROR)) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ref_base_lex_env_p == NULL) { @@ -289,9 +289,9 @@ opfunc_for_in (ecma_value_t left_value, /**< left value */ /* ecma_op_to_object will only raise error on null/undefined values but those are handled above. */ JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (obj_expr_value)); ecma_object_t *obj_p = ecma_get_object_from_value (obj_expr_value); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) JERRY_ASSERT (!ECMA_OBJECT_IS_PROXY (obj_p)); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_collection_t *prop_names_p = ecma_op_object_get_property_names (obj_p, ECMA_LIST_ENUMERABLE_PROTOTYPE); if (prop_names_p->item_count != 0) @@ -306,7 +306,7 @@ opfunc_for_in (ecma_value_t left_value, /**< left value */ return NULL; } /* opfunc_for_in */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * 'VM_OC_APPEND_ARRAY' opcode handler specialized for spread objects @@ -483,7 +483,7 @@ opfunc_spread_arguments (ecma_value_t *stack_top_p, /**< pointer to the current return buff_p; } /* opfunc_spread_arguments */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * 'VM_OC_APPEND_ARRAY' opcode handler, for setting array object properties @@ -496,12 +496,12 @@ opfunc_append_array (ecma_value_t *stack_top_p, /**< current stack top */ uint16_t values_length) /**< number of elements to set * with potential OPFUNC_HAS_SPREAD_ELEMENT flag */ { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (values_length >= OPFUNC_HAS_SPREAD_ELEMENT) { return opfunc_append_to_spread_array (stack_top_p, (uint16_t) (values_length & ~OPFUNC_HAS_SPREAD_ELEMENT)); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *array_obj_p = ecma_get_object_from_value (stack_top_p[-1]); JERRY_ASSERT (ecma_get_object_type (array_obj_p) == ECMA_OBJECT_TYPE_ARRAY); @@ -568,7 +568,7 @@ opfunc_append_array (ecma_value_t *stack_top_p, /**< current stack top */ return ECMA_VALUE_EMPTY; } /* opfunc_append_array */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Create an executable object using the current frame context @@ -1301,7 +1301,7 @@ opfunc_assign_super_reference (ecma_value_t **vm_stack_top_p, /**< vm stack top return result; } /* opfunc_assign_super_reference */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/vm/opcodes.h b/jerry-core/vm/opcodes.h index d556370ce..d9937584a 100644 --- a/jerry-core/vm/opcodes.h +++ b/jerry-core/vm/opcodes.h @@ -35,9 +35,9 @@ typedef enum NUMBER_ARITHMETIC_MULTIPLICATION, /**< multiplication */ NUMBER_ARITHMETIC_DIVISION, /**< division */ NUMBER_ARITHMETIC_REMAINDER, /**< remainder calculation */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) NUMBER_ARITHMETIC_EXPONENTIATION, /**< exponentiation */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } number_arithmetic_op; /** @@ -104,15 +104,15 @@ vm_op_delete_var (ecma_value_t name_literal, ecma_object_t *lex_env_p); ecma_collection_t * opfunc_for_in (ecma_value_t left_value, ecma_value_t *result_obj_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_collection_t * opfunc_spread_arguments (ecma_value_t *stack_top_p, uint8_t argument_list_len); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_value_t opfunc_append_array (ecma_value_t *stack_top_p, uint16_t values_length); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t opfunc_create_executable_object (vm_frame_ctx_t *frame_ctx_p); @@ -143,7 +143,7 @@ opfunc_form_super_reference (ecma_value_t **vm_stack_top_p, vm_frame_ctx_t *fram ecma_value_t opfunc_assign_super_reference (ecma_value_t **vm_stack_top_p, vm_frame_ctx_t *frame_ctx_p, uint32_t opcode_data); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/vm/vm-stack.c b/jerry-core/vm/vm-stack.c index e22b3509b..8d6644194 100644 --- a/jerry-core/vm/vm-stack.c +++ b/jerry-core/vm/vm-stack.c @@ -65,16 +65,16 @@ vm_stack_context_abort (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ vm_stack_top_p -= PARSER_TRY_CONTEXT_STACK_ALLOCATION; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_CONTEXT_BLOCK: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case VM_CONTEXT_WITH: { VM_MINUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_WITH_CONTEXT_STACK_ALLOCATION); vm_stack_top_p -= PARSER_WITH_CONTEXT_STACK_ALLOCATION; break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_CONTEXT_FOR_OF: { ecma_value_t iterator = vm_stack_top_p[-3]; @@ -90,7 +90,7 @@ vm_stack_context_abort (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ vm_stack_top_p -= PARSER_FOR_OF_CONTEXT_STACK_ALLOCATION; break; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { JERRY_ASSERT (VM_GET_CONTEXT_TYPE (vm_stack_top_p[-1]) == VM_CONTEXT_FOR_IN); @@ -195,7 +195,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ return false; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (vm_stack_top_p[-1] & VM_CONTEXT_HAS_LEX_ENV) { ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p; @@ -203,7 +203,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ frame_ctx_p->lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); ecma_deref_object (lex_env_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ byte_code_p = frame_ctx_p->byte_code_start_p + context_end; @@ -243,7 +243,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ } else { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) if (vm_stack_top_p[-1] & VM_CONTEXT_HAS_LEX_ENV) { ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p; @@ -251,7 +251,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ frame_ctx_p->lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); ecma_deref_object (lex_env_p); } -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ if (byte_code_p[0] == CBC_CONTEXT_END) { @@ -287,7 +287,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ return false; } /* vm_stack_find_finally */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * Get the offsets of ecma values from the specified item of a context. @@ -310,21 +310,21 @@ vm_get_context_value_offsets (ecma_value_t *context_item_p) /**< any item of a c { return PARSER_TRY_CONTEXT_STACK_ALLOCATION; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_CONTEXT_BLOCK: -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case VM_CONTEXT_WITH: { return PARSER_WITH_CONTEXT_STACK_ALLOCATION; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_CONTEXT_FOR_OF: { return ((3 << (VM_CONTEXT_OFFSET_SHIFT * 2)) | (2 << (VM_CONTEXT_OFFSET_SHIFT)) | PARSER_FOR_OF_CONTEXT_STACK_ALLOCATION); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ default: { return (4 << (VM_CONTEXT_OFFSET_SHIFT)) | PARSER_FOR_IN_CONTEXT_STACK_ALLOCATION; @@ -387,7 +387,7 @@ vm_ref_lex_env_chain (ecma_object_t *lex_env_p, /**< top of lexical environment while (context_top_p > context_end_p); } /* vm_ref_lex_env_chain */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * @} diff --git a/jerry-core/vm/vm-stack.h b/jerry-core/vm/vm-stack.h index a555d7452..a675966e8 100644 --- a/jerry-core/vm/vm-stack.h +++ b/jerry-core/vm/vm-stack.h @@ -67,14 +67,14 @@ typedef enum VM_CONTEXT_FINALLY_RETURN, /**< finally context with a return */ VM_CONTEXT_TRY, /**< try context */ VM_CONTEXT_CATCH, /**< catch context */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) VM_CONTEXT_BLOCK, /**< block context */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ VM_CONTEXT_WITH, /**< with context */ VM_CONTEXT_FOR_IN, /**< for-in context */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) VM_CONTEXT_FOR_OF, /**< for-of context */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } vm_stack_context_type_t; /** diff --git a/jerry-core/vm/vm.c b/jerry-core/vm/vm.c index 16f496248..5f365db82 100644 --- a/jerry-core/vm/vm.c +++ b/jerry-core/vm/vm.c @@ -94,12 +94,12 @@ vm_op_get_value (ecma_value_t object, /**< base object */ property_name_p = ecma_get_string_from_value (property); } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ecma_is_value_symbol (property)) { property_name_p = ecma_get_symbol_from_value (property); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (property_name_p != NULL) { @@ -265,9 +265,9 @@ static const uint16_t vm_decode_table[] JERRY_ATTR_CONST_DATA = #undef CBC_OPCODE -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) /** - * Run ES2015 module code + * Run module code * * Note: * returned value must be freed with ecma_free_value, when it is no longer needed. @@ -290,7 +290,7 @@ vm_run_module (const ecma_compiled_code_t *bytecode_p, /**< pointer to bytecode NULL, 0); } /* vm_run_module */ -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ /** * Run global code @@ -305,16 +305,16 @@ vm_run_global (const ecma_compiled_code_t *bytecode_p) /**< pointer to bytecode { ecma_object_t *glob_obj_p = ecma_builtin_get_global (); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (bytecode_p->status_flags & CBC_CODE_FLAGS_LEXICAL_BLOCK_NEEDED) { ecma_create_global_lexical_block (); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *const global_scope_p = ecma_get_global_scope (); -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) if (JERRY_CONTEXT (module_top_context_p) != NULL) { JERRY_ASSERT (JERRY_CONTEXT (module_top_context_p)->parent_p == NULL); @@ -333,7 +333,7 @@ vm_run_global (const ecma_compiled_code_t *bytecode_p) /**< pointer to bytecode return module_init_result; } } -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ return vm_run (bytecode_p, ecma_make_object_value (glob_obj_p), @@ -473,7 +473,7 @@ vm_construct_literal_object (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ ecma_object_t *func_obj_p; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (bytecode_p->status_flags & CBC_CODE_FLAGS_ARROW_FUNCTION) { func_obj_p = ecma_op_create_arrow_function_object (frame_ctx_p->lex_env_p, @@ -486,11 +486,11 @@ vm_construct_literal_object (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ } else { -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ func_obj_p = ecma_op_create_simple_function_object (frame_ctx_p->lex_env_p, bytecode_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ return ecma_make_object_value (func_obj_p); } /* vm_construct_literal_object */ @@ -530,7 +530,7 @@ static const uint8_t vm_error_byte_code_p[] = CBC_EXT_OPCODE, CBC_EXT_ERROR }; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) /** * 'super(...)' function call handler. */ @@ -739,7 +739,7 @@ vm_spread_operation (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ frame_ctx_p->byte_code_p += 3; } } /* vm_spread_operation */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /** * 'Function call' opcode handler. @@ -1275,9 +1275,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } case VM_OC_CREATE_BINDING: { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) JERRY_ASSERT (opcode == CBC_CREATE_VAR); -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ uint32_t literal_index; @@ -1290,7 +1290,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ uint8_t prop_attributes = ECMA_PROPERTY_FLAG_WRITABLE; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (opcode == CBC_CREATE_LET) { prop_attributes = ECMA_PROPERTY_ENUMERABLE_WRITABLE; @@ -1307,9 +1307,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ { property_value_p->value = ECMA_VALUE_UNINITIALIZED; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ ecma_create_named_data_property (frame_ctx_p->lex_env_p, name_p, prop_attributes, NULL); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ continue; } @@ -1336,27 +1336,27 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ while (lex_env_p->type_flags_refs & ECMA_OBJECT_FLAG_BLOCK) { -#if ENABLED (JERRY_ES2015) && !(defined JERRY_NDEBUG) +#if ENABLED (JERRY_ESNEXT) && !(defined JERRY_NDEBUG) if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE) { ecma_property_t *property_p = ecma_find_named_property (lex_env_p, name_p); JERRY_ASSERT (property_p == NULL || !(*property_p & ECMA_PROPERTY_FLAG_ENUMERABLE)); } -#endif /* ENABLED (JERRY_ES2015) && !JERRY_NDEBUG */ +#endif /* ENABLED (JERRY_ESNEXT) && !JERRY_NDEBUG */ JERRY_ASSERT (lex_env_p->u2.outer_reference_cp != JMEM_CP_NULL); lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); } -#if ENABLED (JERRY_ES2015) && !(defined JERRY_NDEBUG) +#if ENABLED (JERRY_ESNEXT) && !(defined JERRY_NDEBUG) if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE) { ecma_property_t *property_p = ecma_find_named_property (lex_env_p, name_p); JERRY_ASSERT (property_p == NULL || !(*property_p & ECMA_PROPERTY_FLAG_ENUMERABLE)); } -#endif /* ENABLED (JERRY_ES2015) && !JERRY_NDEBUG */ +#endif /* ENABLED (JERRY_ESNEXT) && !JERRY_NDEBUG */ result = vm_var_decl (lex_env_p, name_p, frame_ctx_p->is_eval_code); @@ -1377,7 +1377,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_OC_EXT_VAR_EVAL: { uint32_t literal_index; @@ -1452,7 +1452,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_deref_object (ecma_get_object_from_value (lit_value)); continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ #if ENABLED (JERRY_SNAPSHOT_EXEC) case VM_OC_SET_BYTECODE_PTR: { @@ -1511,7 +1511,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_OC_CHECK_VAR: { JERRY_ASSERT (ecma_get_global_scope () == frame_ctx_p->lex_env_p); @@ -1562,12 +1562,12 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ result = ecma_op_has_binding (lex_env_p, literal_name_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ECMA_IS_VALUE_ERROR (result)) { goto error; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ if (ecma_is_value_true (result)) { @@ -1754,7 +1754,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ left_value ^= right_value; /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case VM_OC_SET_PROPERTY: { JERRY_STATIC_ASSERT (VM_OC_NON_STATIC_FLAG == VM_OC_BACKWARD_BRANCH, @@ -1770,7 +1770,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ goto error; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (ecma_compare_ecma_string_to_magic_id (prop_name_p, LIT_MAGIC_STRING_PROTOTYPE)) && !(opcode_data & VM_OC_NON_STATIC_FLAG)) { @@ -1779,9 +1779,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } const int index = (int) (opcode_data >> VM_OC_NON_STATIC_SHIFT) - 2; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ const int index = -1; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_object_t *object_p = ecma_get_object_from_value (stack_top_p[index]); @@ -1829,7 +1829,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ goto error; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (JERRY_UNLIKELY (ecma_compare_ecma_string_to_magic_id (prop_name_p, LIT_MAGIC_STRING_PROTOTYPE)) && !(opcode_data & VM_OC_NON_STATIC_FLAG)) { @@ -1838,9 +1838,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } const int index = (int) (opcode_data >> VM_OC_NON_STATIC_SHIFT) - 2; -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ const int index = -1; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ opfunc_set_accessor (VM_OC_GROUP_GET_INDEX (opcode_data) == VM_OC_SET_GETTER, stack_top_p[index], @@ -1857,7 +1857,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ *stack_top_p++ = ecma_make_object_value (ecma_op_new_fast_array_object (0)); continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_OC_LOCAL_EVAL: { ECMA_CLEAR_LOCAL_PARSE_OPTS (); @@ -2277,7 +2277,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case VM_OC_PUSH_ELISON: { *stack_top_p++ = ECMA_VALUE_ARRAY_HOLE; @@ -2288,22 +2288,22 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ uint16_t values_length = *byte_code_p++; stack_top_p -= values_length; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (*byte_code_start_p == CBC_EXT_OPCODE) { values_length = (uint16_t) (values_length | OPFUNC_HAS_SPREAD_ELEMENT); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ result = opfunc_append_array (stack_top_p, values_length); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (ECMA_IS_VALUE_ERROR (result)) { goto error; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (ecma_is_value_empty (result)); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ continue; } case VM_OC_IDENT_REFERENCE: @@ -3048,7 +3048,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ *stack_top_p++ = result; goto free_both_values; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_OC_EXP: { result = do_number_arithmetic (NUMBER_ARITHMETIC_EXPONENTIATION, @@ -3063,7 +3063,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ *stack_top_p++ = result; goto free_both_values; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case VM_OC_EQUAL: { result = opfunc_equality (left_value, right_value); @@ -3429,7 +3429,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } case VM_OC_BLOCK_CREATE_CONTEXT: { -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) ecma_value_t *stack_context_top_p; stack_context_top_p = VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth; @@ -3464,12 +3464,12 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_context_top_p[-1] |= VM_CONTEXT_HAS_LEX_ENV; } -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (VM_GET_CONTEXT_TYPE (stack_top_p[-2]) == VM_CONTEXT_CATCH && !(stack_top_p[-2] & VM_CONTEXT_HAS_LEX_ENV)); stack_top_p[-2] |= VM_CONTEXT_HAS_LEX_ENV; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ frame_ctx_p->lex_env_p = ecma_create_decl_lex_env (frame_ctx_p->lex_env_p); frame_ctx_p->lex_env_p->type_flags_refs |= (uint16_t) ECMA_OBJECT_FLAG_BLOCK; @@ -3516,7 +3516,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ JERRY_ASSERT (VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth == stack_top_p); -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) if (ecma_is_value_object (value) && ECMA_OBJECT_IS_PROXY (ecma_get_object_from_value (value))) { @@ -3529,7 +3529,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_free_value (value); goto error; } -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ ecma_value_t expr_obj_value = ECMA_VALUE_UNDEFINED; ecma_collection_t *prop_names_p = opfunc_for_in (value, &expr_obj_value); @@ -3551,13 +3551,13 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_top_p[-3] = 0; stack_top_p[-4] = expr_obj_value; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (byte_code_p[0] == CBC_EXT_OPCODE && byte_code_p[1] == CBC_EXT_CLONE_CONTEXT) { /* No need to duplicate the first context. */ byte_code_p += 2; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ continue; } case VM_OC_FOR_IN_GET_NEXT: @@ -3588,9 +3588,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_value_t *buffer_p = collection_p->buffer_p; ecma_object_t *object_p = ecma_get_object_from_value (stack_top_p[-4]); uint32_t index = stack_top_p[-3]; -#if ENABLED (JERRY_ES2015_BUILTIN_PROXY) +#if ENABLED (JERRY_BUILTIN_PROXY) JERRY_ASSERT (!ECMA_OBJECT_IS_PROXY (object_p)); -#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */ +#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ while (index < collection_p->item_count) { @@ -3621,7 +3621,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_OC_FOR_OF_CREATE_CONTEXT: { ecma_value_t value = *(--stack_top_p); @@ -3711,7 +3711,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_top_p -= PARSER_FOR_OF_CONTEXT_STACK_ALLOCATION; continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case VM_OC_TRY: { /* Try opcode simply creates the try context. */ @@ -3772,7 +3772,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (stack_top_p[-1] & VM_CONTEXT_HAS_LEX_ENV) { ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p; @@ -3780,7 +3780,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ frame_ctx_p->lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); ecma_deref_object (lex_env_p); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ VM_MINUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_TRY_CONTEXT_STACK_ALLOCATION); @@ -3845,13 +3845,13 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ byte_code_p = frame_ctx_p->byte_code_start_p + branch_offset; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (jcontext_has_pending_exception ()) { result = ECMA_VALUE_ERROR; goto error; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_ASSERT (VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth == stack_top_p); continue; @@ -4071,13 +4071,13 @@ error: while (stack_top_p > stack_bottom_p) { ecma_value_t stack_item = *(--stack_top_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (stack_item == ECMA_VALUE_RELEASE_LEX_ENV) { opfunc_pop_lexical_environment (frame_ctx_p); continue; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ ecma_fast_free_value (stack_item); } @@ -4135,27 +4135,27 @@ error: JERRY_ASSERT (VM_GET_CONTEXT_TYPE (stack_top_p[-1]) == VM_CONTEXT_FINALLY_RETURN); JERRY_ASSERT (VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth == stack_top_p); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (jcontext_has_pending_exception ()) { stack_top_p[-1] = (ecma_value_t) (stack_top_p[-1] - VM_CONTEXT_FINALLY_RETURN + VM_CONTEXT_FINALLY_THROW); ecma_free_value (result); result = jcontext_take_exception (); } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ byte_code_p = frame_ctx_p->byte_code_p; stack_top_p[-2] = result; continue; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (jcontext_has_pending_exception ()) { ecma_free_value (result); result = ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ } else if (jcontext_has_pending_exception () && !jcontext_has_pending_abort ()) { @@ -4263,9 +4263,9 @@ vm_init_exec (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ frame_ctx_p->byte_code_start_p = (uint8_t *) literal_p; frame_ctx_p->stack_top_p = VM_GET_REGISTERS (frame_ctx_p) + register_end; -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) uint32_t function_call_argument_count = arg_list_len; -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ if (arg_list_len > argument_end) { @@ -4289,7 +4289,7 @@ vm_init_exec (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ } } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) if (bytecode_header_p->status_flags & CBC_CODE_FLAGS_REST_PARAMETER) { JERRY_ASSERT (function_call_argument_count >= arg_list_len); @@ -4299,7 +4299,7 @@ vm_init_exec (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (new_array)); VM_GET_REGISTER (frame_ctx_p, argument_end) = new_array; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ JERRY_CONTEXT (status_flags) &= (uint32_t) ~ECMA_STATUS_DIRECT_EVAL; JERRY_CONTEXT (vm_top_context_p) = frame_ctx_p; @@ -4324,7 +4324,7 @@ vm_execute (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ opfunc_call (frame_ctx_p); break; } -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) case VM_EXEC_SUPER_CALL: { vm_super_call (frame_ctx_p); @@ -4339,7 +4339,7 @@ vm_execute (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ { return completion_value; } -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ case VM_EXEC_CONSTRUCT: { opfunc_construct (frame_ctx_p); diff --git a/jerry-core/vm/vm.h b/jerry-core/vm/vm.h index 09332676d..f1099dd1e 100644 --- a/jerry-core/vm/vm.h +++ b/jerry-core/vm/vm.h @@ -182,9 +182,9 @@ typedef enum VM_OC_MUL, /**< mul */ VM_OC_DIV, /**< div */ VM_OC_MOD, /**< mod */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) VM_OC_EXP, /**< exponentiation */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ VM_OC_EQUAL, /**< equal */ VM_OC_NOT_EQUAL, /**< not equal */ @@ -219,10 +219,10 @@ typedef enum VM_OC_CREATE_BINDING, /**< create variables */ VM_OC_SET_BYTECODE_PTR, /**< setting bytecode pointer */ VM_OC_VAR_EVAL, /**< variable and function evaluation */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) VM_OC_EXT_VAR_EVAL, /**< variable and function evaluation for * functions with separate argument context */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ VM_OC_INIT_ARG_OR_FUNC, /**< create and init a function or argument binding */ #if ENABLED (JERRY_DEBUGGER) @@ -235,7 +235,7 @@ typedef enum #if ENABLED (JERRY_LINE_INFO) VM_OC_LINE, /**< line number of the next statement */ #endif /* ENABLED (JERRY_LINE_INFO) */ -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) VM_OC_CHECK_VAR, /**< check redeclared vars in the global scope */ VM_OC_CHECK_LET, /**< check redeclared lets in the global scope */ VM_OC_ASSIGN_LET_CONST, /**< assign values to let/const declarations */ @@ -280,7 +280,7 @@ typedef enum VM_OC_REQUIRE_OBJECT_COERCIBLE,/**< RequireObjectCoercible opretaion */ VM_OC_ASSIGN_SUPER, /**< assign super reference */ VM_OC_SET__PROTO__, /**< set prototpe when __proto__: form is used */ -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ VM_OC_NONE, /**< a special opcode for unsupported byte codes */ } vm_oc_types; @@ -289,9 +289,9 @@ typedef enum */ typedef enum { -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) VM_OC_EXP = VM_OC_NONE, /**< exponentiation */ -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ #if !ENABLED (JERRY_DEBUGGER) VM_OC_BREAKPOINT_ENABLED = VM_OC_NONE, /**< enabled breakpoint for debugger is unused */ VM_OC_BREAKPOINT_DISABLED = VM_OC_NONE, /**< disabled breakpoint for debugger is unused */ @@ -302,7 +302,7 @@ typedef enum #if !ENABLED (JERRY_LINE_INFO) VM_OC_LINE = VM_OC_NONE, /**< line number of the next statement is unused */ #endif /* !ENABLED (JERRY_LINE_INFO) */ -#if !ENABLED (JERRY_ES2015) +#if !ENABLED (JERRY_ESNEXT) VM_OC_EXT_VAR_EVAL = VM_OC_NONE, /**< variable and function evaluation for * functions with separate argument context */ VM_OC_CHECK_VAR = VM_OC_NONE, /**< check redeclared vars in the global scope */ @@ -349,7 +349,7 @@ typedef enum VM_OC_REQUIRE_OBJECT_COERCIBLE = VM_OC_NONE,/**< RequireObjectCoercible opretaion */ VM_OC_ASSIGN_SUPER = VM_OC_NONE, /**< assign super reference */ VM_OC_SET__PROTO__ = VM_OC_NONE, /**< set prototpe when __proto__: form is used */ -#endif /* !ENABLED (JERRY_ES2015) */ +#endif /* !ENABLED (JERRY_ESNEXT) */ VM_OC_UNUSED = VM_OC_NONE /**< placeholder if the list is empty */ } vm_oc_unused_types; @@ -439,9 +439,9 @@ typedef enum ecma_value_t vm_run_global (const ecma_compiled_code_t *bytecode_p); ecma_value_t vm_run_eval (ecma_compiled_code_t *bytecode_data_p, uint32_t parse_opts); -#if ENABLED (JERRY_ES2015_MODULE_SYSTEM) +#if ENABLED (JERRY_MODULE_SYSTEM) ecma_value_t vm_run_module (const ecma_compiled_code_t *bytecode_p, ecma_object_t *lex_env_p); -#endif /* ENABLED (JERRY_ES2015_MODULE_SYSTEM) */ +#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ ecma_value_t vm_run (const ecma_compiled_code_t *bytecode_header_p, ecma_value_t this_binding_value, ecma_object_t *lex_env_p, const ecma_value_t *arg_list_p, ecma_length_t arg_list_len); diff --git a/targets/curie_bsp/setup.py b/targets/curie_bsp/setup.py index 8cde30256..d8b7b1ca9 100755 --- a/targets/curie_bsp/setup.py +++ b/targets/curie_bsp/setup.py @@ -96,7 +96,7 @@ def build_jerry_data(jerry_path): '-DJERRY_BUILTIN_DATE=0', '-DJERRY_BUILTIN_REGEXP=0', '-DJERRY_BUILTIN_ANNEXB=0', - '-DJERRY_ES2015=0', + '-DJERRY_ESNEXT=0', '-DJERRY_LCACHE=0', '-DJERRY_PROPRETY_HASHMAP=0', ] diff --git a/targets/esp8266/Makefile.esp8266 b/targets/esp8266/Makefile.esp8266 index b1487ab39..c0f88c531 100644 --- a/targets/esp8266/Makefile.esp8266 +++ b/targets/esp8266/Makefile.esp8266 @@ -51,6 +51,7 @@ jerry: -DENABLE_LTO=OFF \ -DENABLE_ALL_IN_ONE=ON \ -DJERRY_CMDLINE=OFF \ + -DJERRY_PROFILE="es5.1" \ -DEXTERNAL_COMPILE_FLAGS="$(ESP_CFLAGS)" \ -DJERRY_GLOBAL_HEAP_SIZE=$(JERRYHEAP) diff --git a/targets/nuttx-stm32f4/Makefile.travis b/targets/nuttx-stm32f4/Makefile.travis index 12dffdde9..90a50878d 100644 --- a/targets/nuttx-stm32f4/Makefile.travis +++ b/targets/nuttx-stm32f4/Makefile.travis @@ -51,7 +51,7 @@ install: install-apt-get-deps install-noapt # Build JerryScript. script-build-jerryscript: - tools/build.py --clean --toolchain cmake/toolchain_mcu_stm32f4.cmake --profile=es2015-subset --jerry-cmdline OFF --lto OFF --jerry-libm ON --all-in-one ON --jerry-port-default OFF --mem-heap 70 --compile-flag='--sysroot=../nuttx' + tools/build.py --clean --toolchain cmake/toolchain_mcu_stm32f4.cmake --profile=es.next --jerry-cmdline OFF --lto OFF --jerry-libm ON --all-in-one ON --jerry-port-default OFF --mem-heap 70 --compile-flag='--sysroot=../nuttx' # Link in the NuttX JerryScript target directory under the NuttX apps tree. script-add-jerryscript-app: diff --git a/targets/nuttx-stm32f4/README.md b/targets/nuttx-stm32f4/README.md index 3038d57af..673b3c1c6 100644 --- a/targets/nuttx-stm32f4/README.md +++ b/targets/nuttx-stm32f4/README.md @@ -44,7 +44,7 @@ jerryscript/tools/build.py \ --jerry-libm=ON \ --all-in-one=ON \ --mem-heap=70 \ - --profile=es2015-subset \ + --profile=es.next \ --compile-flag="--sysroot=${PWD}/nuttx" \ --toolchain=${PWD}/jerryscript/cmake/toolchain_mcu_stm32f4.cmake ``` diff --git a/targets/riot-stm32f4/Makefile.riot b/targets/riot-stm32f4/Makefile.riot index ab4dc03ec..b30ffc531 100644 --- a/targets/riot-stm32f4/Makefile.riot +++ b/targets/riot-stm32f4/Makefile.riot @@ -49,6 +49,7 @@ libjerry: -DENABLE_ALL_IN_ONE=OFF \ -DJERRY_LIBM=OFF \ -DJERRY_CMDLINE=OFF \ + -DJERRY_PROFILE="es5.1" \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DJERRY_GLOBAL_HEAP_SIZE=$(JERRYHEAP) make -C$(BUILD_DIR) jerry-core jerry-port-default-minimal jerry-ext diff --git a/tests/jerry-test-suite/es2015/15.03.04.02-001.js b/tests/jerry-test-suite/es.next/15.03.04.02-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/15.03.04.02-001.js rename to tests/jerry-test-suite/es.next/15.03.04.02-001.js diff --git a/tests/jerry-test-suite/es2015/15.03.04.02-004.js b/tests/jerry-test-suite/es.next/15.03.04.02-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/15.03.04.02-004.js rename to tests/jerry-test-suite/es.next/15.03.04.02-004.js diff --git a/tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-001.js b/tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-001.js rename to tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-001.js diff --git a/tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-002.js b/tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-002.js rename to tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-002.js diff --git a/tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-003.js b/tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-003.js rename to tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-003.js diff --git a/tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-004.js b/tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-004.js rename to tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-004.js diff --git a/tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-005.js b/tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-005.js rename to tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-005.js diff --git a/tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-006.js b/tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-006.js similarity index 100% rename from tests/jerry-test-suite/es2015/19/19.01/19.01.02/19.01.02-006.js rename to tests/jerry-test-suite/es.next/19/19.01/19.01.02/19.01.02-006.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-001.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-001.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-001.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-002.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-002.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-002.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-003.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-003.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-003.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-004.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-004.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-004.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-005.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-005.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-005.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-006.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-006.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-006.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-006.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-007.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-007.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-007.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-007.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-008.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-008.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-008.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-008.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-009.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-009.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-009.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-009.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-010.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-010.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-010.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-010.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-011.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-011.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-011.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-011.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-012.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-012.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-012.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-012.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-013.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-013.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-013.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-013.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-014.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-014.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-014.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-014.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-015.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-015.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-015.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-015.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-016.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-016.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-016.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-016.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-017.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-017.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-017.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-017.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-018.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-018.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-018.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-018.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-019.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-019.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-019.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-019.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-020.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-020.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-020.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-020.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-021.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-021.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.01/22.02.01-021.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.01/22.02.01-021.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-001.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-001.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-001.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-002.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-002.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-002.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-003.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-003.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-003.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-004.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-004.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-004.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-005.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.02/22.02.02-005.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.02/22.02.02-005.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-001.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-001.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-001.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-002.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-002.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-002.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-003.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-003.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-003.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-004.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-004.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-004.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-005.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-005.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-005.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-006.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-006.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-006.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-006.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-007.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-007.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-007.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-007.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-008.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-008.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-008.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-008.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-009.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-009.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-009.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-009.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-010.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-010.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-010.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-010.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-011.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-011.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-011.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-011.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-012.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-012.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-012.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-012.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-013.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-013.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-013.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-013.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-014.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-014.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-014.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-014.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-015.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-015.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-015.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-015.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-016.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-016.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-016.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-016.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-017.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-017.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-017.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-017.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-018.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-018.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-018.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-018.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-019.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-019.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-019.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-019.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-020.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-020.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-020.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-020.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-021.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-021.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.03/22.02.03-021.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.03/22.02.03-021.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.05/22.02.05-001.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.05/22.02.05-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.05/22.02.05-001.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.05/22.02.05-001.js diff --git a/tests/jerry-test-suite/es2015/22/22.02/22.02.06/22.02.06-001.js b/tests/jerry-test-suite/es.next/22/22.02/22.02.06/22.02.06-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/22/22.02/22.02.06/22.02.06-001.js rename to tests/jerry-test-suite/es.next/22/22.02/22.02.06/22.02.06-001.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-001.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-001.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-001.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-002.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-002.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-002.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-003.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-003.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-003.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-004.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-004.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-004.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-005.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-005.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-005.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-006.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-006.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-006.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-006.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-007.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-007.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-007.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-007.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-008.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-008.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-008.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-008.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-009.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-009.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-009.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-009.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-010.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-010.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-010.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-010.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-011.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-011.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-011.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-011.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-012.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-012.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-012.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-012.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-013.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-013.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-013.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.02/24.01.02-013.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.03/24.01.03-001.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.03/24.01.03-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.03/24.01.03-001.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.03/24.01.03-001.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-001.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-001.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-001.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-002.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-002.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-002.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-003.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-003.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-003.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-004.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-004.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-004.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-005.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-005.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-005.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-006.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-006.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-006.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-006.js diff --git a/tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-007.js b/tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-007.js similarity index 100% rename from tests/jerry-test-suite/es2015/24/24.01/24.01.04/24.01.04-007.js rename to tests/jerry-test-suite/es.next/24/24.01/24.01.04/24.01.04-007.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.03/25.04.03-001.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.03/25.04.03-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.03/25.04.03-001.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.03/25.04.03-001.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.03/25.04.03-002.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.03/25.04.03-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.03/25.04.03-002.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.03/25.04.03-002.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-001.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-001.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-001.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-002.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-002.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-002.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-003.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-003.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-003.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-004.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-004.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-004.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-005.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.04/25.04.04-005.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.04/25.04.04-005.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-001.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-001.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-001.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-001.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-002.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-002.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-002.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-002.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-003.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-003.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-003.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-003.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-004.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-004.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-004.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-004.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-005.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-005.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-005.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-005.js diff --git a/tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-006.js b/tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-006.js similarity index 100% rename from tests/jerry-test-suite/es2015/25/25.04/25.04.05/25.04.05-006.js rename to tests/jerry-test-suite/es.next/25/25.04/25.04.05/25.04.05-006.js diff --git a/tests/jerry/es2015/argument-spread.js b/tests/jerry/es.next/argument-spread.js similarity index 100% rename from tests/jerry/es2015/argument-spread.js rename to tests/jerry/es.next/argument-spread.js diff --git a/tests/jerry/es2015/arguments-iterator.js b/tests/jerry/es.next/arguments-iterator.js similarity index 100% rename from tests/jerry/es2015/arguments-iterator.js rename to tests/jerry/es.next/arguments-iterator.js diff --git a/tests/jerry/es2015/array-from.js b/tests/jerry/es.next/array-from.js similarity index 100% rename from tests/jerry/es2015/array-from.js rename to tests/jerry/es.next/array-from.js diff --git a/tests/jerry/es2015/array-isarray.js b/tests/jerry/es.next/array-isarray.js similarity index 100% rename from tests/jerry/es2015/array-isarray.js rename to tests/jerry/es.next/array-isarray.js diff --git a/tests/jerry/es2015/array-new-target-support.js b/tests/jerry/es.next/array-new-target-support.js similarity index 100% rename from tests/jerry/es2015/array-new-target-support.js rename to tests/jerry/es.next/array-new-target-support.js diff --git a/tests/jerry/es2015/array-of.js b/tests/jerry/es.next/array-of.js similarity index 100% rename from tests/jerry/es2015/array-of.js rename to tests/jerry/es.next/array-of.js diff --git a/tests/jerry/es2015/array-pattern.js b/tests/jerry/es.next/array-pattern.js similarity index 100% rename from tests/jerry/es2015/array-pattern.js rename to tests/jerry/es.next/array-pattern.js diff --git a/tests/jerry/es2015/array-prototype-copywithin.js b/tests/jerry/es.next/array-prototype-copywithin.js similarity index 100% rename from tests/jerry/es2015/array-prototype-copywithin.js rename to tests/jerry/es.next/array-prototype-copywithin.js diff --git a/tests/jerry/es2015/array-prototype-entries.js b/tests/jerry/es.next/array-prototype-entries.js similarity index 100% rename from tests/jerry/es2015/array-prototype-entries.js rename to tests/jerry/es.next/array-prototype-entries.js diff --git a/tests/jerry/es2015/array-prototype-fill.js b/tests/jerry/es.next/array-prototype-fill.js similarity index 100% rename from tests/jerry/es2015/array-prototype-fill.js rename to tests/jerry/es.next/array-prototype-fill.js diff --git a/tests/jerry/es2015/array-prototype-find-index.js b/tests/jerry/es.next/array-prototype-find-index.js similarity index 100% rename from tests/jerry/es2015/array-prototype-find-index.js rename to tests/jerry/es.next/array-prototype-find-index.js diff --git a/tests/jerry/es2015/array-prototype-find.js b/tests/jerry/es.next/array-prototype-find.js similarity index 100% rename from tests/jerry/es2015/array-prototype-find.js rename to tests/jerry/es.next/array-prototype-find.js diff --git a/tests/jerry/es2015/array-prototype-keys.js b/tests/jerry/es.next/array-prototype-keys.js similarity index 100% rename from tests/jerry/es2015/array-prototype-keys.js rename to tests/jerry/es.next/array-prototype-keys.js diff --git a/tests/jerry/es2015/array-prototype-slice.js b/tests/jerry/es.next/array-prototype-slice.js similarity index 100% rename from tests/jerry/es2015/array-prototype-slice.js rename to tests/jerry/es.next/array-prototype-slice.js diff --git a/tests/jerry/es2015/array-prototype-values.js b/tests/jerry/es.next/array-prototype-values.js similarity index 100% rename from tests/jerry/es2015/array-prototype-values.js rename to tests/jerry/es.next/array-prototype-values.js diff --git a/tests/jerry/es2015/array-species.js b/tests/jerry/es.next/array-species.js similarity index 100% rename from tests/jerry/es2015/array-species.js rename to tests/jerry/es.next/array-species.js diff --git a/tests/jerry/es2015/array-spread.js b/tests/jerry/es.next/array-spread.js similarity index 100% rename from tests/jerry/es2015/array-spread.js rename to tests/jerry/es.next/array-spread.js diff --git a/tests/jerry/es2015/arraybuffer-isview.js b/tests/jerry/es.next/arraybuffer-isview.js similarity index 100% rename from tests/jerry/es2015/arraybuffer-isview.js rename to tests/jerry/es.next/arraybuffer-isview.js diff --git a/tests/jerry/es2015/arrow-assignment.js b/tests/jerry/es.next/arrow-assignment.js similarity index 100% rename from tests/jerry/es2015/arrow-assignment.js rename to tests/jerry/es.next/arrow-assignment.js diff --git a/tests/jerry/es2015/arrow-eval.js b/tests/jerry/es.next/arrow-eval.js similarity index 100% rename from tests/jerry/es2015/arrow-eval.js rename to tests/jerry/es.next/arrow-eval.js diff --git a/tests/jerry/es2015/arrow-function.js b/tests/jerry/es.next/arrow-function.js similarity index 100% rename from tests/jerry/es2015/arrow-function.js rename to tests/jerry/es.next/arrow-function.js diff --git a/tests/jerry/es2015/arrow-this.js b/tests/jerry/es.next/arrow-this.js similarity index 100% rename from tests/jerry/es2015/arrow-this.js rename to tests/jerry/es.next/arrow-this.js diff --git a/tests/jerry/es2015/binary-literal.js b/tests/jerry/es.next/binary-literal.js similarity index 100% rename from tests/jerry/es2015/binary-literal.js rename to tests/jerry/es.next/binary-literal.js diff --git a/tests/jerry/es2015/builtin-objects-accessor-property-configurable.js b/tests/jerry/es.next/builtin-objects-accessor-property-configurable.js similarity index 100% rename from tests/jerry/es2015/builtin-objects-accessor-property-configurable.js rename to tests/jerry/es.next/builtin-objects-accessor-property-configurable.js diff --git a/tests/jerry/es2015/builtin-prototypes.js b/tests/jerry/es.next/builtin-prototypes.js similarity index 100% rename from tests/jerry/es2015/builtin-prototypes.js rename to tests/jerry/es.next/builtin-prototypes.js diff --git a/tests/jerry/es2015/class-get-set-as-method.js b/tests/jerry/es.next/class-get-set-as-method.js similarity index 100% rename from tests/jerry/es2015/class-get-set-as-method.js rename to tests/jerry/es.next/class-get-set-as-method.js diff --git a/tests/jerry/es2015/class-inheritance-bound.js b/tests/jerry/es.next/class-inheritance-bound.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-bound.js rename to tests/jerry/es.next/class-inheritance-bound.js diff --git a/tests/jerry/es2015/class-inheritance-builtin-array.js b/tests/jerry/es.next/class-inheritance-builtin-array.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-builtin-array.js rename to tests/jerry/es.next/class-inheritance-builtin-array.js diff --git a/tests/jerry/es2015/class-inheritance-builtin-typedarray.js b/tests/jerry/es.next/class-inheritance-builtin-typedarray.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-builtin-typedarray.js rename to tests/jerry/es.next/class-inheritance-builtin-typedarray.js diff --git a/tests/jerry/es2015/class-inheritance-core-1.js b/tests/jerry/es.next/class-inheritance-core-1.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-1.js rename to tests/jerry/es.next/class-inheritance-core-1.js diff --git a/tests/jerry/es2015/class-inheritance-core-10.js b/tests/jerry/es.next/class-inheritance-core-10.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-10.js rename to tests/jerry/es.next/class-inheritance-core-10.js diff --git a/tests/jerry/es2015/class-inheritance-core-11.js b/tests/jerry/es.next/class-inheritance-core-11.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-11.js rename to tests/jerry/es.next/class-inheritance-core-11.js diff --git a/tests/jerry/es2015/class-inheritance-core-12.js b/tests/jerry/es.next/class-inheritance-core-12.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-12.js rename to tests/jerry/es.next/class-inheritance-core-12.js diff --git a/tests/jerry/es2015/class-inheritance-core-13.js b/tests/jerry/es.next/class-inheritance-core-13.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-13.js rename to tests/jerry/es.next/class-inheritance-core-13.js diff --git a/tests/jerry/es2015/class-inheritance-core-14.js b/tests/jerry/es.next/class-inheritance-core-14.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-14.js rename to tests/jerry/es.next/class-inheritance-core-14.js diff --git a/tests/jerry/es2015/class-inheritance-core-15.js b/tests/jerry/es.next/class-inheritance-core-15.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-15.js rename to tests/jerry/es.next/class-inheritance-core-15.js diff --git a/tests/jerry/es2015/class-inheritance-core-2.js b/tests/jerry/es.next/class-inheritance-core-2.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-2.js rename to tests/jerry/es.next/class-inheritance-core-2.js diff --git a/tests/jerry/es2015/class-inheritance-core-3.js b/tests/jerry/es.next/class-inheritance-core-3.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-3.js rename to tests/jerry/es.next/class-inheritance-core-3.js diff --git a/tests/jerry/es2015/class-inheritance-core-4.js b/tests/jerry/es.next/class-inheritance-core-4.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-4.js rename to tests/jerry/es.next/class-inheritance-core-4.js diff --git a/tests/jerry/es2015/class-inheritance-core-5.js b/tests/jerry/es.next/class-inheritance-core-5.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-5.js rename to tests/jerry/es.next/class-inheritance-core-5.js diff --git a/tests/jerry/es2015/class-inheritance-core-6.js b/tests/jerry/es.next/class-inheritance-core-6.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-6.js rename to tests/jerry/es.next/class-inheritance-core-6.js diff --git a/tests/jerry/es2015/class-inheritance-core-7.js b/tests/jerry/es.next/class-inheritance-core-7.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-7.js rename to tests/jerry/es.next/class-inheritance-core-7.js diff --git a/tests/jerry/es2015/class-inheritance-core-8.js b/tests/jerry/es.next/class-inheritance-core-8.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-8.js rename to tests/jerry/es.next/class-inheritance-core-8.js diff --git a/tests/jerry/es2015/class-inheritance-core-9.js b/tests/jerry/es.next/class-inheritance-core-9.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-core-9.js rename to tests/jerry/es.next/class-inheritance-core-9.js diff --git a/tests/jerry/es2015/class-inheritance-early-semantics.js b/tests/jerry/es.next/class-inheritance-early-semantics.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-early-semantics.js rename to tests/jerry/es.next/class-inheritance-early-semantics.js diff --git a/tests/jerry/es2015/class-inheritance-has-instance.js b/tests/jerry/es.next/class-inheritance-has-instance.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-has-instance.js rename to tests/jerry/es.next/class-inheritance-has-instance.js diff --git a/tests/jerry/es2015/class-inheritance-inner-class.js b/tests/jerry/es.next/class-inheritance-inner-class.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-inner-class.js rename to tests/jerry/es.next/class-inheritance-inner-class.js diff --git a/tests/jerry/es2015/class-inheritance-mixins-1.js b/tests/jerry/es.next/class-inheritance-mixins-1.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-mixins-1.js rename to tests/jerry/es.next/class-inheritance-mixins-1.js diff --git a/tests/jerry/es2015/class-inheritance-mixins-2.js b/tests/jerry/es.next/class-inheritance-mixins-2.js similarity index 100% rename from tests/jerry/es2015/class-inheritance-mixins-2.js rename to tests/jerry/es.next/class-inheritance-mixins-2.js diff --git a/tests/jerry/es2015/class-super-access-direct.js b/tests/jerry/es.next/class-super-access-direct.js similarity index 100% rename from tests/jerry/es2015/class-super-access-direct.js rename to tests/jerry/es.next/class-super-access-direct.js diff --git a/tests/jerry/es2015/class-super-access-indirect.js b/tests/jerry/es.next/class-super-access-indirect.js similarity index 100% rename from tests/jerry/es2015/class-super-access-indirect.js rename to tests/jerry/es.next/class-super-access-indirect.js diff --git a/tests/jerry/es2015/class.js b/tests/jerry/es.next/class.js similarity index 100% rename from tests/jerry/es2015/class.js rename to tests/jerry/es.next/class.js diff --git a/tests/jerry/es2015/const1.js b/tests/jerry/es.next/const1.js similarity index 100% rename from tests/jerry/es2015/const1.js rename to tests/jerry/es.next/const1.js diff --git a/tests/jerry/es2015/continue.js b/tests/jerry/es.next/continue.js similarity index 100% rename from tests/jerry/es2015/continue.js rename to tests/jerry/es.next/continue.js diff --git a/tests/jerry/es2015/dataview.js b/tests/jerry/es.next/dataview.js similarity index 100% rename from tests/jerry/es2015/dataview.js rename to tests/jerry/es.next/dataview.js diff --git a/tests/jerry/es2015/date-prototype-toprimitive.js b/tests/jerry/es.next/date-prototype-toprimitive.js similarity index 100% rename from tests/jerry/es2015/date-prototype-toprimitive.js rename to tests/jerry/es.next/date-prototype-toprimitive.js diff --git a/tests/jerry/es2015/directive.js b/tests/jerry/es.next/directive.js similarity index 100% rename from tests/jerry/es2015/directive.js rename to tests/jerry/es.next/directive.js diff --git a/tests/jerry/es2015/error.js b/tests/jerry/es.next/error.js similarity index 100% rename from tests/jerry/es2015/error.js rename to tests/jerry/es.next/error.js diff --git a/tests/jerry/es2015/exponentiation.js b/tests/jerry/es.next/exponentiation.js similarity index 100% rename from tests/jerry/es2015/exponentiation.js rename to tests/jerry/es.next/exponentiation.js diff --git a/tests/jerry/es2015/for-let-reference-error.js b/tests/jerry/es.next/for-let-reference-error.js similarity index 100% rename from tests/jerry/es2015/for-let-reference-error.js rename to tests/jerry/es.next/for-let-reference-error.js diff --git a/tests/jerry/es2015/for-let.js b/tests/jerry/es.next/for-let.js similarity index 100% rename from tests/jerry/es2015/for-let.js rename to tests/jerry/es.next/for-let.js diff --git a/tests/jerry/es2015/for-of-iterator-close.js b/tests/jerry/es.next/for-of-iterator-close.js similarity index 100% rename from tests/jerry/es2015/for-of-iterator-close.js rename to tests/jerry/es.next/for-of-iterator-close.js diff --git a/tests/jerry/es2015/for-of.js b/tests/jerry/es.next/for-of.js similarity index 100% rename from tests/jerry/es2015/for-of.js rename to tests/jerry/es.next/for-of.js diff --git a/tests/jerry/es2015/for-pattern.js b/tests/jerry/es.next/for-pattern.js similarity index 100% rename from tests/jerry/es2015/for-pattern.js rename to tests/jerry/es.next/for-pattern.js diff --git a/tests/jerry/es2015/forin-header-strict.js b/tests/jerry/es.next/forin-header-strict.js similarity index 100% rename from tests/jerry/es2015/forin-header-strict.js rename to tests/jerry/es.next/forin-header-strict.js diff --git a/tests/jerry/es2015/function-accessor.js b/tests/jerry/es.next/function-accessor.js similarity index 100% rename from tests/jerry/es2015/function-accessor.js rename to tests/jerry/es.next/function-accessor.js diff --git a/tests/jerry/es2015/function-arguments-caller.js b/tests/jerry/es.next/function-arguments-caller.js similarity index 100% rename from tests/jerry/es2015/function-arguments-caller.js rename to tests/jerry/es.next/function-arguments-caller.js diff --git a/tests/jerry/es2015/function-async1.js b/tests/jerry/es.next/function-async1.js similarity index 100% rename from tests/jerry/es2015/function-async1.js rename to tests/jerry/es.next/function-async1.js diff --git a/tests/jerry/es2015/function-async2.js b/tests/jerry/es.next/function-async2.js similarity index 100% rename from tests/jerry/es2015/function-async2.js rename to tests/jerry/es.next/function-async2.js diff --git a/tests/jerry/es2015/function-await1.js b/tests/jerry/es.next/function-await1.js similarity index 100% rename from tests/jerry/es2015/function-await1.js rename to tests/jerry/es.next/function-await1.js diff --git a/tests/jerry/es2015/function-call.js b/tests/jerry/es.next/function-call.js similarity index 100% rename from tests/jerry/es2015/function-call.js rename to tests/jerry/es.next/function-call.js diff --git a/tests/jerry/es2015/function-if.js b/tests/jerry/es.next/function-if.js similarity index 100% rename from tests/jerry/es2015/function-if.js rename to tests/jerry/es.next/function-if.js diff --git a/tests/jerry/es2015/function-name.js b/tests/jerry/es.next/function-name.js similarity index 100% rename from tests/jerry/es2015/function-name.js rename to tests/jerry/es.next/function-name.js diff --git a/tests/jerry/es2015/function-new-target.js b/tests/jerry/es.next/function-new-target.js similarity index 100% rename from tests/jerry/es2015/function-new-target.js rename to tests/jerry/es.next/function-new-target.js diff --git a/tests/jerry/es2015/function-param-init.js b/tests/jerry/es.next/function-param-init.js similarity index 100% rename from tests/jerry/es2015/function-param-init.js rename to tests/jerry/es.next/function-param-init.js diff --git a/tests/jerry/es2015/function-param-init2.js b/tests/jerry/es.next/function-param-init2.js similarity index 100% rename from tests/jerry/es2015/function-param-init2.js rename to tests/jerry/es.next/function-param-init2.js diff --git a/tests/jerry/es2015/function-param-init3.js b/tests/jerry/es.next/function-param-init3.js similarity index 100% rename from tests/jerry/es2015/function-param-init3.js rename to tests/jerry/es.next/function-param-init3.js diff --git a/tests/jerry/es2015/function-param-init4.js b/tests/jerry/es.next/function-param-init4.js similarity index 100% rename from tests/jerry/es2015/function-param-init4.js rename to tests/jerry/es.next/function-param-init4.js diff --git a/tests/jerry/es2015/function-pattern1.js b/tests/jerry/es.next/function-pattern1.js similarity index 100% rename from tests/jerry/es2015/function-pattern1.js rename to tests/jerry/es.next/function-pattern1.js diff --git a/tests/jerry/es2015/function-pattern2.js b/tests/jerry/es.next/function-pattern2.js similarity index 100% rename from tests/jerry/es2015/function-pattern2.js rename to tests/jerry/es.next/function-pattern2.js diff --git a/tests/jerry/es2015/function-properties.js b/tests/jerry/es.next/function-properties.js similarity index 100% rename from tests/jerry/es2015/function-properties.js rename to tests/jerry/es.next/function-properties.js diff --git a/tests/jerry/es2015/function-prototype-bind.js b/tests/jerry/es.next/function-prototype-bind.js similarity index 100% rename from tests/jerry/es2015/function-prototype-bind.js rename to tests/jerry/es.next/function-prototype-bind.js diff --git a/tests/jerry/es2015/function-prototype-hasinstance-class.js b/tests/jerry/es.next/function-prototype-hasinstance-class.js similarity index 100% rename from tests/jerry/es2015/function-prototype-hasinstance-class.js rename to tests/jerry/es.next/function-prototype-hasinstance-class.js diff --git a/tests/jerry/es2015/function-prototype-hasinstance.js b/tests/jerry/es.next/function-prototype-hasinstance.js similarity index 100% rename from tests/jerry/es2015/function-prototype-hasinstance.js rename to tests/jerry/es.next/function-prototype-hasinstance.js diff --git a/tests/jerry/es2015/function-rest-parameter.js b/tests/jerry/es.next/function-rest-parameter.js similarity index 100% rename from tests/jerry/es2015/function-rest-parameter.js rename to tests/jerry/es.next/function-rest-parameter.js diff --git a/tests/jerry/es2015/function-scope.js b/tests/jerry/es.next/function-scope.js similarity index 100% rename from tests/jerry/es2015/function-scope.js rename to tests/jerry/es.next/function-scope.js diff --git a/tests/jerry/es2015/function-scope2.js b/tests/jerry/es.next/function-scope2.js similarity index 100% rename from tests/jerry/es2015/function-scope2.js rename to tests/jerry/es.next/function-scope2.js diff --git a/tests/jerry/es2015/generator-function.js b/tests/jerry/es.next/generator-function.js similarity index 100% rename from tests/jerry/es2015/generator-function.js rename to tests/jerry/es.next/generator-function.js diff --git a/tests/jerry/es2015/generator-initializer.js b/tests/jerry/es.next/generator-initializer.js similarity index 100% rename from tests/jerry/es2015/generator-initializer.js rename to tests/jerry/es.next/generator-initializer.js diff --git a/tests/jerry/es2015/generator-return.js b/tests/jerry/es.next/generator-return.js similarity index 100% rename from tests/jerry/es2015/generator-return.js rename to tests/jerry/es.next/generator-return.js diff --git a/tests/jerry/es2015/generator-throw.js b/tests/jerry/es.next/generator-throw.js similarity index 100% rename from tests/jerry/es2015/generator-throw.js rename to tests/jerry/es.next/generator-throw.js diff --git a/tests/jerry/es2015/generator-yield-iterator.js b/tests/jerry/es.next/generator-yield-iterator.js similarity index 100% rename from tests/jerry/es2015/generator-yield-iterator.js rename to tests/jerry/es.next/generator-yield-iterator.js diff --git a/tests/jerry/es2015/generator-yield.js b/tests/jerry/es.next/generator-yield.js similarity index 100% rename from tests/jerry/es2015/generator-yield.js rename to tests/jerry/es.next/generator-yield.js diff --git a/tests/jerry/es2015/generator.js b/tests/jerry/es.next/generator.js similarity index 100% rename from tests/jerry/es2015/generator.js rename to tests/jerry/es.next/generator.js diff --git a/tests/jerry/es2015/identifier-escape.js b/tests/jerry/es.next/identifier-escape.js similarity index 100% rename from tests/jerry/es2015/identifier-escape.js rename to tests/jerry/es.next/identifier-escape.js diff --git a/tests/jerry/es2015/instanceof-symbol-hasinstance-class.js b/tests/jerry/es.next/instanceof-symbol-hasinstance-class.js similarity index 100% rename from tests/jerry/es2015/instanceof-symbol-hasinstance-class.js rename to tests/jerry/es.next/instanceof-symbol-hasinstance-class.js diff --git a/tests/jerry/es2015/instanceof-symbol-hasinstance.js b/tests/jerry/es.next/instanceof-symbol-hasinstance.js similarity index 100% rename from tests/jerry/es2015/instanceof-symbol-hasinstance.js rename to tests/jerry/es.next/instanceof-symbol-hasinstance.js diff --git a/tests/jerry/es2015/iterator-prototype.js b/tests/jerry/es.next/iterator-prototype.js similarity index 100% rename from tests/jerry/es2015/iterator-prototype.js rename to tests/jerry/es.next/iterator-prototype.js diff --git a/tests/jerry/es2015/json-stringify.js b/tests/jerry/es.next/json-stringify.js similarity index 100% rename from tests/jerry/es2015/json-stringify.js rename to tests/jerry/es.next/json-stringify.js diff --git a/tests/jerry/es2015/length-property.js b/tests/jerry/es.next/length-property.js similarity index 100% rename from tests/jerry/es2015/length-property.js rename to tests/jerry/es.next/length-property.js diff --git a/tests/jerry/es2015/let1.js b/tests/jerry/es.next/let1.js similarity index 100% rename from tests/jerry/es2015/let1.js rename to tests/jerry/es.next/let1.js diff --git a/tests/jerry/es2015/let10.js b/tests/jerry/es.next/let10.js similarity index 100% rename from tests/jerry/es2015/let10.js rename to tests/jerry/es.next/let10.js diff --git a/tests/jerry/es2015/let11.js b/tests/jerry/es.next/let11.js similarity index 100% rename from tests/jerry/es2015/let11.js rename to tests/jerry/es.next/let11.js diff --git a/tests/jerry/es2015/let12.js b/tests/jerry/es.next/let12.js similarity index 100% rename from tests/jerry/es2015/let12.js rename to tests/jerry/es.next/let12.js diff --git a/tests/jerry/es2015/let13.js b/tests/jerry/es.next/let13.js similarity index 100% rename from tests/jerry/es2015/let13.js rename to tests/jerry/es.next/let13.js diff --git a/tests/jerry/es2015/let14.js b/tests/jerry/es.next/let14.js similarity index 100% rename from tests/jerry/es2015/let14.js rename to tests/jerry/es.next/let14.js diff --git a/tests/jerry/es2015/let15.js b/tests/jerry/es.next/let15.js similarity index 100% rename from tests/jerry/es2015/let15.js rename to tests/jerry/es.next/let15.js diff --git a/tests/jerry/es2015/let2.js b/tests/jerry/es.next/let2.js similarity index 100% rename from tests/jerry/es2015/let2.js rename to tests/jerry/es.next/let2.js diff --git a/tests/jerry/es2015/let3.js b/tests/jerry/es.next/let3.js similarity index 100% rename from tests/jerry/es2015/let3.js rename to tests/jerry/es.next/let3.js diff --git a/tests/jerry/es2015/let4.js b/tests/jerry/es.next/let4.js similarity index 100% rename from tests/jerry/es2015/let4.js rename to tests/jerry/es.next/let4.js diff --git a/tests/jerry/es2015/let5.js b/tests/jerry/es.next/let5.js similarity index 100% rename from tests/jerry/es2015/let5.js rename to tests/jerry/es.next/let5.js diff --git a/tests/jerry/es2015/let6.js b/tests/jerry/es.next/let6.js similarity index 100% rename from tests/jerry/es2015/let6.js rename to tests/jerry/es.next/let6.js diff --git a/tests/jerry/es2015/let7.js b/tests/jerry/es.next/let7.js similarity index 100% rename from tests/jerry/es2015/let7.js rename to tests/jerry/es.next/let7.js diff --git a/tests/jerry/es2015/let8.js b/tests/jerry/es.next/let8.js similarity index 100% rename from tests/jerry/es2015/let8.js rename to tests/jerry/es.next/let8.js diff --git a/tests/jerry/es2015/let9.js b/tests/jerry/es.next/let9.js similarity index 100% rename from tests/jerry/es2015/let9.js rename to tests/jerry/es.next/let9.js diff --git a/tests/jerry/es2015/map-iterators.js b/tests/jerry/es.next/map-iterators.js similarity index 100% rename from tests/jerry/es2015/map-iterators.js rename to tests/jerry/es.next/map-iterators.js diff --git a/tests/jerry/es2015/map-prototype-foreach.js b/tests/jerry/es.next/map-prototype-foreach.js similarity index 100% rename from tests/jerry/es2015/map-prototype-foreach.js rename to tests/jerry/es.next/map-prototype-foreach.js diff --git a/tests/jerry/es2015/map.js b/tests/jerry/es.next/map.js similarity index 100% rename from tests/jerry/es2015/map.js rename to tests/jerry/es.next/map.js diff --git a/tests/jerry/es2015/math-acosh.js b/tests/jerry/es.next/math-acosh.js similarity index 100% rename from tests/jerry/es2015/math-acosh.js rename to tests/jerry/es.next/math-acosh.js diff --git a/tests/jerry/es2015/math-asinh.js b/tests/jerry/es.next/math-asinh.js similarity index 100% rename from tests/jerry/es2015/math-asinh.js rename to tests/jerry/es.next/math-asinh.js diff --git a/tests/jerry/es2015/math-atanh.js b/tests/jerry/es.next/math-atanh.js similarity index 100% rename from tests/jerry/es2015/math-atanh.js rename to tests/jerry/es.next/math-atanh.js diff --git a/tests/jerry/es2015/math-cbrt.js b/tests/jerry/es.next/math-cbrt.js similarity index 100% rename from tests/jerry/es2015/math-cbrt.js rename to tests/jerry/es.next/math-cbrt.js diff --git a/tests/jerry/es2015/math-cosh.js b/tests/jerry/es.next/math-cosh.js similarity index 100% rename from tests/jerry/es2015/math-cosh.js rename to tests/jerry/es.next/math-cosh.js diff --git a/tests/jerry/es2015/math-expm1.js b/tests/jerry/es.next/math-expm1.js similarity index 100% rename from tests/jerry/es2015/math-expm1.js rename to tests/jerry/es.next/math-expm1.js diff --git a/tests/jerry/es2015/math-functions-tonumber-rule2.js b/tests/jerry/es.next/math-functions-tonumber-rule2.js similarity index 100% rename from tests/jerry/es2015/math-functions-tonumber-rule2.js rename to tests/jerry/es.next/math-functions-tonumber-rule2.js diff --git a/tests/jerry/es2015/math-log10.js b/tests/jerry/es.next/math-log10.js similarity index 100% rename from tests/jerry/es2015/math-log10.js rename to tests/jerry/es.next/math-log10.js diff --git a/tests/jerry/es2015/math-log1p.js b/tests/jerry/es.next/math-log1p.js similarity index 100% rename from tests/jerry/es2015/math-log1p.js rename to tests/jerry/es.next/math-log1p.js diff --git a/tests/jerry/es2015/math-log2.js b/tests/jerry/es.next/math-log2.js similarity index 100% rename from tests/jerry/es2015/math-log2.js rename to tests/jerry/es.next/math-log2.js diff --git a/tests/jerry/es2015/math-sign.js b/tests/jerry/es.next/math-sign.js similarity index 100% rename from tests/jerry/es2015/math-sign.js rename to tests/jerry/es.next/math-sign.js diff --git a/tests/jerry/es2015/math-sinh.js b/tests/jerry/es.next/math-sinh.js similarity index 100% rename from tests/jerry/es2015/math-sinh.js rename to tests/jerry/es.next/math-sinh.js diff --git a/tests/jerry/es2015/math-tanh.js b/tests/jerry/es.next/math-tanh.js similarity index 100% rename from tests/jerry/es2015/math-tanh.js rename to tests/jerry/es.next/math-tanh.js diff --git a/tests/jerry/es2015/math-trunc.js b/tests/jerry/es.next/math-trunc.js similarity index 100% rename from tests/jerry/es2015/math-trunc.js rename to tests/jerry/es.next/math-trunc.js diff --git a/tests/jerry/es2015/module-export-01.js b/tests/jerry/es.next/module-export-01.js similarity index 100% rename from tests/jerry/es2015/module-export-01.js rename to tests/jerry/es.next/module-export-01.js diff --git a/tests/jerry/es2015/module-export-02.js b/tests/jerry/es.next/module-export-02.js similarity index 100% rename from tests/jerry/es2015/module-export-02.js rename to tests/jerry/es.next/module-export-02.js diff --git a/tests/jerry/es2015/module-export-03.js b/tests/jerry/es.next/module-export-03.js similarity index 100% rename from tests/jerry/es2015/module-export-03.js rename to tests/jerry/es.next/module-export-03.js diff --git a/tests/jerry/es2015/module-export-04.js b/tests/jerry/es.next/module-export-04.js similarity index 100% rename from tests/jerry/es2015/module-export-04.js rename to tests/jerry/es.next/module-export-04.js diff --git a/tests/jerry/es2015/module-export-05.js b/tests/jerry/es.next/module-export-05.js similarity index 100% rename from tests/jerry/es2015/module-export-05.js rename to tests/jerry/es.next/module-export-05.js diff --git a/tests/jerry/es2015/module-export-06.js b/tests/jerry/es.next/module-export-06.js similarity index 100% rename from tests/jerry/es2015/module-export-06.js rename to tests/jerry/es.next/module-export-06.js diff --git a/tests/jerry/es2015/module-export-07.js b/tests/jerry/es.next/module-export-07.js similarity index 100% rename from tests/jerry/es2015/module-export-07.js rename to tests/jerry/es.next/module-export-07.js diff --git a/tests/jerry/es2015/module-export-fail-test.js b/tests/jerry/es.next/module-export-fail-test.js similarity index 100% rename from tests/jerry/es2015/module-export-fail-test.js rename to tests/jerry/es.next/module-export-fail-test.js diff --git a/tests/jerry/es2015/module-import-01.js b/tests/jerry/es.next/module-import-01.js similarity index 100% rename from tests/jerry/es2015/module-import-01.js rename to tests/jerry/es.next/module-import-01.js diff --git a/tests/jerry/es2015/module-import-02.js b/tests/jerry/es.next/module-import-02.js similarity index 100% rename from tests/jerry/es2015/module-import-02.js rename to tests/jerry/es.next/module-import-02.js diff --git a/tests/jerry/es2015/module-import-03.js b/tests/jerry/es.next/module-import-03.js similarity index 100% rename from tests/jerry/es2015/module-import-03.js rename to tests/jerry/es.next/module-import-03.js diff --git a/tests/jerry/es2015/module-import-04.js b/tests/jerry/es.next/module-import-04.js similarity index 100% rename from tests/jerry/es2015/module-import-04.js rename to tests/jerry/es.next/module-import-04.js diff --git a/tests/jerry/es2015/new-target-async.js b/tests/jerry/es.next/new-target-async.js similarity index 100% rename from tests/jerry/es2015/new-target-async.js rename to tests/jerry/es.next/new-target-async.js diff --git a/tests/jerry/es2015/new-target-class.js b/tests/jerry/es.next/new-target-class.js similarity index 100% rename from tests/jerry/es2015/new-target-class.js rename to tests/jerry/es.next/new-target-class.js diff --git a/tests/jerry/es2015/new-target-for-containers.js b/tests/jerry/es.next/new-target-for-containers.js similarity index 100% rename from tests/jerry/es2015/new-target-for-containers.js rename to tests/jerry/es.next/new-target-for-containers.js diff --git a/tests/jerry/es2015/new-target-for-date-object.js b/tests/jerry/es.next/new-target-for-date-object.js similarity index 100% rename from tests/jerry/es2015/new-target-for-date-object.js rename to tests/jerry/es.next/new-target-for-date-object.js diff --git a/tests/jerry/es2015/new-target-generator.js b/tests/jerry/es.next/new-target-generator.js similarity index 100% rename from tests/jerry/es2015/new-target-generator.js rename to tests/jerry/es.next/new-target-generator.js diff --git a/tests/jerry/es2015/new-target.js b/tests/jerry/es.next/new-target.js similarity index 100% rename from tests/jerry/es2015/new-target.js rename to tests/jerry/es.next/new-target.js diff --git a/tests/jerry/es2015/number-constants.js b/tests/jerry/es.next/number-constants.js similarity index 100% rename from tests/jerry/es2015/number-constants.js rename to tests/jerry/es.next/number-constants.js diff --git a/tests/jerry/es2015/number-isfinite.js b/tests/jerry/es.next/number-isfinite.js similarity index 100% rename from tests/jerry/es2015/number-isfinite.js rename to tests/jerry/es.next/number-isfinite.js diff --git a/tests/jerry/es2015/number-isinteger.js b/tests/jerry/es.next/number-isinteger.js similarity index 100% rename from tests/jerry/es2015/number-isinteger.js rename to tests/jerry/es.next/number-isinteger.js diff --git a/tests/jerry/es2015/number-isnan.js b/tests/jerry/es.next/number-isnan.js similarity index 100% rename from tests/jerry/es2015/number-isnan.js rename to tests/jerry/es.next/number-isnan.js diff --git a/tests/jerry/es2015/number-issafeinteger.js b/tests/jerry/es.next/number-issafeinteger.js similarity index 100% rename from tests/jerry/es2015/number-issafeinteger.js rename to tests/jerry/es.next/number-issafeinteger.js diff --git a/tests/jerry/es2015/number-methods.js b/tests/jerry/es.next/number-methods.js similarity index 100% rename from tests/jerry/es2015/number-methods.js rename to tests/jerry/es.next/number-methods.js diff --git a/tests/jerry/es2015/object-assign.js b/tests/jerry/es.next/object-assign.js similarity index 100% rename from tests/jerry/es2015/object-assign.js rename to tests/jerry/es.next/object-assign.js diff --git a/tests/jerry/es2015/object-computed-prescanner.js b/tests/jerry/es.next/object-computed-prescanner.js similarity index 100% rename from tests/jerry/es2015/object-computed-prescanner.js rename to tests/jerry/es.next/object-computed-prescanner.js diff --git a/tests/jerry/es2015/object-computed.js b/tests/jerry/es.next/object-computed.js similarity index 100% rename from tests/jerry/es2015/object-computed.js rename to tests/jerry/es.next/object-computed.js diff --git a/tests/jerry/es2015/object-freeze-with-symbol.js b/tests/jerry/es.next/object-freeze-with-symbol.js similarity index 100% rename from tests/jerry/es2015/object-freeze-with-symbol.js rename to tests/jerry/es.next/object-freeze-with-symbol.js diff --git a/tests/jerry/es2015/object-get-own-property-names.js b/tests/jerry/es.next/object-get-own-property-names.js similarity index 100% rename from tests/jerry/es2015/object-get-own-property-names.js rename to tests/jerry/es.next/object-get-own-property-names.js diff --git a/tests/jerry/es2015/object-get-own-property-symbols.js b/tests/jerry/es.next/object-get-own-property-symbols.js similarity index 100% rename from tests/jerry/es2015/object-get-own-property-symbols.js rename to tests/jerry/es.next/object-get-own-property-symbols.js diff --git a/tests/jerry/es2015/object-getprototypeof.js b/tests/jerry/es.next/object-getprototypeof.js similarity index 100% rename from tests/jerry/es2015/object-getprototypeof.js rename to tests/jerry/es.next/object-getprototypeof.js diff --git a/tests/jerry/es2015/object-initializer.js b/tests/jerry/es.next/object-initializer.js similarity index 100% rename from tests/jerry/es2015/object-initializer.js rename to tests/jerry/es.next/object-initializer.js diff --git a/tests/jerry/es2015/object-is.js b/tests/jerry/es.next/object-is.js similarity index 100% rename from tests/jerry/es2015/object-is.js rename to tests/jerry/es.next/object-is.js diff --git a/tests/jerry/es2015/object-methods.js b/tests/jerry/es.next/object-methods.js similarity index 100% rename from tests/jerry/es2015/object-methods.js rename to tests/jerry/es.next/object-methods.js diff --git a/tests/jerry/es2015/object-pattern.js b/tests/jerry/es.next/object-pattern.js similarity index 100% rename from tests/jerry/es2015/object-pattern.js rename to tests/jerry/es.next/object-pattern.js diff --git a/tests/jerry/es2015/object-prototype-proto.js b/tests/jerry/es.next/object-prototype-proto.js similarity index 100% rename from tests/jerry/es2015/object-prototype-proto.js rename to tests/jerry/es.next/object-prototype-proto.js diff --git a/tests/jerry/es2015/object-prototype-tostring.js b/tests/jerry/es.next/object-prototype-tostring.js similarity index 100% rename from tests/jerry/es2015/object-prototype-tostring.js rename to tests/jerry/es.next/object-prototype-tostring.js diff --git a/tests/jerry/es2015/object-seal-with-symbol.js b/tests/jerry/es.next/object-seal-with-symbol.js similarity index 100% rename from tests/jerry/es2015/object-seal-with-symbol.js rename to tests/jerry/es.next/object-seal-with-symbol.js diff --git a/tests/jerry/es2015/octal-literal.js b/tests/jerry/es.next/octal-literal.js similarity index 100% rename from tests/jerry/es2015/octal-literal.js rename to tests/jerry/es.next/octal-literal.js diff --git a/tests/jerry/es2015/promise-all-iterator.js b/tests/jerry/es.next/promise-all-iterator.js similarity index 100% rename from tests/jerry/es2015/promise-all-iterator.js rename to tests/jerry/es.next/promise-all-iterator.js diff --git a/tests/jerry/es2015/promise-new-target.js b/tests/jerry/es.next/promise-new-target.js similarity index 100% rename from tests/jerry/es2015/promise-new-target.js rename to tests/jerry/es.next/promise-new-target.js diff --git a/tests/jerry/es2015/promise-race-iterator.js b/tests/jerry/es.next/promise-race-iterator.js similarity index 100% rename from tests/jerry/es2015/promise-race-iterator.js rename to tests/jerry/es.next/promise-race-iterator.js diff --git a/tests/jerry/es2015/promise-species.js b/tests/jerry/es.next/promise-species.js similarity index 100% rename from tests/jerry/es2015/promise-species.js rename to tests/jerry/es.next/promise-species.js diff --git a/tests/jerry/es2015/promise-thenable.js b/tests/jerry/es.next/promise-thenable.js similarity index 100% rename from tests/jerry/es2015/promise-thenable.js rename to tests/jerry/es.next/promise-thenable.js diff --git a/tests/jerry/es2015/proxy_call.js b/tests/jerry/es.next/proxy_call.js similarity index 100% rename from tests/jerry/es2015/proxy_call.js rename to tests/jerry/es.next/proxy_call.js diff --git a/tests/jerry/es2015/proxy_construct.js b/tests/jerry/es.next/proxy_construct.js similarity index 100% rename from tests/jerry/es2015/proxy_construct.js rename to tests/jerry/es.next/proxy_construct.js diff --git a/tests/jerry/es2015/proxy_create.js b/tests/jerry/es.next/proxy_create.js similarity index 100% rename from tests/jerry/es2015/proxy_create.js rename to tests/jerry/es.next/proxy_create.js diff --git a/tests/jerry/es2015/proxy_define_own_property.js b/tests/jerry/es.next/proxy_define_own_property.js similarity index 100% rename from tests/jerry/es2015/proxy_define_own_property.js rename to tests/jerry/es.next/proxy_define_own_property.js diff --git a/tests/jerry/es2015/proxy_delete.js b/tests/jerry/es.next/proxy_delete.js similarity index 100% rename from tests/jerry/es2015/proxy_delete.js rename to tests/jerry/es.next/proxy_delete.js diff --git a/tests/jerry/es2015/proxy_get.js b/tests/jerry/es.next/proxy_get.js similarity index 100% rename from tests/jerry/es2015/proxy_get.js rename to tests/jerry/es.next/proxy_get.js diff --git a/tests/jerry/es2015/proxy_get_own_property_descriptor.js b/tests/jerry/es.next/proxy_get_own_property_descriptor.js similarity index 100% rename from tests/jerry/es2015/proxy_get_own_property_descriptor.js rename to tests/jerry/es.next/proxy_get_own_property_descriptor.js diff --git a/tests/jerry/es2015/proxy_get_prototoype_of.js b/tests/jerry/es.next/proxy_get_prototoype_of.js similarity index 100% rename from tests/jerry/es2015/proxy_get_prototoype_of.js rename to tests/jerry/es.next/proxy_get_prototoype_of.js diff --git a/tests/jerry/es2015/proxy_has.js b/tests/jerry/es.next/proxy_has.js similarity index 100% rename from tests/jerry/es2015/proxy_has.js rename to tests/jerry/es.next/proxy_has.js diff --git a/tests/jerry/es2015/proxy_is_extensible.js b/tests/jerry/es.next/proxy_is_extensible.js similarity index 100% rename from tests/jerry/es2015/proxy_is_extensible.js rename to tests/jerry/es.next/proxy_is_extensible.js diff --git a/tests/jerry/es2015/proxy_own_keys.js b/tests/jerry/es.next/proxy_own_keys.js similarity index 100% rename from tests/jerry/es2015/proxy_own_keys.js rename to tests/jerry/es.next/proxy_own_keys.js diff --git a/tests/jerry/es2015/proxy_prevent_extensions.js b/tests/jerry/es.next/proxy_prevent_extensions.js similarity index 100% rename from tests/jerry/es2015/proxy_prevent_extensions.js rename to tests/jerry/es.next/proxy_prevent_extensions.js diff --git a/tests/jerry/es2015/proxy_revocable.js b/tests/jerry/es.next/proxy_revocable.js similarity index 100% rename from tests/jerry/es2015/proxy_revocable.js rename to tests/jerry/es.next/proxy_revocable.js diff --git a/tests/jerry/es2015/proxy_set.js b/tests/jerry/es.next/proxy_set.js similarity index 100% rename from tests/jerry/es2015/proxy_set.js rename to tests/jerry/es.next/proxy_set.js diff --git a/tests/jerry/es2015/proxy_set_apply_receiver.js b/tests/jerry/es.next/proxy_set_apply_receiver.js similarity index 100% rename from tests/jerry/es2015/proxy_set_apply_receiver.js rename to tests/jerry/es.next/proxy_set_apply_receiver.js diff --git a/tests/jerry/es2015/proxy_set_prototoype_of.js b/tests/jerry/es.next/proxy_set_prototoype_of.js similarity index 100% rename from tests/jerry/es2015/proxy_set_prototoype_of.js rename to tests/jerry/es.next/proxy_set_prototoype_of.js diff --git a/tests/jerry/es2015/reflect-apply.js b/tests/jerry/es.next/reflect-apply.js similarity index 100% rename from tests/jerry/es2015/reflect-apply.js rename to tests/jerry/es.next/reflect-apply.js diff --git a/tests/jerry/es2015/reflect-construct.js b/tests/jerry/es.next/reflect-construct.js similarity index 100% rename from tests/jerry/es2015/reflect-construct.js rename to tests/jerry/es.next/reflect-construct.js diff --git a/tests/jerry/es2015/reflect-define-Property.js b/tests/jerry/es.next/reflect-define-Property.js similarity index 100% rename from tests/jerry/es2015/reflect-define-Property.js rename to tests/jerry/es.next/reflect-define-Property.js diff --git a/tests/jerry/es2015/reflect-deleteproperty.js b/tests/jerry/es.next/reflect-deleteproperty.js similarity index 100% rename from tests/jerry/es2015/reflect-deleteproperty.js rename to tests/jerry/es.next/reflect-deleteproperty.js diff --git a/tests/jerry/es2015/reflect-get-own-property-description.js b/tests/jerry/es.next/reflect-get-own-property-description.js similarity index 100% rename from tests/jerry/es2015/reflect-get-own-property-description.js rename to tests/jerry/es.next/reflect-get-own-property-description.js diff --git a/tests/jerry/es2015/reflect-get.js b/tests/jerry/es.next/reflect-get.js similarity index 100% rename from tests/jerry/es2015/reflect-get.js rename to tests/jerry/es.next/reflect-get.js diff --git a/tests/jerry/es2015/reflect-getPrototypeOf.js b/tests/jerry/es.next/reflect-getPrototypeOf.js similarity index 100% rename from tests/jerry/es2015/reflect-getPrototypeOf.js rename to tests/jerry/es.next/reflect-getPrototypeOf.js diff --git a/tests/jerry/es2015/reflect-has.js b/tests/jerry/es.next/reflect-has.js similarity index 100% rename from tests/jerry/es2015/reflect-has.js rename to tests/jerry/es.next/reflect-has.js diff --git a/tests/jerry/es2015/reflect-isextensible.js b/tests/jerry/es.next/reflect-isextensible.js similarity index 100% rename from tests/jerry/es2015/reflect-isextensible.js rename to tests/jerry/es.next/reflect-isextensible.js diff --git a/tests/jerry/es2015/reflect-own-keys.js b/tests/jerry/es.next/reflect-own-keys.js similarity index 100% rename from tests/jerry/es2015/reflect-own-keys.js rename to tests/jerry/es.next/reflect-own-keys.js diff --git a/tests/jerry/es2015/reflect-preventextensions.js b/tests/jerry/es.next/reflect-preventextensions.js similarity index 100% rename from tests/jerry/es2015/reflect-preventextensions.js rename to tests/jerry/es.next/reflect-preventextensions.js diff --git a/tests/jerry/es2015/reflect-set.js b/tests/jerry/es.next/reflect-set.js similarity index 100% rename from tests/jerry/es2015/reflect-set.js rename to tests/jerry/es.next/reflect-set.js diff --git a/tests/jerry/es2015/reflect-setPrototypeOf.js b/tests/jerry/es.next/reflect-setPrototypeOf.js similarity index 100% rename from tests/jerry/es2015/reflect-setPrototypeOf.js rename to tests/jerry/es.next/reflect-setPrototypeOf.js diff --git a/tests/jerry/es2015/regexp-accessors-descriptors.js b/tests/jerry/es.next/regexp-accessors-descriptors.js similarity index 100% rename from tests/jerry/es2015/regexp-accessors-descriptors.js rename to tests/jerry/es.next/regexp-accessors-descriptors.js diff --git a/tests/jerry/es2015/regexp-construct.js b/tests/jerry/es.next/regexp-construct.js similarity index 100% rename from tests/jerry/es2015/regexp-construct.js rename to tests/jerry/es.next/regexp-construct.js diff --git a/tests/jerry/es2015/regexp-flags.js b/tests/jerry/es.next/regexp-flags.js similarity index 100% rename from tests/jerry/es2015/regexp-flags.js rename to tests/jerry/es.next/regexp-flags.js diff --git a/tests/jerry/es2015/regexp-lastindex.js b/tests/jerry/es.next/regexp-lastindex.js similarity index 100% rename from tests/jerry/es2015/regexp-lastindex.js rename to tests/jerry/es.next/regexp-lastindex.js diff --git a/tests/jerry/es2015/regexp-new-target.js b/tests/jerry/es.next/regexp-new-target.js similarity index 100% rename from tests/jerry/es2015/regexp-new-target.js rename to tests/jerry/es.next/regexp-new-target.js diff --git a/tests/jerry/es2015/regexp-prototype-match.js b/tests/jerry/es.next/regexp-prototype-match.js similarity index 100% rename from tests/jerry/es2015/regexp-prototype-match.js rename to tests/jerry/es.next/regexp-prototype-match.js diff --git a/tests/jerry/es2015/regexp-prototype-source.js b/tests/jerry/es.next/regexp-prototype-source.js similarity index 100% rename from tests/jerry/es2015/regexp-prototype-source.js rename to tests/jerry/es.next/regexp-prototype-source.js diff --git a/tests/jerry/es2015/regexp-prototype-test.js b/tests/jerry/es.next/regexp-prototype-test.js similarity index 100% rename from tests/jerry/es2015/regexp-prototype-test.js rename to tests/jerry/es.next/regexp-prototype-test.js diff --git a/tests/jerry/es2015/regexp-routines.js b/tests/jerry/es.next/regexp-routines.js similarity index 100% rename from tests/jerry/es2015/regexp-routines.js rename to tests/jerry/es.next/regexp-routines.js diff --git a/tests/jerry/es2015/regexp-unicode.js b/tests/jerry/es.next/regexp-unicode.js similarity index 100% rename from tests/jerry/es2015/regexp-unicode.js rename to tests/jerry/es.next/regexp-unicode.js diff --git a/tests/jerry/es2015/regression-test-issue-1616.js b/tests/jerry/es.next/regression-test-issue-1616.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1616.js rename to tests/jerry/es.next/regression-test-issue-1616.js diff --git a/tests/jerry/es2015/regression-test-issue-1622.js b/tests/jerry/es.next/regression-test-issue-1622.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1622.js rename to tests/jerry/es.next/regression-test-issue-1622.js diff --git a/tests/jerry/es2015/regression-test-issue-1633.js b/tests/jerry/es.next/regression-test-issue-1633.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1633.js rename to tests/jerry/es.next/regression-test-issue-1633.js diff --git a/tests/jerry/es2015/regression-test-issue-1670.js b/tests/jerry/es.next/regression-test-issue-1670.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1670.js rename to tests/jerry/es.next/regression-test-issue-1670.js diff --git a/tests/jerry/es2015/regression-test-issue-1763.js b/tests/jerry/es.next/regression-test-issue-1763.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1763.js rename to tests/jerry/es.next/regression-test-issue-1763.js diff --git a/tests/jerry/es2015/regression-test-issue-1765.js b/tests/jerry/es.next/regression-test-issue-1765.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1765.js rename to tests/jerry/es.next/regression-test-issue-1765.js diff --git a/tests/jerry/es2015/regression-test-issue-1881.js b/tests/jerry/es.next/regression-test-issue-1881.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1881.js rename to tests/jerry/es.next/regression-test-issue-1881.js diff --git a/tests/jerry/es2015/regression-test-issue-1936.js b/tests/jerry/es.next/regression-test-issue-1936.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1936.js rename to tests/jerry/es.next/regression-test-issue-1936.js diff --git a/tests/jerry/es2015/regression-test-issue-1995.js b/tests/jerry/es.next/regression-test-issue-1995.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1995.js rename to tests/jerry/es.next/regression-test-issue-1995.js diff --git a/tests/jerry/es2015/regression-test-issue-1996.js b/tests/jerry/es.next/regression-test-issue-1996.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1996.js rename to tests/jerry/es.next/regression-test-issue-1996.js diff --git a/tests/jerry/es2015/regression-test-issue-1997.js b/tests/jerry/es.next/regression-test-issue-1997.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-1997.js rename to tests/jerry/es.next/regression-test-issue-1997.js diff --git a/tests/jerry/es2015/regression-test-issue-2107.js b/tests/jerry/es.next/regression-test-issue-2107.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2107.js rename to tests/jerry/es.next/regression-test-issue-2107.js diff --git a/tests/jerry/es2015/regression-test-issue-2110.js b/tests/jerry/es.next/regression-test-issue-2110.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2110.js rename to tests/jerry/es.next/regression-test-issue-2110.js diff --git a/tests/jerry/es2015/regression-test-issue-2111.js b/tests/jerry/es.next/regression-test-issue-2111.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2111.js rename to tests/jerry/es.next/regression-test-issue-2111.js diff --git a/tests/jerry/es2015/regression-test-issue-2143.js b/tests/jerry/es.next/regression-test-issue-2143.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2143.js rename to tests/jerry/es.next/regression-test-issue-2143.js diff --git a/tests/jerry/es2015/regression-test-issue-2181.js b/tests/jerry/es.next/regression-test-issue-2181.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2181.js rename to tests/jerry/es.next/regression-test-issue-2181.js diff --git a/tests/jerry/es2015/regression-test-issue-2414.js b/tests/jerry/es.next/regression-test-issue-2414.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2414.js rename to tests/jerry/es.next/regression-test-issue-2414.js diff --git a/tests/jerry/es2015/regression-test-issue-2435.js b/tests/jerry/es.next/regression-test-issue-2435.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2435.js rename to tests/jerry/es.next/regression-test-issue-2435.js diff --git a/tests/jerry/es2015/regression-test-issue-2465.js b/tests/jerry/es.next/regression-test-issue-2465.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2465.js rename to tests/jerry/es.next/regression-test-issue-2465.js diff --git a/tests/jerry/es2015/regression-test-issue-2468.js b/tests/jerry/es.next/regression-test-issue-2468.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2468.js rename to tests/jerry/es.next/regression-test-issue-2468.js diff --git a/tests/jerry/es2015/regression-test-issue-2486.js b/tests/jerry/es.next/regression-test-issue-2486.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2486.js rename to tests/jerry/es.next/regression-test-issue-2486.js diff --git a/tests/jerry/es2015/regression-test-issue-2487.js b/tests/jerry/es.next/regression-test-issue-2487.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2487.js rename to tests/jerry/es.next/regression-test-issue-2487.js diff --git a/tests/jerry/es2015/regression-test-issue-2488.js b/tests/jerry/es.next/regression-test-issue-2488.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2488.js rename to tests/jerry/es.next/regression-test-issue-2488.js diff --git a/tests/jerry/es2015/regression-test-issue-2489-original.js b/tests/jerry/es.next/regression-test-issue-2489-original.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2489-original.js rename to tests/jerry/es.next/regression-test-issue-2489-original.js diff --git a/tests/jerry/es2015/regression-test-issue-2490.js b/tests/jerry/es.next/regression-test-issue-2490.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2490.js rename to tests/jerry/es.next/regression-test-issue-2490.js diff --git a/tests/jerry/es2015/regression-test-issue-2528.js b/tests/jerry/es.next/regression-test-issue-2528.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2528.js rename to tests/jerry/es.next/regression-test-issue-2528.js diff --git a/tests/jerry/es2015/regression-test-issue-2544.js b/tests/jerry/es.next/regression-test-issue-2544.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2544.js rename to tests/jerry/es.next/regression-test-issue-2544.js diff --git a/tests/jerry/es2015/regression-test-issue-2587.js b/tests/jerry/es.next/regression-test-issue-2587.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2587.js rename to tests/jerry/es.next/regression-test-issue-2587.js diff --git a/tests/jerry/es2015/regression-test-issue-2602.js b/tests/jerry/es.next/regression-test-issue-2602.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2602.js rename to tests/jerry/es.next/regression-test-issue-2602.js diff --git a/tests/jerry/es2015/regression-test-issue-2603.js b/tests/jerry/es.next/regression-test-issue-2603.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2603.js rename to tests/jerry/es.next/regression-test-issue-2603.js diff --git a/tests/jerry/es2015/regression-test-issue-2657.js b/tests/jerry/es.next/regression-test-issue-2657.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2657.js rename to tests/jerry/es.next/regression-test-issue-2657.js diff --git a/tests/jerry/es2015/regression-test-issue-2658.js b/tests/jerry/es.next/regression-test-issue-2658.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2658.js rename to tests/jerry/es.next/regression-test-issue-2658.js diff --git a/tests/jerry/es2015/regression-test-issue-2664.js b/tests/jerry/es.next/regression-test-issue-2664.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2664.js rename to tests/jerry/es.next/regression-test-issue-2664.js diff --git a/tests/jerry/es2015/regression-test-issue-2666.js b/tests/jerry/es.next/regression-test-issue-2666.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2666.js rename to tests/jerry/es.next/regression-test-issue-2666.js diff --git a/tests/jerry/es2015/regression-test-issue-2667.js b/tests/jerry/es.next/regression-test-issue-2667.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2667.js rename to tests/jerry/es.next/regression-test-issue-2667.js diff --git a/tests/jerry/es2015/regression-test-issue-2671.js b/tests/jerry/es.next/regression-test-issue-2671.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2671.js rename to tests/jerry/es.next/regression-test-issue-2671.js diff --git a/tests/jerry/es2015/regression-test-issue-2693.js b/tests/jerry/es.next/regression-test-issue-2693.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2693.js rename to tests/jerry/es.next/regression-test-issue-2693.js diff --git a/tests/jerry/es2015/regression-test-issue-2698.js b/tests/jerry/es.next/regression-test-issue-2698.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2698.js rename to tests/jerry/es.next/regression-test-issue-2698.js diff --git a/tests/jerry/es2015/regression-test-issue-2724.js b/tests/jerry/es.next/regression-test-issue-2724.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2724.js rename to tests/jerry/es.next/regression-test-issue-2724.js diff --git a/tests/jerry/es2015/regression-test-issue-2743.js b/tests/jerry/es.next/regression-test-issue-2743.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2743.js rename to tests/jerry/es.next/regression-test-issue-2743.js diff --git a/tests/jerry/es2015/regression-test-issue-2757.js b/tests/jerry/es.next/regression-test-issue-2757.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2757.js rename to tests/jerry/es.next/regression-test-issue-2757.js diff --git a/tests/jerry/es2015/regression-test-issue-2768.js b/tests/jerry/es.next/regression-test-issue-2768.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2768.js rename to tests/jerry/es.next/regression-test-issue-2768.js diff --git a/tests/jerry/es2015/regression-test-issue-2769.js b/tests/jerry/es.next/regression-test-issue-2769.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2769.js rename to tests/jerry/es.next/regression-test-issue-2769.js diff --git a/tests/jerry/es2015/regression-test-issue-2770.js b/tests/jerry/es.next/regression-test-issue-2770.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2770.js rename to tests/jerry/es.next/regression-test-issue-2770.js diff --git a/tests/jerry/es2015/regression-test-issue-2777.js b/tests/jerry/es.next/regression-test-issue-2777.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2777.js rename to tests/jerry/es.next/regression-test-issue-2777.js diff --git a/tests/jerry/es2015/regression-test-issue-2779.js b/tests/jerry/es.next/regression-test-issue-2779.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2779.js rename to tests/jerry/es.next/regression-test-issue-2779.js diff --git a/tests/jerry/es2015/regression-test-issue-2782.js b/tests/jerry/es.next/regression-test-issue-2782.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2782.js rename to tests/jerry/es.next/regression-test-issue-2782.js diff --git a/tests/jerry/es2015/regression-test-issue-2783.js b/tests/jerry/es.next/regression-test-issue-2783.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2783.js rename to tests/jerry/es.next/regression-test-issue-2783.js diff --git a/tests/jerry/es2015/regression-test-issue-2822.js b/tests/jerry/es.next/regression-test-issue-2822.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2822.js rename to tests/jerry/es.next/regression-test-issue-2822.js diff --git a/tests/jerry/es2015/regression-test-issue-2823.js b/tests/jerry/es.next/regression-test-issue-2823.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2823.js rename to tests/jerry/es.next/regression-test-issue-2823.js diff --git a/tests/jerry/es2015/regression-test-issue-2825.js b/tests/jerry/es.next/regression-test-issue-2825.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2825.js rename to tests/jerry/es.next/regression-test-issue-2825.js diff --git a/tests/jerry/es2015/regression-test-issue-2842.js b/tests/jerry/es.next/regression-test-issue-2842.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2842.js rename to tests/jerry/es.next/regression-test-issue-2842.js diff --git a/tests/jerry/es2015/regression-test-issue-2848.js b/tests/jerry/es.next/regression-test-issue-2848.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2848.js rename to tests/jerry/es.next/regression-test-issue-2848.js diff --git a/tests/jerry/es2015/regression-test-issue-2850.js b/tests/jerry/es.next/regression-test-issue-2850.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2850.js rename to tests/jerry/es.next/regression-test-issue-2850.js diff --git a/tests/jerry/es2015/regression-test-issue-2851.js b/tests/jerry/es.next/regression-test-issue-2851.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2851.js rename to tests/jerry/es.next/regression-test-issue-2851.js diff --git a/tests/jerry/es2015/regression-test-issue-2852.js b/tests/jerry/es.next/regression-test-issue-2852.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2852.js rename to tests/jerry/es.next/regression-test-issue-2852.js diff --git a/tests/jerry/es2015/regression-test-issue-2853.js b/tests/jerry/es.next/regression-test-issue-2853.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2853.js rename to tests/jerry/es.next/regression-test-issue-2853.js diff --git a/tests/jerry/es2015/regression-test-issue-2854.js b/tests/jerry/es.next/regression-test-issue-2854.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2854.js rename to tests/jerry/es.next/regression-test-issue-2854.js diff --git a/tests/jerry/es2015/regression-test-issue-2891.js b/tests/jerry/es.next/regression-test-issue-2891.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2891.js rename to tests/jerry/es.next/regression-test-issue-2891.js diff --git a/tests/jerry/es2015/regression-test-issue-2895.js b/tests/jerry/es.next/regression-test-issue-2895.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2895.js rename to tests/jerry/es.next/regression-test-issue-2895.js diff --git a/tests/jerry/es2015/regression-test-issue-2910.js b/tests/jerry/es.next/regression-test-issue-2910.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2910.js rename to tests/jerry/es.next/regression-test-issue-2910.js diff --git a/tests/jerry/es2015/regression-test-issue-2911.js b/tests/jerry/es.next/regression-test-issue-2911.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2911.js rename to tests/jerry/es.next/regression-test-issue-2911.js diff --git a/tests/jerry/es2015/regression-test-issue-2947.js b/tests/jerry/es.next/regression-test-issue-2947.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2947.js rename to tests/jerry/es.next/regression-test-issue-2947.js diff --git a/tests/jerry/es2015/regression-test-issue-2948.js b/tests/jerry/es.next/regression-test-issue-2948.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2948.js rename to tests/jerry/es.next/regression-test-issue-2948.js diff --git a/tests/jerry/es2015/regression-test-issue-2950.js b/tests/jerry/es.next/regression-test-issue-2950.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2950.js rename to tests/jerry/es.next/regression-test-issue-2950.js diff --git a/tests/jerry/es2015/regression-test-issue-2951.js b/tests/jerry/es.next/regression-test-issue-2951.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2951.js rename to tests/jerry/es.next/regression-test-issue-2951.js diff --git a/tests/jerry/es2015/regression-test-issue-2975.js b/tests/jerry/es.next/regression-test-issue-2975.js similarity index 91% rename from tests/jerry/es2015/regression-test-issue-2975.js rename to tests/jerry/es.next/regression-test-issue-2975.js index d3d53607f..d7068951a 100644 --- a/tests/jerry/es2015/regression-test-issue-2975.js +++ b/tests/jerry/es.next/regression-test-issue-2975.js @@ -16,7 +16,7 @@ /* Import/export statements must be in the global scope. */ var eval = eval.bind(); try { - eval('import { c } from "tests/jerry/es2015/module-export-01.js";'); + eval('import { c } from "tests/jerry/es.next/module-export-01.js";'); assert (false); } catch (e) { assert (e instanceof SyntaxError); diff --git a/tests/jerry/es2015/regression-test-issue-2990.js b/tests/jerry/es.next/regression-test-issue-2990.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-2990.js rename to tests/jerry/es.next/regression-test-issue-2990.js diff --git a/tests/jerry/es2015/regression-test-issue-3040.js b/tests/jerry/es.next/regression-test-issue-3040.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3040.js rename to tests/jerry/es.next/regression-test-issue-3040.js diff --git a/tests/jerry/es2015/regression-test-issue-3043-3046.js b/tests/jerry/es.next/regression-test-issue-3043-3046.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3043-3046.js rename to tests/jerry/es.next/regression-test-issue-3043-3046.js diff --git a/tests/jerry/es2015/regression-test-issue-3045.js b/tests/jerry/es.next/regression-test-issue-3045.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3045.js rename to tests/jerry/es.next/regression-test-issue-3045.js diff --git a/tests/jerry/es2015/regression-test-issue-3049.js b/tests/jerry/es.next/regression-test-issue-3049.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3049.js rename to tests/jerry/es.next/regression-test-issue-3049.js diff --git a/tests/jerry/es2015/regression-test-issue-3050.js b/tests/jerry/es.next/regression-test-issue-3050.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3050.js rename to tests/jerry/es.next/regression-test-issue-3050.js diff --git a/tests/jerry/es2015/regression-test-issue-3062.js b/tests/jerry/es.next/regression-test-issue-3062.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3062.js rename to tests/jerry/es.next/regression-test-issue-3062.js diff --git a/tests/jerry/es2015/regression-test-issue-3063.js b/tests/jerry/es.next/regression-test-issue-3063.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3063.js rename to tests/jerry/es.next/regression-test-issue-3063.js diff --git a/tests/jerry/es2015/regression-test-issue-3067.js b/tests/jerry/es.next/regression-test-issue-3067.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3067.js rename to tests/jerry/es.next/regression-test-issue-3067.js diff --git a/tests/jerry/es2015/regression-test-issue-3070.js b/tests/jerry/es.next/regression-test-issue-3070.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3070.js rename to tests/jerry/es.next/regression-test-issue-3070.js diff --git a/tests/jerry/es2015/regression-test-issue-3072.js b/tests/jerry/es.next/regression-test-issue-3072.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3072.js rename to tests/jerry/es.next/regression-test-issue-3072.js diff --git a/tests/jerry/es2015/regression-test-issue-3078.js b/tests/jerry/es.next/regression-test-issue-3078.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3078.js rename to tests/jerry/es.next/regression-test-issue-3078.js diff --git a/tests/jerry/es2015/regression-test-issue-3079.js b/tests/jerry/es.next/regression-test-issue-3079.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3079.js rename to tests/jerry/es.next/regression-test-issue-3079.js diff --git a/tests/jerry/es2015/regression-test-issue-3084.js b/tests/jerry/es.next/regression-test-issue-3084.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3084.js rename to tests/jerry/es.next/regression-test-issue-3084.js diff --git a/tests/jerry/es2015/regression-test-issue-3095.js b/tests/jerry/es.next/regression-test-issue-3095.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3095.js rename to tests/jerry/es.next/regression-test-issue-3095.js diff --git a/tests/jerry/es2015/regression-test-issue-3097.js b/tests/jerry/es.next/regression-test-issue-3097.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3097.js rename to tests/jerry/es.next/regression-test-issue-3097.js diff --git a/tests/jerry/es2015/regression-test-issue-3105.js b/tests/jerry/es.next/regression-test-issue-3105.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3105.js rename to tests/jerry/es.next/regression-test-issue-3105.js diff --git a/tests/jerry/es2015/regression-test-issue-3106.js b/tests/jerry/es.next/regression-test-issue-3106.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3106.js rename to tests/jerry/es.next/regression-test-issue-3106.js diff --git a/tests/jerry/es2015/regression-test-issue-3107.js b/tests/jerry/es.next/regression-test-issue-3107.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3107.js rename to tests/jerry/es.next/regression-test-issue-3107.js diff --git a/tests/jerry/es2015/regression-test-issue-3109.js b/tests/jerry/es.next/regression-test-issue-3109.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3109.js rename to tests/jerry/es.next/regression-test-issue-3109.js diff --git a/tests/jerry/es2015/regression-test-issue-3129.js b/tests/jerry/es.next/regression-test-issue-3129.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3129.js rename to tests/jerry/es.next/regression-test-issue-3129.js diff --git a/tests/jerry/es2015/regression-test-issue-3162.js b/tests/jerry/es.next/regression-test-issue-3162.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3162.js rename to tests/jerry/es.next/regression-test-issue-3162.js diff --git a/tests/jerry/es2015/regression-test-issue-3204.js b/tests/jerry/es.next/regression-test-issue-3204.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3204.js rename to tests/jerry/es.next/regression-test-issue-3204.js diff --git a/tests/jerry/es2015/regression-test-issue-3222.js b/tests/jerry/es.next/regression-test-issue-3222.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3222.js rename to tests/jerry/es.next/regression-test-issue-3222.js diff --git a/tests/jerry/es2015/regression-test-issue-3237.js b/tests/jerry/es.next/regression-test-issue-3237.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3237.js rename to tests/jerry/es.next/regression-test-issue-3237.js diff --git a/tests/jerry/es2015/regression-test-issue-3243.js b/tests/jerry/es.next/regression-test-issue-3243.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3243.js rename to tests/jerry/es.next/regression-test-issue-3243.js diff --git a/tests/jerry/es2015/regression-test-issue-3250.js b/tests/jerry/es.next/regression-test-issue-3250.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3250.js rename to tests/jerry/es.next/regression-test-issue-3250.js diff --git a/tests/jerry/es2015/regression-test-issue-3252.js b/tests/jerry/es.next/regression-test-issue-3252.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3252.js rename to tests/jerry/es.next/regression-test-issue-3252.js diff --git a/tests/jerry/es2015/regression-test-issue-3262.js b/tests/jerry/es.next/regression-test-issue-3262.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3262.js rename to tests/jerry/es.next/regression-test-issue-3262.js diff --git a/tests/jerry/es2015/regression-test-issue-3267.js b/tests/jerry/es.next/regression-test-issue-3267.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3267.js rename to tests/jerry/es.next/regression-test-issue-3267.js diff --git a/tests/jerry/es2015/regression-test-issue-3298.js b/tests/jerry/es.next/regression-test-issue-3298.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3298.js rename to tests/jerry/es.next/regression-test-issue-3298.js diff --git a/tests/jerry/es2015/regression-test-issue-3306.js b/tests/jerry/es.next/regression-test-issue-3306.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3306.js rename to tests/jerry/es.next/regression-test-issue-3306.js diff --git a/tests/jerry/es2015/regression-test-issue-3348.js b/tests/jerry/es.next/regression-test-issue-3348.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3348.js rename to tests/jerry/es.next/regression-test-issue-3348.js diff --git a/tests/jerry/es2015/regression-test-issue-3355.js b/tests/jerry/es.next/regression-test-issue-3355.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3355.js rename to tests/jerry/es.next/regression-test-issue-3355.js diff --git a/tests/jerry/es2015/regression-test-issue-3356.js b/tests/jerry/es.next/regression-test-issue-3356.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3356.js rename to tests/jerry/es.next/regression-test-issue-3356.js diff --git a/tests/jerry/es2015/regression-test-issue-3360.js b/tests/jerry/es.next/regression-test-issue-3360.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3360.js rename to tests/jerry/es.next/regression-test-issue-3360.js diff --git a/tests/jerry/es2015/regression-test-issue-3361.js b/tests/jerry/es.next/regression-test-issue-3361.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3361.js rename to tests/jerry/es.next/regression-test-issue-3361.js diff --git a/tests/jerry/es2015/regression-test-issue-3363.js b/tests/jerry/es.next/regression-test-issue-3363.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3363.js rename to tests/jerry/es.next/regression-test-issue-3363.js diff --git a/tests/jerry/es2015/regression-test-issue-3364.js b/tests/jerry/es.next/regression-test-issue-3364.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3364.js rename to tests/jerry/es.next/regression-test-issue-3364.js diff --git a/tests/jerry/es2015/regression-test-issue-3376.js b/tests/jerry/es.next/regression-test-issue-3376.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3376.js rename to tests/jerry/es.next/regression-test-issue-3376.js diff --git a/tests/jerry/es2015/regression-test-issue-3381.js b/tests/jerry/es.next/regression-test-issue-3381.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3381.js rename to tests/jerry/es.next/regression-test-issue-3381.js diff --git a/tests/jerry/es2015/regression-test-issue-3383.js b/tests/jerry/es.next/regression-test-issue-3383.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3383.js rename to tests/jerry/es.next/regression-test-issue-3383.js diff --git a/tests/jerry/es2015/regression-test-issue-3390.js b/tests/jerry/es.next/regression-test-issue-3390.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3390.js rename to tests/jerry/es.next/regression-test-issue-3390.js diff --git a/tests/jerry/es2015/regression-test-issue-3396.js b/tests/jerry/es.next/regression-test-issue-3396.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3396.js rename to tests/jerry/es.next/regression-test-issue-3396.js diff --git a/tests/jerry/es2015/regression-test-issue-3408.js b/tests/jerry/es.next/regression-test-issue-3408.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3408.js rename to tests/jerry/es.next/regression-test-issue-3408.js diff --git a/tests/jerry/es2015/regression-test-issue-3409.js b/tests/jerry/es.next/regression-test-issue-3409.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3409.js rename to tests/jerry/es.next/regression-test-issue-3409.js diff --git a/tests/jerry/es2015/regression-test-issue-3411.js b/tests/jerry/es.next/regression-test-issue-3411.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3411.js rename to tests/jerry/es.next/regression-test-issue-3411.js diff --git a/tests/jerry/es2015/regression-test-issue-3419.js b/tests/jerry/es.next/regression-test-issue-3419.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3419.js rename to tests/jerry/es.next/regression-test-issue-3419.js diff --git a/tests/jerry/es2015/regression-test-issue-3420.js b/tests/jerry/es.next/regression-test-issue-3420.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3420.js rename to tests/jerry/es.next/regression-test-issue-3420.js diff --git a/tests/jerry/es2015/regression-test-issue-3421.js b/tests/jerry/es.next/regression-test-issue-3421.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3421.js rename to tests/jerry/es.next/regression-test-issue-3421.js diff --git a/tests/jerry/es2015/regression-test-issue-3422.js b/tests/jerry/es.next/regression-test-issue-3422.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3422.js rename to tests/jerry/es.next/regression-test-issue-3422.js diff --git a/tests/jerry/es2015/regression-test-issue-3431.js b/tests/jerry/es.next/regression-test-issue-3431.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3431.js rename to tests/jerry/es.next/regression-test-issue-3431.js diff --git a/tests/jerry/es2015/regression-test-issue-3434.js b/tests/jerry/es.next/regression-test-issue-3434.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3434.js rename to tests/jerry/es.next/regression-test-issue-3434.js diff --git a/tests/jerry/es2015/regression-test-issue-3437.js b/tests/jerry/es.next/regression-test-issue-3437.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3437.js rename to tests/jerry/es.next/regression-test-issue-3437.js diff --git a/tests/jerry/es2015/regression-test-issue-3454.js b/tests/jerry/es.next/regression-test-issue-3454.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3454.js rename to tests/jerry/es.next/regression-test-issue-3454.js diff --git a/tests/jerry/es2015/regression-test-issue-3455.js b/tests/jerry/es.next/regression-test-issue-3455.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3455.js rename to tests/jerry/es.next/regression-test-issue-3455.js diff --git a/tests/jerry/es2015/regression-test-issue-3458.js b/tests/jerry/es.next/regression-test-issue-3458.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3458.js rename to tests/jerry/es.next/regression-test-issue-3458.js diff --git a/tests/jerry/es2015/regression-test-issue-3459.js b/tests/jerry/es.next/regression-test-issue-3459.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3459.js rename to tests/jerry/es.next/regression-test-issue-3459.js diff --git a/tests/jerry/es2015/regression-test-issue-3478.js b/tests/jerry/es.next/regression-test-issue-3478.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3478.js rename to tests/jerry/es.next/regression-test-issue-3478.js diff --git a/tests/jerry/es2015/regression-test-issue-3479.js b/tests/jerry/es.next/regression-test-issue-3479.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3479.js rename to tests/jerry/es.next/regression-test-issue-3479.js diff --git a/tests/jerry/es2015/regression-test-issue-3483.js b/tests/jerry/es.next/regression-test-issue-3483.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3483.js rename to tests/jerry/es.next/regression-test-issue-3483.js diff --git a/tests/jerry/es2015/regression-test-issue-3485.js b/tests/jerry/es.next/regression-test-issue-3485.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3485.js rename to tests/jerry/es.next/regression-test-issue-3485.js diff --git a/tests/jerry/es2015/regression-test-issue-3519.js b/tests/jerry/es.next/regression-test-issue-3519.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3519.js rename to tests/jerry/es.next/regression-test-issue-3519.js diff --git a/tests/jerry/es2015/regression-test-issue-3527.js b/tests/jerry/es.next/regression-test-issue-3527.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3527.js rename to tests/jerry/es.next/regression-test-issue-3527.js diff --git a/tests/jerry/es2015/regression-test-issue-3534.js b/tests/jerry/es.next/regression-test-issue-3534.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3534.js rename to tests/jerry/es.next/regression-test-issue-3534.js diff --git a/tests/jerry/es2015/regression-test-issue-3536.js b/tests/jerry/es.next/regression-test-issue-3536.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3536.js rename to tests/jerry/es.next/regression-test-issue-3536.js diff --git a/tests/jerry/es2015/regression-test-issue-3580.js b/tests/jerry/es.next/regression-test-issue-3580.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3580.js rename to tests/jerry/es.next/regression-test-issue-3580.js diff --git a/tests/jerry/es2015/regression-test-issue-3588.js b/tests/jerry/es.next/regression-test-issue-3588.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3588.js rename to tests/jerry/es.next/regression-test-issue-3588.js diff --git a/tests/jerry/es2015/regression-test-issue-3589.js b/tests/jerry/es.next/regression-test-issue-3589.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3589.js rename to tests/jerry/es.next/regression-test-issue-3589.js diff --git a/tests/jerry/es2015/regression-test-issue-3595.js b/tests/jerry/es.next/regression-test-issue-3595.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3595.js rename to tests/jerry/es.next/regression-test-issue-3595.js diff --git a/tests/jerry/es2015/regression-test-issue-3606.js b/tests/jerry/es.next/regression-test-issue-3606.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3606.js rename to tests/jerry/es.next/regression-test-issue-3606.js diff --git a/tests/jerry/es2015/regression-test-issue-3611.js b/tests/jerry/es.next/regression-test-issue-3611.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3611.js rename to tests/jerry/es.next/regression-test-issue-3611.js diff --git a/tests/jerry/es2015/regression-test-issue-3625.js b/tests/jerry/es.next/regression-test-issue-3625.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3625.js rename to tests/jerry/es.next/regression-test-issue-3625.js diff --git a/tests/jerry/es2015/regression-test-issue-3628.js b/tests/jerry/es.next/regression-test-issue-3628.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3628.js rename to tests/jerry/es.next/regression-test-issue-3628.js diff --git a/tests/jerry/es2015/regression-test-issue-3630.js b/tests/jerry/es.next/regression-test-issue-3630.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3630.js rename to tests/jerry/es.next/regression-test-issue-3630.js diff --git a/tests/jerry/es2015/regression-test-issue-3636.js b/tests/jerry/es.next/regression-test-issue-3636.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3636.js rename to tests/jerry/es.next/regression-test-issue-3636.js diff --git a/tests/jerry/es2015/regression-test-issue-3637.js b/tests/jerry/es.next/regression-test-issue-3637.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3637.js rename to tests/jerry/es.next/regression-test-issue-3637.js diff --git a/tests/jerry/es2015/regression-test-issue-3640.js b/tests/jerry/es.next/regression-test-issue-3640.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3640.js rename to tests/jerry/es.next/regression-test-issue-3640.js diff --git a/tests/jerry/es2015/regression-test-issue-3641.js b/tests/jerry/es.next/regression-test-issue-3641.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3641.js rename to tests/jerry/es.next/regression-test-issue-3641.js diff --git a/tests/jerry/es2015/regression-test-issue-3647.js b/tests/jerry/es.next/regression-test-issue-3647.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3647.js rename to tests/jerry/es.next/regression-test-issue-3647.js diff --git a/tests/jerry/es2015/regression-test-issue-3655.js b/tests/jerry/es.next/regression-test-issue-3655.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3655.js rename to tests/jerry/es.next/regression-test-issue-3655.js diff --git a/tests/jerry/es2015/regression-test-issue-3656.js b/tests/jerry/es.next/regression-test-issue-3656.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3656.js rename to tests/jerry/es.next/regression-test-issue-3656.js diff --git a/tests/jerry/es2015/regression-test-issue-3658.js b/tests/jerry/es.next/regression-test-issue-3658.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3658.js rename to tests/jerry/es.next/regression-test-issue-3658.js diff --git a/tests/jerry/es2015/regression-test-issue-3665.js b/tests/jerry/es.next/regression-test-issue-3665.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3665.js rename to tests/jerry/es.next/regression-test-issue-3665.js diff --git a/tests/jerry/es2015/regression-test-issue-3671.js b/tests/jerry/es.next/regression-test-issue-3671.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3671.js rename to tests/jerry/es.next/regression-test-issue-3671.js diff --git a/tests/jerry/es2015/regression-test-issue-3715.js b/tests/jerry/es.next/regression-test-issue-3715.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3715.js rename to tests/jerry/es.next/regression-test-issue-3715.js diff --git a/tests/jerry/es2015/regression-test-issue-3751.js b/tests/jerry/es.next/regression-test-issue-3751.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3751.js rename to tests/jerry/es.next/regression-test-issue-3751.js diff --git a/tests/jerry/es2015/regression-test-issue-3760.js b/tests/jerry/es.next/regression-test-issue-3760.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3760.js rename to tests/jerry/es.next/regression-test-issue-3760.js diff --git a/tests/jerry/es2015/regression-test-issue-3784.js b/tests/jerry/es.next/regression-test-issue-3784.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3784.js rename to tests/jerry/es.next/regression-test-issue-3784.js diff --git a/tests/jerry/es2015/regression-test-issue-3785.js b/tests/jerry/es.next/regression-test-issue-3785.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3785.js rename to tests/jerry/es.next/regression-test-issue-3785.js diff --git a/tests/jerry/es2015/regression-test-issue-3787.js b/tests/jerry/es.next/regression-test-issue-3787.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3787.js rename to tests/jerry/es.next/regression-test-issue-3787.js diff --git a/tests/jerry/es2015/regression-test-issue-3812.js b/tests/jerry/es.next/regression-test-issue-3812.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3812.js rename to tests/jerry/es.next/regression-test-issue-3812.js diff --git a/tests/jerry/es2015/regression-test-issue-3814.js b/tests/jerry/es.next/regression-test-issue-3814.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3814.js rename to tests/jerry/es.next/regression-test-issue-3814.js diff --git a/tests/jerry/es2015/regression-test-issue-3817.js b/tests/jerry/es.next/regression-test-issue-3817.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3817.js rename to tests/jerry/es.next/regression-test-issue-3817.js diff --git a/tests/jerry/es2015/regression-test-issue-3819.js b/tests/jerry/es.next/regression-test-issue-3819.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3819.js rename to tests/jerry/es.next/regression-test-issue-3819.js diff --git a/tests/jerry/es2015/regression-test-issue-3820.js b/tests/jerry/es.next/regression-test-issue-3820.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3820.js rename to tests/jerry/es.next/regression-test-issue-3820.js diff --git a/tests/jerry/es2015/regression-test-issue-3822.js b/tests/jerry/es.next/regression-test-issue-3822.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3822.js rename to tests/jerry/es.next/regression-test-issue-3822.js diff --git a/tests/jerry/es2015/regression-test-issue-3823.js b/tests/jerry/es.next/regression-test-issue-3823.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3823.js rename to tests/jerry/es.next/regression-test-issue-3823.js diff --git a/tests/jerry/es2015/regression-test-issue-3824.js b/tests/jerry/es.next/regression-test-issue-3824.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3824.js rename to tests/jerry/es.next/regression-test-issue-3824.js diff --git a/tests/jerry/es2015/regression-test-issue-3825.js b/tests/jerry/es.next/regression-test-issue-3825.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3825.js rename to tests/jerry/es.next/regression-test-issue-3825.js diff --git a/tests/jerry/es2015/regression-test-issue-3836.js b/tests/jerry/es.next/regression-test-issue-3836.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3836.js rename to tests/jerry/es.next/regression-test-issue-3836.js diff --git a/tests/jerry/es2015/regression-test-issue-3837.js b/tests/jerry/es.next/regression-test-issue-3837.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3837.js rename to tests/jerry/es.next/regression-test-issue-3837.js diff --git a/tests/jerry/es2015/regression-test-issue-3845.js b/tests/jerry/es.next/regression-test-issue-3845.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3845.js rename to tests/jerry/es.next/regression-test-issue-3845.js diff --git a/tests/jerry/es2015/regression-test-issue-3849.js b/tests/jerry/es.next/regression-test-issue-3849.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3849.js rename to tests/jerry/es.next/regression-test-issue-3849.js diff --git a/tests/jerry/es2015/regression-test-issue-3860.js b/tests/jerry/es.next/regression-test-issue-3860.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3860.js rename to tests/jerry/es.next/regression-test-issue-3860.js diff --git a/tests/jerry/es2015/regression-test-issue-3861.js b/tests/jerry/es.next/regression-test-issue-3861.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3861.js rename to tests/jerry/es.next/regression-test-issue-3861.js diff --git a/tests/jerry/es2015/regression-test-issue-3862.js b/tests/jerry/es.next/regression-test-issue-3862.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3862.js rename to tests/jerry/es.next/regression-test-issue-3862.js diff --git a/tests/jerry/es2015/regression-test-issue-3866.js b/tests/jerry/es.next/regression-test-issue-3866.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3866.js rename to tests/jerry/es.next/regression-test-issue-3866.js diff --git a/tests/jerry/es2015/regression-test-issue-3868.js b/tests/jerry/es.next/regression-test-issue-3868.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3868.js rename to tests/jerry/es.next/regression-test-issue-3868.js diff --git a/tests/jerry/es2015/regression-test-issue-3870.js b/tests/jerry/es.next/regression-test-issue-3870.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3870.js rename to tests/jerry/es.next/regression-test-issue-3870.js diff --git a/tests/jerry/es2015/regression-test-issue-3871.js b/tests/jerry/es.next/regression-test-issue-3871.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3871.js rename to tests/jerry/es.next/regression-test-issue-3871.js diff --git a/tests/jerry/es2015/regression-test-issue-3880.js b/tests/jerry/es.next/regression-test-issue-3880.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3880.js rename to tests/jerry/es.next/regression-test-issue-3880.js diff --git a/tests/jerry/es2015/regression-test-issue-3893.js b/tests/jerry/es.next/regression-test-issue-3893.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-3893.js rename to tests/jerry/es.next/regression-test-issue-3893.js diff --git a/tests/jerry/es2015/regression-test-issue-612.js b/tests/jerry/es.next/regression-test-issue-612.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-612.js rename to tests/jerry/es.next/regression-test-issue-612.js diff --git a/tests/jerry/es2015/regression-test-issue-782.js b/tests/jerry/es.next/regression-test-issue-782.js similarity index 100% rename from tests/jerry/es2015/regression-test-issue-782.js rename to tests/jerry/es.next/regression-test-issue-782.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3302.js b/tests/jerry/es.next/regresssion-test-issue-3302.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3302.js rename to tests/jerry/es.next/regresssion-test-issue-3302.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3395.js b/tests/jerry/es.next/regresssion-test-issue-3395.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3395.js rename to tests/jerry/es.next/regresssion-test-issue-3395.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3713.js b/tests/jerry/es.next/regresssion-test-issue-3713.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3713.js rename to tests/jerry/es.next/regresssion-test-issue-3713.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3727.js b/tests/jerry/es.next/regresssion-test-issue-3727.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3727.js rename to tests/jerry/es.next/regresssion-test-issue-3727.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3841.js b/tests/jerry/es.next/regresssion-test-issue-3841.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3841.js rename to tests/jerry/es.next/regresssion-test-issue-3841.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3842.js b/tests/jerry/es.next/regresssion-test-issue-3842.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3842.js rename to tests/jerry/es.next/regresssion-test-issue-3842.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3856.js b/tests/jerry/es.next/regresssion-test-issue-3856.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3856.js rename to tests/jerry/es.next/regresssion-test-issue-3856.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3857.js b/tests/jerry/es.next/regresssion-test-issue-3857.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3857.js rename to tests/jerry/es.next/regresssion-test-issue-3857.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3869.js b/tests/jerry/es.next/regresssion-test-issue-3869.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3869.js rename to tests/jerry/es.next/regresssion-test-issue-3869.js diff --git a/tests/jerry/es2015/regresssion-test-issue-3888.js b/tests/jerry/es.next/regresssion-test-issue-3888.js similarity index 100% rename from tests/jerry/es2015/regresssion-test-issue-3888.js rename to tests/jerry/es.next/regresssion-test-issue-3888.js diff --git a/tests/jerry/es2015/set-iterators.js b/tests/jerry/es.next/set-iterators.js similarity index 100% rename from tests/jerry/es2015/set-iterators.js rename to tests/jerry/es.next/set-iterators.js diff --git a/tests/jerry/es2015/set.js b/tests/jerry/es.next/set.js similarity index 100% rename from tests/jerry/es2015/set.js rename to tests/jerry/es.next/set.js diff --git a/tests/jerry/es2015/string-fromcodepoint.js b/tests/jerry/es.next/string-fromcodepoint.js similarity index 100% rename from tests/jerry/es2015/string-fromcodepoint.js rename to tests/jerry/es.next/string-fromcodepoint.js diff --git a/tests/jerry/es2015/string-iterator.js b/tests/jerry/es.next/string-iterator.js similarity index 100% rename from tests/jerry/es2015/string-iterator.js rename to tests/jerry/es.next/string-iterator.js diff --git a/tests/jerry/es2015/string-prototype-codepointat.js b/tests/jerry/es.next/string-prototype-codepointat.js similarity index 100% rename from tests/jerry/es2015/string-prototype-codepointat.js rename to tests/jerry/es.next/string-prototype-codepointat.js diff --git a/tests/jerry/es2015/string-prototype-endswith.js b/tests/jerry/es.next/string-prototype-endswith.js similarity index 100% rename from tests/jerry/es2015/string-prototype-endswith.js rename to tests/jerry/es.next/string-prototype-endswith.js diff --git a/tests/jerry/es2015/string-prototype-includes.js b/tests/jerry/es.next/string-prototype-includes.js similarity index 100% rename from tests/jerry/es2015/string-prototype-includes.js rename to tests/jerry/es.next/string-prototype-includes.js diff --git a/tests/jerry/es2015/string-prototype-match.js b/tests/jerry/es.next/string-prototype-match.js similarity index 100% rename from tests/jerry/es2015/string-prototype-match.js rename to tests/jerry/es.next/string-prototype-match.js diff --git a/tests/jerry/es2015/string-prototype-repeat.js b/tests/jerry/es.next/string-prototype-repeat.js similarity index 100% rename from tests/jerry/es2015/string-prototype-repeat.js rename to tests/jerry/es.next/string-prototype-repeat.js diff --git a/tests/jerry/es2015/string-prototype-split.js b/tests/jerry/es.next/string-prototype-split.js similarity index 100% rename from tests/jerry/es2015/string-prototype-split.js rename to tests/jerry/es.next/string-prototype-split.js diff --git a/tests/jerry/es2015/string-prototype-startswith.js b/tests/jerry/es.next/string-prototype-startswith.js similarity index 100% rename from tests/jerry/es2015/string-prototype-startswith.js rename to tests/jerry/es.next/string-prototype-startswith.js diff --git a/tests/jerry/es2015/string-raw-crash-escaping-backslash.js b/tests/jerry/es.next/string-raw-crash-escaping-backslash.js similarity index 100% rename from tests/jerry/es2015/string-raw-crash-escaping-backslash.js rename to tests/jerry/es.next/string-raw-crash-escaping-backslash.js diff --git a/tests/jerry/es2015/string-raw.js b/tests/jerry/es.next/string-raw.js similarity index 100% rename from tests/jerry/es2015/string-raw.js rename to tests/jerry/es.next/string-raw.js diff --git a/tests/jerry/es2015/super-assignment.js b/tests/jerry/es.next/super-assignment.js similarity index 100% rename from tests/jerry/es2015/super-assignment.js rename to tests/jerry/es.next/super-assignment.js diff --git a/tests/jerry/es2015/symbol-computed-object-literal.js b/tests/jerry/es.next/symbol-computed-object-literal.js similarity index 100% rename from tests/jerry/es2015/symbol-computed-object-literal.js rename to tests/jerry/es.next/symbol-computed-object-literal.js diff --git a/tests/jerry/es2015/symbol-exception.js b/tests/jerry/es.next/symbol-exception.js similarity index 100% rename from tests/jerry/es2015/symbol-exception.js rename to tests/jerry/es.next/symbol-exception.js diff --git a/tests/jerry/es2015/symbol-in.js b/tests/jerry/es.next/symbol-in.js similarity index 100% rename from tests/jerry/es2015/symbol-in.js rename to tests/jerry/es.next/symbol-in.js diff --git a/tests/jerry/es2015/symbol-isconcatspreadable.js b/tests/jerry/es.next/symbol-isconcatspreadable.js similarity index 100% rename from tests/jerry/es2015/symbol-isconcatspreadable.js rename to tests/jerry/es.next/symbol-isconcatspreadable.js diff --git a/tests/jerry/es2015/symbol-key-keyfor.js b/tests/jerry/es.next/symbol-key-keyfor.js similarity index 100% rename from tests/jerry/es2015/symbol-key-keyfor.js rename to tests/jerry/es.next/symbol-key-keyfor.js diff --git a/tests/jerry/es2015/symbol-prototype-symbol-toprimitive.js b/tests/jerry/es.next/symbol-prototype-symbol-toprimitive.js similarity index 100% rename from tests/jerry/es2015/symbol-prototype-symbol-toprimitive.js rename to tests/jerry/es.next/symbol-prototype-symbol-toprimitive.js diff --git a/tests/jerry/es2015/symbol-prototype-tostring.js b/tests/jerry/es.next/symbol-prototype-tostring.js similarity index 100% rename from tests/jerry/es2015/symbol-prototype-tostring.js rename to tests/jerry/es.next/symbol-prototype-tostring.js diff --git a/tests/jerry/es2015/symbol-prototype-valueof.js b/tests/jerry/es.next/symbol-prototype-valueof.js similarity index 100% rename from tests/jerry/es2015/symbol-prototype-valueof.js rename to tests/jerry/es.next/symbol-prototype-valueof.js diff --git a/tests/jerry/es2015/symbol-prototype.toprimitive.js b/tests/jerry/es.next/symbol-prototype.toprimitive.js similarity index 100% rename from tests/jerry/es2015/symbol-prototype.toprimitive.js rename to tests/jerry/es.next/symbol-prototype.toprimitive.js diff --git a/tests/jerry/es2015/symbol-replace.js b/tests/jerry/es.next/symbol-replace.js similarity index 100% rename from tests/jerry/es2015/symbol-replace.js rename to tests/jerry/es.next/symbol-replace.js diff --git a/tests/jerry/es2015/symbol-search.js b/tests/jerry/es.next/symbol-search.js similarity index 100% rename from tests/jerry/es2015/symbol-search.js rename to tests/jerry/es.next/symbol-search.js diff --git a/tests/jerry/es2015/symbol-split.js b/tests/jerry/es.next/symbol-split.js similarity index 100% rename from tests/jerry/es2015/symbol-split.js rename to tests/jerry/es.next/symbol-split.js diff --git a/tests/jerry/es2015/symbol-unscopables.js b/tests/jerry/es.next/symbol-unscopables.js similarity index 100% rename from tests/jerry/es2015/symbol-unscopables.js rename to tests/jerry/es.next/symbol-unscopables.js diff --git a/tests/jerry/es2015/symbol.js b/tests/jerry/es.next/symbol.js similarity index 100% rename from tests/jerry/es2015/symbol.js rename to tests/jerry/es.next/symbol.js diff --git a/tests/jerry/es2015/tagged-template-literal.js b/tests/jerry/es.next/tagged-template-literal.js similarity index 100% rename from tests/jerry/es2015/tagged-template-literal.js rename to tests/jerry/es.next/tagged-template-literal.js diff --git a/tests/jerry/es2015/template_string.js b/tests/jerry/es.next/template_string.js similarity index 100% rename from tests/jerry/es2015/template_string.js rename to tests/jerry/es.next/template_string.js diff --git a/tests/jerry/es2015/to-number-string.js b/tests/jerry/es.next/to-number-string.js similarity index 100% rename from tests/jerry/es2015/to-number-string.js rename to tests/jerry/es.next/to-number-string.js diff --git a/tests/jerry/es2015/try-catch.js b/tests/jerry/es.next/try-catch.js similarity index 100% rename from tests/jerry/es2015/try-catch.js rename to tests/jerry/es.next/try-catch.js diff --git a/tests/jerry/es2015/try-pattern.js b/tests/jerry/es.next/try-pattern.js similarity index 100% rename from tests/jerry/es2015/try-pattern.js rename to tests/jerry/es.next/try-pattern.js diff --git a/tests/jerry/es2015/typedArray-fill.js b/tests/jerry/es.next/typedArray-fill.js similarity index 100% rename from tests/jerry/es2015/typedArray-fill.js rename to tests/jerry/es.next/typedArray-fill.js diff --git a/tests/jerry/es2015/typedArray-find-index.js b/tests/jerry/es.next/typedArray-find-index.js similarity index 100% rename from tests/jerry/es2015/typedArray-find-index.js rename to tests/jerry/es.next/typedArray-find-index.js diff --git a/tests/jerry/es2015/typedArray-find.js b/tests/jerry/es.next/typedArray-find.js similarity index 100% rename from tests/jerry/es2015/typedArray-find.js rename to tests/jerry/es.next/typedArray-find.js diff --git a/tests/jerry/es2015/typedArray-join.js b/tests/jerry/es.next/typedArray-join.js similarity index 100% rename from tests/jerry/es2015/typedArray-join.js rename to tests/jerry/es.next/typedArray-join.js diff --git a/tests/jerry/es2015/typedArray-set-with-typedArray.js b/tests/jerry/es.next/typedArray-set-with-typedArray.js similarity index 100% rename from tests/jerry/es2015/typedArray-set-with-typedArray.js rename to tests/jerry/es.next/typedArray-set-with-typedArray.js diff --git a/tests/jerry/es2015/typedArray-sort.js b/tests/jerry/es.next/typedArray-sort.js similarity index 100% rename from tests/jerry/es2015/typedArray-sort.js rename to tests/jerry/es.next/typedArray-sort.js diff --git a/tests/jerry/es2015/typedArray-stringify.js b/tests/jerry/es.next/typedArray-stringify.js similarity index 100% rename from tests/jerry/es2015/typedArray-stringify.js rename to tests/jerry/es.next/typedArray-stringify.js diff --git a/tests/jerry/es2015/typedArray-subarray.js b/tests/jerry/es.next/typedArray-subarray.js similarity index 100% rename from tests/jerry/es2015/typedArray-subarray.js rename to tests/jerry/es.next/typedArray-subarray.js diff --git a/tests/jerry/es2015/typedArray-tostring.js b/tests/jerry/es.next/typedArray-tostring.js similarity index 100% rename from tests/jerry/es2015/typedArray-tostring.js rename to tests/jerry/es.next/typedArray-tostring.js diff --git a/tests/jerry/es2015/typedarray-from.js b/tests/jerry/es.next/typedarray-from.js similarity index 100% rename from tests/jerry/es2015/typedarray-from.js rename to tests/jerry/es.next/typedarray-from.js diff --git a/tests/jerry/es2015/typedarray-of.js b/tests/jerry/es.next/typedarray-of.js similarity index 100% rename from tests/jerry/es2015/typedarray-of.js rename to tests/jerry/es.next/typedarray-of.js diff --git a/tests/jerry/es2015/typedarray-prototype-copy-within.js b/tests/jerry/es.next/typedarray-prototype-copy-within.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-copy-within.js rename to tests/jerry/es.next/typedarray-prototype-copy-within.js diff --git a/tests/jerry/es2015/typedarray-prototype-entires.js b/tests/jerry/es.next/typedarray-prototype-entires.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-entires.js rename to tests/jerry/es.next/typedarray-prototype-entires.js diff --git a/tests/jerry/es2015/typedarray-prototype-indexof.js b/tests/jerry/es.next/typedarray-prototype-indexof.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-indexof.js rename to tests/jerry/es.next/typedarray-prototype-indexof.js diff --git a/tests/jerry/es2015/typedarray-prototype-keys.js b/tests/jerry/es.next/typedarray-prototype-keys.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-keys.js rename to tests/jerry/es.next/typedarray-prototype-keys.js diff --git a/tests/jerry/es2015/typedarray-prototype-lastindexof.js b/tests/jerry/es.next/typedarray-prototype-lastindexof.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-lastindexof.js rename to tests/jerry/es.next/typedarray-prototype-lastindexof.js diff --git a/tests/jerry/es2015/typedarray-prototype-slice-ext-arraybuffer.js b/tests/jerry/es.next/typedarray-prototype-slice-ext-arraybuffer.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-slice-ext-arraybuffer.js rename to tests/jerry/es.next/typedarray-prototype-slice-ext-arraybuffer.js diff --git a/tests/jerry/es2015/typedarray-prototype-slice.js b/tests/jerry/es.next/typedarray-prototype-slice.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-slice.js rename to tests/jerry/es.next/typedarray-prototype-slice.js diff --git a/tests/jerry/es2015/typedarray-prototype-tolocalestring.js b/tests/jerry/es.next/typedarray-prototype-tolocalestring.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-tolocalestring.js rename to tests/jerry/es.next/typedarray-prototype-tolocalestring.js diff --git a/tests/jerry/es2015/typedarray-prototype-values.js b/tests/jerry/es.next/typedarray-prototype-values.js similarity index 100% rename from tests/jerry/es2015/typedarray-prototype-values.js rename to tests/jerry/es.next/typedarray-prototype-values.js diff --git a/tests/jerry/es2015/typedarray-symbol-properties.js b/tests/jerry/es.next/typedarray-symbol-properties.js similarity index 100% rename from tests/jerry/es2015/typedarray-symbol-properties.js rename to tests/jerry/es.next/typedarray-symbol-properties.js diff --git a/tests/jerry/es2015/weakmap.js b/tests/jerry/es.next/weakmap.js similarity index 100% rename from tests/jerry/es2015/weakmap.js rename to tests/jerry/es.next/weakmap.js diff --git a/tests/jerry/es2015/weakset.js b/tests/jerry/es.next/weakset.js similarity index 100% rename from tests/jerry/es2015/weakset.js rename to tests/jerry/es.next/weakset.js diff --git a/tests/jerry/fail/module-002.js b/tests/jerry/fail/module-002.js index 52b6d0086..c7e266512 100644 --- a/tests/jerry/fail/module-002.js +++ b/tests/jerry/fail/module-002.js @@ -13,4 +13,4 @@ * limitations under the License. */ -import { , as b } from "../es2015/module-export-01.js"; +import { , as b } from "../es.next/module-export-01.js"; diff --git a/tests/jerry/fail/module-003.js b/tests/jerry/fail/module-003.js index f7f8a2fd8..b4c22d266 100644 --- a/tests/jerry/fail/module-003.js +++ b/tests/jerry/fail/module-003.js @@ -13,4 +13,4 @@ * limitations under the License. */ -import , as b from "../es2015/module-export-01.js"; +import , as b from "../es.next/module-export-01.js"; diff --git a/tests/jerry/fail/module-004.js b/tests/jerry/fail/module-004.js index cc3345b74..732365a12 100644 --- a/tests/jerry/fail/module-004.js +++ b/tests/jerry/fail/module-004.js @@ -13,4 +13,4 @@ * limitations under the License. */ -import { b as , } from "../es2015/module-export-01.js"; +import { b as , } from "../es.next/module-export-01.js"; diff --git a/tests/jerry/fail/module-005.js b/tests/jerry/fail/module-005.js index dd668ddc5..7b6d7bb5f 100644 --- a/tests/jerry/fail/module-005.js +++ b/tests/jerry/fail/module-005.js @@ -14,4 +14,4 @@ */ /* Named imports must be in a NamedImports block. */ -import b as , from "../es2015/module-export-01.js"; +import b as , from "../es.next/module-export-01.js"; diff --git a/tests/jerry/fail/module-010.js b/tests/jerry/fail/module-010.js index 7c9721e74..ca970f7f0 100644 --- a/tests/jerry/fail/module-010.js +++ b/tests/jerry/fail/module-010.js @@ -14,4 +14,4 @@ */ /* Can't have duplicate local bindings */ -import { c as a, d as a } from "../es2015/module-export-01.js"; +import { c as a, d as a } from "../es.next/module-export-01.js"; diff --git a/tests/jerry/fail/module-014.js b/tests/jerry/fail/module-014.js index 77cd07179..5deeeff88 100644 --- a/tests/jerry/fail/module-014.js +++ b/tests/jerry/fail/module-014.js @@ -15,5 +15,5 @@ /* Import/export statements must be in the global scope. */ if (true) { - import { c } from "../es2015/module-export-01.js"; + import { c } from "../es.next/module-export-01.js"; } diff --git a/tests/jerry/fail/module-015.js b/tests/jerry/fail/module-015.js index a3be641c5..ecf41e7e4 100644 --- a/tests/jerry/fail/module-015.js +++ b/tests/jerry/fail/module-015.js @@ -15,5 +15,5 @@ /* Import/export statements must be in the global scope. */ function someFunction() { - import { c } from "../es2015/module-export-01.js"; + import { c } from "../es.next/module-export-01.js"; } diff --git a/tests/jerry/fail/module-016.js b/tests/jerry/fail/module-016.js index 794b4d16d..100871b08 100644 --- a/tests/jerry/fail/module-016.js +++ b/tests/jerry/fail/module-016.js @@ -14,4 +14,4 @@ */ /* Import/export statements must be in the global scope. */ -eval ('import { c } from "../es2015/module-export-01.js";'); +eval ('import { c } from "../es.next/module-export-01.js";'); diff --git a/tests/jerry/fail/module-017.js b/tests/jerry/fail/module-017.js index fb29f841e..642ef9dea 100644 --- a/tests/jerry/fail/module-017.js +++ b/tests/jerry/fail/module-017.js @@ -14,4 +14,4 @@ */ /* NamedImports must always be followed by a FromClause. */ -import { b }, from "../es2015/module-export-01.js" +import { b }, from "../es.next/module-export-01.js" diff --git a/tests/jerry/fail/module-018.js b/tests/jerry/fail/module-018.js index 9bb0e9709..5face7e7c 100644 --- a/tests/jerry/fail/module-018.js +++ b/tests/jerry/fail/module-018.js @@ -14,4 +14,4 @@ */ /* An import statement can have either a NameSpaceImport or NamedIpmorts */ -import * as mod, { b } from "../es2015/module-export-01.js" +import * as mod, { b } from "../es.next/module-export-01.js" diff --git a/tests/jerry/fail/module-020.js b/tests/jerry/fail/module-020.js index dd66dd0d3..f99ecf9c3 100644 --- a/tests/jerry/fail/module-020.js +++ b/tests/jerry/fail/module-020.js @@ -14,4 +14,4 @@ */ /* '*' is not valid inside NamedImports. */ -import { *, d } from "../es2015/module-imported-01.js" +import { *, d } from "../es.next/module-imported-01.js" diff --git a/tests/jerry/fail/module-021.js b/tests/jerry/fail/module-021.js index 9dd2ff318..498273360 100644 --- a/tests/jerry/fail/module-021.js +++ b/tests/jerry/fail/module-021.js @@ -14,5 +14,5 @@ */ /* Can't have duplicated local bindings. */ -import { b } from "../es2015/module-export-01.js" -import { b } from "../es2015/module-export-02.js" +import { b } from "../es.next/module-export-01.js" +import { b } from "../es.next/module-export-02.js" diff --git a/tests/jerry/fail/module-022.js b/tests/jerry/fail/module-022.js index 2accda4c5..3d9f0688f 100644 --- a/tests/jerry/fail/module-022.js +++ b/tests/jerry/fail/module-022.js @@ -14,4 +14,4 @@ */ /* FromClause must follow an ImportClause. */ -import from "../es2015/module-export-02.js" +import from "../es.next/module-export-02.js" diff --git a/tests/jerry/fail/module-023.js b/tests/jerry/fail/module-023.js index 97d78a434..03d072f41 100644 --- a/tests/jerry/fail/module-023.js +++ b/tests/jerry/fail/module-023.js @@ -14,4 +14,4 @@ */ /* Namespace imports must have a local name. */ -import * from "../es2015/module-export-01.js" +import * from "../es.next/module-export-01.js" diff --git a/tests/jerry/fail/module-024.js b/tests/jerry/fail/module-024.js index 6e5081f61..be81cf929 100644 --- a/tests/jerry/fail/module-024.js +++ b/tests/jerry/fail/module-024.js @@ -14,4 +14,4 @@ */ /* Star exports can't have an export name. */ -export * as star from "../es2015/module-export-01.js" +export * as star from "../es.next/module-export-01.js" diff --git a/tests/jerry/fail/module-025.js b/tests/jerry/fail/module-025.js index 0765b062d..c26d673ad 100644 --- a/tests/jerry/fail/module-025.js +++ b/tests/jerry/fail/module-025.js @@ -14,4 +14,4 @@ */ /* Indirect exports must be checked if they are resolvable. */ -export { l } from "../es2015/module-export-01.js" +export { l } from "../es.next/module-export-01.js" diff --git a/tests/jerry/fail/module-028.js b/tests/jerry/fail/module-028.js index 908dc0a99..8db2d5f04 100644 --- a/tests/jerry/fail/module-028.js +++ b/tests/jerry/fail/module-028.js @@ -14,4 +14,4 @@ */ /* Ambiguous import */ -import { x } from "../es2015/module-export-05.js" +import { x } from "../es.next/module-export-05.js" diff --git a/tests/jerry/fail/module-029.js b/tests/jerry/fail/module-029.js index bd55c1ab6..1f4929eab 100644 --- a/tests/jerry/fail/module-029.js +++ b/tests/jerry/fail/module-029.js @@ -14,4 +14,4 @@ */ /* Import/export statements must be in the global scope. */ -Function('','import { c } from "../es2015/module-export-01.js";') +Function('','import { c } from "../es.next/module-export-01.js";') diff --git a/tests/jerry/fail/module-030.js b/tests/jerry/fail/module-030.js index 77f2528a4..3cd2f89b5 100644 --- a/tests/jerry/fail/module-030.js +++ b/tests/jerry/fail/module-030.js @@ -14,4 +14,4 @@ */ /* No default export found. */ -import def from "../es2015/module-export-06.js" +import def from "../es.next/module-export-06.js" diff --git a/tests/jerry/fail/module-032.js b/tests/jerry/fail/module-032.js index c4256330b..6dd05c8c9 100644 --- a/tests/jerry/fail/module-032.js +++ b/tests/jerry/fail/module-032.js @@ -14,4 +14,4 @@ */ let a; -import { a } from "../es2015/module-export-fail-test.js"; +import { a } from "../es.next/module-export-fail-test.js"; diff --git a/tests/jerry/fail/module-033.js b/tests/jerry/fail/module-033.js index 467b5640d..08dba16ad 100644 --- a/tests/jerry/fail/module-033.js +++ b/tests/jerry/fail/module-033.js @@ -14,4 +14,4 @@ */ var a; -import { a } from "../es2015/module-export-fail-test.js"; +import { a } from "../es.next/module-export-fail-test.js"; diff --git a/tests/jerry/fail/module-034.js b/tests/jerry/fail/module-034.js index a0298c1c0..c4375a426 100644 --- a/tests/jerry/fail/module-034.js +++ b/tests/jerry/fail/module-034.js @@ -13,5 +13,5 @@ * limitations under the License. */ -import { a } from "../es2015/module-export-fail-test.js"; +import { a } from "../es.next/module-export-fail-test.js"; class a {}; diff --git a/tests/jerry/fail/module-035.js b/tests/jerry/fail/module-035.js index 411b6c629..e332f5a93 100644 --- a/tests/jerry/fail/module-035.js +++ b/tests/jerry/fail/module-035.js @@ -13,5 +13,5 @@ * limitations under the License. */ -import { a } from "../es2015/module-export-fail-test.js"; +import { a } from "../es.next/module-export-fail-test.js"; function a() {} diff --git a/tests/jerry/fail/regression-test-issue-2896.js b/tests/jerry/fail/regression-test-issue-2896.js index 415bc49d6..94a60abd9 100644 --- a/tests/jerry/fail/regression-test-issue-2896.js +++ b/tests/jerry/fail/regression-test-issue-2896.js @@ -13,4 +13,4 @@ // limitations under the License. export {} from "dummy.js"; -export {} from "../es2015/module-export-04.js"; +export {} from "../es.next/module-export-04.js"; diff --git a/tests/unit-core/test-newtarget.c b/tests/unit-core/test-newtarget.c index 606991d26..88cb5b84d 100644 --- a/tests/unit-core/test-newtarget.c +++ b/tests/unit-core/test-newtarget.c @@ -112,10 +112,10 @@ construct_handler (const jerry_value_t func_obj_val, /**< function object */ int main (void) { - /* Test JERRY_FEATURE_SYMBOL feature as it is a must-have in ES2015 */ + /* Test JERRY_FEATURE_SYMBOL feature as it is a must-have in ES.next */ if (!jerry_is_feature_enabled (JERRY_FEATURE_SYMBOL)) { - jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Skipping test, ES2015 support is disabled.\n"); + jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Skipping test, ES.next support is disabled.\n"); return 0; } diff --git a/tests/unit-core/test-objects-foreach.c b/tests/unit-core/test-objects-foreach.c index cce1949ef..17315fa7e 100644 --- a/tests/unit-core/test-objects-foreach.c +++ b/tests/unit-core/test-objects-foreach.c @@ -40,7 +40,7 @@ test_container (void) jerry_release_value (map_str); jerry_release_value (global); - /* If there is no Map function this is not an es2015 profile build, skip this test case. */ + /* If there is no Map function this is not an es.next profile build, skip this test case. */ if (type != JERRY_TYPE_FUNCTION) { jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Container based test is disabled!\n"); diff --git a/tests/unit-core/test-regression-3588.c b/tests/unit-core/test-regression-3588.c index 575980514..4b9f02bf9 100644 --- a/tests/unit-core/test-regression-3588.c +++ b/tests/unit-core/test-regression-3588.c @@ -39,10 +39,10 @@ construct_handler (const jerry_value_t func_obj_val, /**< function object */ int main (void) { - /* Test JERRY_FEATURE_SYMBOL feature as it is a must-have in ES2015 */ + /* Test JERRY_FEATURE_SYMBOL feature as it is a must-have in ES.next */ if (!jerry_is_feature_enabled (JERRY_FEATURE_SYMBOL)) { - jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Skipping test, ES2015 support is disabled.\n"); + jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Skipping test, ES.next support is disabled.\n"); return 0; } diff --git a/tests/unit-core/test-to-length.c b/tests/unit-core/test-to-length.c index af967991a..2e5b27a5a 100644 --- a/tests/unit-core/test-to-length.c +++ b/tests/unit-core/test-to-length.c @@ -73,11 +73,11 @@ main (void) ecma_free_value (negative); TEST_ASSERT (!ECMA_IS_VALUE_ERROR (result)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) TEST_ASSERT (num == 0); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ TEST_ASSERT (num == 4294967270); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* +infinity */ ecma_value_t positive_infinity = ecma_make_number_value (ecma_number_make_infinity (false)); @@ -87,11 +87,11 @@ main (void) ecma_free_value (positive_infinity); TEST_ASSERT (!ECMA_IS_VALUE_ERROR (result)); -#if ENABLED (JERRY_ES2015) +#if ENABLED (JERRY_ESNEXT) TEST_ASSERT (num == UINT32_MAX); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !ENABLED (JERRY_ESNEXT) */ TEST_ASSERT (num == 0); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* ENABLED (JERRY_ESNEXT) */ /* -infinity */ ecma_value_t negative_infinity = ecma_make_number_value (ecma_number_make_infinity (true)); diff --git a/tools/check-sonarqube.sh b/tools/check-sonarqube.sh index 5bba89f72..7277cc8d3 100755 --- a/tools/check-sonarqube.sh +++ b/tools/check-sonarqube.sh @@ -25,7 +25,7 @@ then --jerry-debugger=on \ --line-info=on \ --mem-stats=on \ - --profile=es2015-subset \ + --profile=es.next \ --snapshot-save=on \ --snapshot-exec=on \ --valgrind=on \ @@ -39,7 +39,7 @@ else --jerry-debugger=on \ --line-info=on \ --mem-stats=on \ - --profile=es2015-subset \ + --profile=es.next \ --snapshot-save=on \ --snapshot-exec=on \ --valgrind=on \ diff --git a/tools/run-tests.py b/tools/run-tests.py index 637f71958..f4234e615 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -35,8 +35,8 @@ def skip_if(condition, desc): OPTIONS_COMMON = ['--lto=off'] OPTIONS_PROFILE_MIN = ['--profile=minimal'] -OPTIONS_PROFILE_ES51 = [] # NOTE: same as ['--profile=es5.1'] -OPTIONS_PROFILE_ES2015 = ['--profile=es2015-subset'] +OPTIONS_PROFILE_ES51 = ['--profile=es5.1'] +OPTIONS_PROFILE_ESNEXT = ['--profile=es.next'] OPTIONS_STACK_LIMIT = ['--stack-limit=96'] OPTIONS_GC_MARK_LIMIT = ['--gc-mark-limit=16'] OPTIONS_DEBUG = ['--debug'] @@ -49,14 +49,14 @@ OPTIONS_DOCTESTS = ['--doctests=on', '--jerry-cmdline=off', '--error-messages=on # Test options for unittests JERRY_UNITTESTS_OPTIONS = [ - Options('unittests-es2015_subset', - OPTIONS_COMMON + OPTIONS_UNITTESTS + OPTIONS_PROFILE_ES2015), - Options('unittests-es2015_subset-debug', - OPTIONS_COMMON + OPTIONS_UNITTESTS + OPTIONS_PROFILE_ES2015 + OPTIONS_DEBUG), - Options('doctests-es2015_subset', - OPTIONS_COMMON + OPTIONS_DOCTESTS + OPTIONS_PROFILE_ES2015), - Options('doctests-es2015_subset-debug', - OPTIONS_COMMON + OPTIONS_DOCTESTS + OPTIONS_PROFILE_ES2015 + OPTIONS_DEBUG), + Options('unittests-es.next', + OPTIONS_COMMON + OPTIONS_UNITTESTS + OPTIONS_PROFILE_ESNEXT), + Options('unittests-es.next-debug', + OPTIONS_COMMON + OPTIONS_UNITTESTS + OPTIONS_PROFILE_ESNEXT + OPTIONS_DEBUG), + Options('doctests-es.next', + OPTIONS_COMMON + OPTIONS_DOCTESTS + OPTIONS_PROFILE_ESNEXT), + Options('doctests-es.next-debug', + OPTIONS_COMMON + OPTIONS_DOCTESTS + OPTIONS_PROFILE_ESNEXT + OPTIONS_DEBUG), Options('unittests-es5.1', OPTIONS_COMMON + OPTIONS_UNITTESTS + OPTIONS_PROFILE_ES51), Options('unittests-es5.1-debug', @@ -75,8 +75,8 @@ JERRY_UNITTESTS_OPTIONS = [ # Test options for jerry-tests JERRY_TESTS_OPTIONS = [ - Options('jerry_tests-es2015_subset-debug', - OPTIONS_COMMON + OPTIONS_PROFILE_ES2015 + OPTIONS_DEBUG + OPTIONS_STACK_LIMIT + OPTIONS_GC_MARK_LIMIT), + Options('jerry_tests-es.next-debug', + OPTIONS_COMMON + OPTIONS_PROFILE_ESNEXT + OPTIONS_DEBUG + OPTIONS_STACK_LIMIT + OPTIONS_GC_MARK_LIMIT), Options('jerry_tests-es5.1', OPTIONS_COMMON + OPTIONS_PROFILE_ES51 + OPTIONS_STACK_LIMIT + OPTIONS_GC_MARK_LIMIT), Options('jerry_tests-es5.1-snapshot', @@ -108,25 +108,25 @@ JERRY_TEST_SUITE_OPTIONS.extend([ Options('jerry_test_suite-minimal-debug-snapshot', OPTIONS_COMMON + OPTIONS_PROFILE_MIN + OPTIONS_SNAPSHOT + OPTIONS_DEBUG, ['--snapshot']), - Options('jerry_test_suite-es2015_subset', - OPTIONS_COMMON + OPTIONS_PROFILE_ES2015), - Options('jerry_test_suite-es2015_subset-snapshot', - OPTIONS_COMMON + OPTIONS_PROFILE_ES2015 + OPTIONS_SNAPSHOT, + Options('jerry_test_suite-es.next', + OPTIONS_COMMON + OPTIONS_PROFILE_ESNEXT), + Options('jerry_test_suite-es.next-snapshot', + OPTIONS_COMMON + OPTIONS_PROFILE_ESNEXT + OPTIONS_SNAPSHOT, ['--snapshot']), - Options('jerry_test_suite-es2015_subset-debug-snapshot', - OPTIONS_COMMON + OPTIONS_PROFILE_ES2015 + OPTIONS_SNAPSHOT + OPTIONS_DEBUG, + Options('jerry_test_suite-es.next-debug-snapshot', + OPTIONS_COMMON + OPTIONS_PROFILE_ESNEXT + OPTIONS_SNAPSHOT + OPTIONS_DEBUG, ['--snapshot']), ]) # Test options for test262 TEST262_TEST_SUITE_OPTIONS = [ - Options('test262_tests'), - Options('test262_tests-debug', OPTIONS_DEBUG) + Options('test262_tests', OPTIONS_PROFILE_ES51), + Options('test262_tests-debug', OPTIONS_PROFILE_ES51 + OPTIONS_DEBUG) ] # Test options for test262-es2015 TEST262_ES2015_TEST_SUITE_OPTIONS = [ - Options('test262_tests_es2015', OPTIONS_PROFILE_ES2015 + ['--line-info=on', '--error-messages=on']), + Options('test262_tests_es2015', OPTIONS_PROFILE_ESNEXT + ['--line-info=on', '--error-messages=on']), ] # Test options for jerry-debugger @@ -396,10 +396,10 @@ def run_jerry_tests(options): skip_list = [] - if '--profile=es2015-subset' in job.build_args: + if '--profile=es.next' in job.build_args: skip_list.append(os.path.join('es5.1', '')) else: - skip_list.append(os.path.join('es2015', '')) + skip_list.append(os.path.join('es.next', '')) if options.skip_list: skip_list.append(options.skip_list) @@ -428,10 +428,10 @@ def run_jerry_test_suite(options): else: test_cmd.append('--test-dir') test_cmd.append(settings.JERRY_TEST_SUITE_DIR) - if '--profile=es2015-subset' in job.build_args: + if '--profile=es.next' in job.build_args: skip_list.append(os.path.join('es5.1', '')) else: - skip_list.append(os.path.join('es2015', '')) + skip_list.append(os.path.join('es.next', '')) if options.quiet: test_cmd.append("-q") @@ -470,7 +470,7 @@ def run_test262_test_suite(options): '--test-dir', settings.TEST262_TEST_SUITE_DIR ] - if '--profile=es2015-subset' in job.build_args: + if '--profile=es.next' in job.build_args: test_cmd.append('--es2015') else: test_cmd.append('--es51')