Update duktape to v2.7.0 (#18485)

A somewhat bloated change due to duktape changing code style
This commit is contained in:
Michał Janiszewski 2022-11-11 09:06:05 +01:00 committed by GitHub
parent 24cc4d8feb
commit 8bd9d9c551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12953 additions and 11498 deletions

View File

@ -4,17 +4,20 @@
[#14853](https://github.com/OpenRCT2/OpenRCT2/issues/14853) is the primary issue that was solved by embedding our own copy of duktape.
This directory contains a pre-configured copy of duktape v2.6.0 with the following switches enabled:
This directory contains a pre-configured copy of duktape v2.7.0 with the following switches enabled:
* `DUK_USE_CPP_EXCEPTIONS` for C++ exception handling.
* `DUK_USE_DATE_NOW_WINDOWS` for Windows Vista compatibility.
* `DUK_USE_INTERRUPT_COUNTER` for aborting long or non-terminating scripts.
duktape is configured with a command such as:
```
python2 duktape-2.6.0/tools/configure.py --output-directory src/thirdparty/duktape \
-DUK_USE_CPP_EXCEPTIONS
-DUK_USE_DATE_NOW_WINDOWS
-DUK_USE_INTERRUPT_COUNTER
python2 duktape-2.7.0/tools/configure.py --output-directory src/thirdparty/duktape \
-DDUK_USE_CPP_EXCEPTIONS \
-DDUK_USE_DATE_NOW_WINDOWS \
-DDUK_USE_INTERRUPT_COUNTER \
-DDUK_USE_EXEC_TIMEOUT_CHECK=duk_exec_timeout_check
```
Then manually apply configuration fixup for `duk_exec_timeout_check` (e.g. compare repo version of `duk_config.h` with the one freshly generated) and rename resulting `duktape.c` file to `duktape.cpp`
See [Configuring Duktape for build](https://wiki.duktape.org/configuring) for more information.

View File

@ -1,735 +1,735 @@
{
"comment": "Metadata for Duktape sources",
"duk_version_string": "2.6.0",
"duk_version_string": "2.7.0",
"type": "duk_source_meta",
"line_map": [
{
"original_line": 1,
"combined_line": 155,
"combined_line": 161,
"original_file": "duk_replacements.c"
},
{
"original_line": 1,
"combined_line": 164,
"combined_line": 170,
"original_file": "duk_internal.h"
},
{
"original_line": 1,
"combined_line": 201,
"combined_line": 207,
"original_file": "duk_dblunion.h"
},
{
"original_line": 1,
"combined_line": 626,
"combined_line": 627,
"original_file": "duk_fltunion.h"
},
{
"original_line": 1,
"combined_line": 666,
"combined_line": 667,
"original_file": "duk_replacements.h"
},
{
"original_line": 1,
"combined_line": 696,
"combined_line": 697,
"original_file": "duk_jmpbuf.h"
},
{
"original_line": 1,
"combined_line": 721,
"combined_line": 722,
"original_file": "duk_exception.h"
},
{
"original_line": 1,
"combined_line": 752,
"combined_line": 754,
"original_file": "duk_forwdecl.h"
},
{
"original_line": 1,
"combined_line": 887,
"combined_line": 889,
"original_file": "duk_tval.h"
},
{
"original_line": 1,
"combined_line": 1527,
"combined_line": 1567,
"original_file": "duk_builtins.h"
},
{
"original_line": 45,
"combined_line": 2318,
"combined_line": 2358,
"original_file": "duk_internal.h"
},
{
"original_line": 1,
"combined_line": 2320,
"combined_line": 2360,
"original_file": "duk_util.h"
},
{
"original_line": 1,
"combined_line": 3052,
"combined_line": 3156,
"original_file": "duk_strings.h"
},
{
"original_line": 1,
"combined_line": 3222,
"combined_line": 3326,
"original_file": "duk_js_bytecode.h"
},
{
"original_line": 1,
"combined_line": 3705,
"combined_line": 3800,
"original_file": "duk_lexer.h"
},
{
"original_line": 1,
"combined_line": 4144,
"combined_line": 4236,
"original_file": "duk_js_compiler.h"
},
{
"original_line": 1,
"combined_line": 4372,
"combined_line": 4469,
"original_file": "duk_regexp.h"
},
{
"original_line": 1,
"combined_line": 4457,
"combined_line": 4554,
"original_file": "duk_heaphdr.h"
},
{
"original_line": 1,
"combined_line": 4755,
"combined_line": 4871,
"original_file": "duk_refcount.h"
},
{
"original_line": 1,
"combined_line": 5481,
"combined_line": 5888,
"original_file": "duk_api_internal.h"
},
{
"original_line": 1,
"combined_line": 5868,
"combined_line": 6282,
"original_file": "duk_hstring.h"
},
{
"original_line": 1,
"combined_line": 6122,
"combined_line": 6548,
"original_file": "duk_hobject.h"
},
{
"original_line": 1,
"combined_line": 7104,
"combined_line": 7538,
"original_file": "duk_hcompfunc.h"
},
{
"original_line": 1,
"combined_line": 7378,
"combined_line": 7798,
"original_file": "duk_hnatfunc.h"
},
{
"original_line": 1,
"combined_line": 7418,
"combined_line": 7843,
"original_file": "duk_hboundfunc.h"
},
{
"original_line": 1,
"combined_line": 7456,
"combined_line": 7886,
"original_file": "duk_hbufobj.h"
},
{
"original_line": 1,
"combined_line": 7584,
"combined_line": 8024,
"original_file": "duk_hthread.h"
},
{
"original_line": 1,
"combined_line": 7993,
"combined_line": 8446,
"original_file": "duk_harray.h"
},
{
"original_line": 1,
"combined_line": 8042,
"combined_line": 8506,
"original_file": "duk_henv.h"
},
{
"original_line": 1,
"combined_line": 8088,
"combined_line": 8562,
"original_file": "duk_hbuffer.h"
},
{
"original_line": 1,
"combined_line": 8425,
"combined_line": 8910,
"original_file": "duk_hproxy.h"
},
{
"original_line": 1,
"combined_line": 8452,
"combined_line": 8942,
"original_file": "duk_heap.h"
},
{
"original_line": 1,
"combined_line": 9176,
"combined_line": 9689,
"original_file": "duk_debugger.h"
},
{
"original_line": 1,
"combined_line": 9328,
"combined_line": 9841,
"original_file": "duk_debug.h"
},
{
"original_line": 1,
"combined_line": 9513,
"combined_line": 10038,
"original_file": "duk_error.h"
},
{
"original_line": 1,
"combined_line": 10039,
"combined_line": 10728,
"original_file": "duk_unicode.h"
},
{
"original_line": 1,
"combined_line": 10330,
"combined_line": 11028,
"original_file": "duk_json.h"
},
{
"original_line": 1,
"combined_line": 10399,
"combined_line": 11097,
"original_file": "duk_js.h"
},
{
"original_line": 1,
"combined_line": 10516,
"combined_line": 11231,
"original_file": "duk_numconv.h"
},
{
"original_line": 1,
"combined_line": 10621,
"combined_line": 11339,
"original_file": "duk_bi_protos.h"
},
{
"original_line": 1,
"combined_line": 10703,
"combined_line": 11421,
"original_file": "duk_selftest.h"
},
{
"original_line": 76,
"combined_line": 10718,
"combined_line": 11436,
"original_file": "duk_internal.h"
},
{
"original_line": 10,
"combined_line": 10720,
"combined_line": 11438,
"original_file": "duk_replacements.c"
},
{
"original_line": 1,
"combined_line": 10793,
"combined_line": 11511,
"original_file": "duk_debug_macros.c"
},
{
"original_line": 1,
"combined_line": 10884,
"combined_line": 11602,
"original_file": "duk_builtins.c"
},
{
"original_line": 1,
"combined_line": 11748,
"combined_line": 12466,
"original_file": "duk_error_macros.c"
},
{
"original_line": 1,
"combined_line": 11903,
"combined_line": 12653,
"original_file": "duk_unicode_support.c"
},
{
"original_line": 1,
"combined_line": 13168,
"combined_line": 13878,
"original_file": "duk_util_memrw.c"
},
{
"original_line": 1,
"combined_line": 13316,
"combined_line": 14026,
"original_file": "duk_util_misc.c"
},
{
"original_line": 1,
"combined_line": 13499,
"combined_line": 14191,
"original_file": "duk_hobject_class.c"
},
{
"original_line": 1,
"combined_line": 13628,
"combined_line": 14320,
"original_file": "duk_alloc_default.c"
},
{
"original_line": 1,
"combined_line": 13662,
"combined_line": 14352,
"original_file": "duk_api_buffer.c"
},
{
"original_line": 1,
"combined_line": 13735,
"combined_line": 14425,
"original_file": "duk_api_bytecode.c"
},
{
"original_line": 1,
"combined_line": 14503,
"combined_line": 15204,
"original_file": "duk_api_call.c"
},
{
"original_line": 1,
"combined_line": 15019,
"combined_line": 15722,
"original_file": "duk_api_codec.c"
},
{
"original_line": 1,
"combined_line": 15945,
"combined_line": 16653,
"original_file": "duk_api_compile.c"
},
{
"original_line": 1,
"combined_line": 16117,
"combined_line": 16827,
"original_file": "duk_api_debug.c"
},
{
"original_line": 1,
"combined_line": 16378,
"combined_line": 17088,
"original_file": "duk_api_heap.c"
},
{
"original_line": 1,
"combined_line": 16589,
"combined_line": 17297,
"original_file": "duk_api_inspect.c"
},
{
"original_line": 1,
"combined_line": 16834,
"combined_line": 17568,
"original_file": "duk_api_memory.c"
},
{
"original_line": 1,
"combined_line": 16914,
"combined_line": 17648,
"original_file": "duk_api_object.c"
},
{
"original_line": 1,
"combined_line": 17964,
"combined_line": 18686,
"original_file": "duk_api_random.c"
},
{
"original_line": 1,
"combined_line": 17973,
"combined_line": 18695,
"original_file": "duk_api_stack.c"
},
{
"original_line": 1,
"combined_line": 24851,
"combined_line": 25603,
"original_file": "duk_api_string.c"
},
{
"original_line": 1,
"combined_line": 25229,
"combined_line": 25982,
"original_file": "duk_api_time.c"
},
{
"original_line": 1,
"combined_line": 25339,
"combined_line": 26092,
"original_file": "duk_bi_array.c"
},
{
"original_line": 1,
"combined_line": 26994,
"combined_line": 27746,
"original_file": "duk_bi_boolean.c"
},
{
"original_line": 1,
"combined_line": 27063,
"combined_line": 27815,
"original_file": "duk_bi_buffer.c"
},
{
"original_line": 1,
"combined_line": 29999,
"combined_line": 30744,
"original_file": "duk_bi_cbor.c"
},
{
"original_line": 1,
"combined_line": 31739,
"combined_line": 32667,
"original_file": "duk_bi_date.c"
},
{
"original_line": 1,
"combined_line": 33557,
"combined_line": 34566,
"original_file": "duk_bi_date_unix.c"
},
{
"original_line": 1,
"combined_line": 33886,
"combined_line": 34914,
"original_file": "duk_bi_date_windows.c"
},
{
"original_line": 1,
"combined_line": 34079,
"combined_line": 35109,
"original_file": "duk_bi_duktape.c"
},
{
"original_line": 1,
"combined_line": 34237,
"combined_line": 35259,
"original_file": "duk_bi_encoding.c"
},
{
"original_line": 1,
"combined_line": 34775,
"combined_line": 35796,
"original_file": "duk_bi_error.c"
},
{
"original_line": 1,
"combined_line": 35167,
"combined_line": 36196,
"original_file": "duk_bi_function.c"
},
{
"original_line": 1,
"combined_line": 35620,
"combined_line": 36649,
"original_file": "duk_bi_global.c"
},
{
"original_line": 1,
"combined_line": 36351,
"combined_line": 37369,
"original_file": "duk_bi_json.c"
},
{
"original_line": 1,
"combined_line": 39631,
"combined_line": 40612,
"original_file": "duk_bi_math.c"
},
{
"original_line": 1,
"combined_line": 40150,
"combined_line": 41103,
"original_file": "duk_bi_number.c"
},
{
"original_line": 1,
"combined_line": 40430,
"combined_line": 41368,
"original_file": "duk_bi_object.c"
},
{
"original_line": 1,
"combined_line": 41233,
"combined_line": 42122,
"original_file": "duk_bi_performance.c"
},
{
"original_line": 1,
"combined_line": 41264,
"combined_line": 42153,
"original_file": "duk_bi_pointer.c"
},
{
"original_line": 1,
"combined_line": 41339,
"combined_line": 42227,
"original_file": "duk_bi_promise.c"
},
{
"original_line": 1,
"combined_line": 41383,
"combined_line": 42271,
"original_file": "duk_bi_proxy.c"
},
{
"original_line": 1,
"combined_line": 41481,
"combined_line": 42369,
"original_file": "duk_bi_reflect.c"
},
{
"original_line": 1,
"combined_line": 41580,
"combined_line": 42468,
"original_file": "duk_bi_regexp.c"
},
{
"original_line": 1,
"combined_line": 41806,
"combined_line": 42692,
"original_file": "duk_bi_string.c"
},
{
"original_line": 1,
"combined_line": 43416,
"combined_line": 44307,
"original_file": "duk_bi_symbol.c"
},
{
"original_line": 1,
"combined_line": 43586,
"combined_line": 44479,
"original_file": "duk_bi_thread.c"
},
{
"original_line": 1,
"combined_line": 43912,
"combined_line": 44803,
"original_file": "duk_bi_thrower.c"
},
{
"original_line": 1,
"combined_line": 43921,
"combined_line": 44812,
"original_file": "duk_debug_fixedbuffer.c"
},
{
"original_line": 1,
"combined_line": 43990,
"combined_line": 44881,
"original_file": "duk_debug_vsnprintf.c"
},
{
"original_line": 1,
"combined_line": 45090,
"combined_line": 46085,
"original_file": "duk_debugger.c"
},
{
"original_line": 1,
"combined_line": 48004,
"combined_line": 48984,
"original_file": "duk_error_augment.c"
},
{
"original_line": 1,
"combined_line": 48592,
"combined_line": 49586,
"original_file": "duk_error_longjmp.c"
},
{
"original_line": 1,
"combined_line": 48695,
"combined_line": 49693,
"original_file": "duk_error_misc.c"
},
{
"original_line": 1,
"combined_line": 48869,
"combined_line": 49866,
"original_file": "duk_error_throw.c"
},
{
"original_line": 1,
"combined_line": 49031,
"combined_line": 50025,
"original_file": "duk_hbuffer_alloc.c"
},
{
"original_line": 1,
"combined_line": 49163,
"combined_line": 50156,
"original_file": "duk_hbuffer_assert.c"
},
{
"original_line": 1,
"combined_line": 49176,
"combined_line": 50169,
"original_file": "duk_hbuffer_ops.c"
},
{
"original_line": 2,
"combined_line": 49255,
"combined_line": 50247,
"original_file": "duk_hbufobj_misc.c"
},
{
"original_line": 1,
"combined_line": 49274,
"combined_line": 50266,
"original_file": "duk_heap_alloc.c"
},
{
"original_line": 1,
"combined_line": 50499,
"combined_line": 51493,
"original_file": "duk_heap_finalize.c"
},
{
"original_line": 1,
"combined_line": 50944,
"combined_line": 51942,
"original_file": "duk_heap_hashstring.c"
},
{
"original_line": 1,
"combined_line": 51065,
"combined_line": 52063,
"original_file": "duk_heap_markandsweep.c"
},
{
"original_line": 1,
"combined_line": 52551,
"combined_line": 53571,
"original_file": "duk_heap_memory.c"
},
{
"original_line": 1,
"combined_line": 52963,
"combined_line": 53983,
"original_file": "duk_heap_misc.c"
},
{
"original_line": 1,
"combined_line": 53150,
"combined_line": 54170,
"original_file": "duk_heap_refcount.c"
},
{
"original_line": 1,
"combined_line": 53996,
"combined_line": 55029,
"original_file": "duk_heap_stringcache.c"
},
{
"original_line": 1,
"combined_line": 54305,
"combined_line": 55349,
"original_file": "duk_heap_stringtable.c"
},
{
"original_line": 1,
"combined_line": 55354,
"combined_line": 56419,
"original_file": "duk_heaphdr_assert.c"
},
{
"original_line": 1,
"combined_line": 55432,
"combined_line": 56497,
"original_file": "duk_hobject_alloc.c"
},
{
"original_line": 1,
"combined_line": 55703,
"combined_line": 56768,
"original_file": "duk_hobject_assert.c"
},
{
"original_line": 1,
"combined_line": 55830,
"combined_line": 56892,
"original_file": "duk_hobject_enum.c"
},
{
"original_line": 1,
"combined_line": 56546,
"combined_line": 57612,
"original_file": "duk_hobject_misc.c"
},
{
"original_line": 1,
"combined_line": 56599,
"combined_line": 57668,
"original_file": "duk_hobject_pc2line.c"
},
{
"original_line": 1,
"combined_line": 56843,
"combined_line": 57914,
"original_file": "duk_hobject_props.c"
},
{
"original_line": 1,
"combined_line": 63058,
"combined_line": 64276,
"original_file": "duk_hstring_assert.c"
},
{
"original_line": 1,
"combined_line": 63071,
"combined_line": 64289,
"original_file": "duk_hstring_misc.c"
},
{
"original_line": 1,
"combined_line": 63267,
"combined_line": 64485,
"original_file": "duk_hthread_alloc.c"
},
{
"original_line": 1,
"combined_line": 63326,
"combined_line": 64544,
"original_file": "duk_hthread_builtins.c"
},
{
"original_line": 1,
"combined_line": 64212,
"combined_line": 65445,
"original_file": "duk_hthread_misc.c"
},
{
"original_line": 1,
"combined_line": 64309,
"combined_line": 65542,
"original_file": "duk_hthread_stacks.c"
},
{
"original_line": 1,
"combined_line": 64716,
"combined_line": 65947,
"original_file": "duk_js_arith.c"
},
{
"original_line": 1,
"combined_line": 64853,
"combined_line": 66088,
"original_file": "duk_js_call.c"
},
{
"original_line": 1,
"combined_line": 67790,
"combined_line": 69036,
"original_file": "duk_js_compiler.c"
},
{
"original_line": 1,
"combined_line": 75900,
"combined_line": 77176,
"original_file": "duk_js_executor.c"
},
{
"original_line": 1,
"combined_line": 81165,
"combined_line": 82498,
"original_file": "duk_js_ops.c"
},
{
"original_line": 1,
"combined_line": 82643,
"combined_line": 83954,
"original_file": "duk_js_var.c"
},
{
"original_line": 1,
"combined_line": 84440,
"combined_line": 85745,
"original_file": "duk_lexer.c"
},
{
"original_line": 1,
"combined_line": 86901,
"combined_line": 88196,
"original_file": "duk_numconv.c"
},
{
"original_line": 1,
"combined_line": 89194,
"combined_line": 90538,
"original_file": "duk_regexp_compiler.c"
},
{
"original_line": 1,
"combined_line": 90485,
"combined_line": 91841,
"original_file": "duk_regexp_executor.c"
},
{
"original_line": 1,
"combined_line": 91514,
"combined_line": 92896,
"original_file": "duk_selftest.c"
},
{
"original_line": 2,
"combined_line": 92201,
"combined_line": 93643,
"original_file": "duk_tval.c"
},
{
"original_line": 1,
"combined_line": 92352,
"combined_line": 93794,
"original_file": "duk_unicode_tables.c"
},
{
"original_line": 1,
"combined_line": 98527,
"combined_line": 99969,
"original_file": "duk_util_bitdecoder.c"
},
{
"original_line": 1,
"combined_line": 98693,
"combined_line": 100133,
"original_file": "duk_util_bitencoder.c"
},
{
"original_line": 1,
"combined_line": 98736,
"combined_line": 100176,
"original_file": "duk_util_bufwriter.c"
},
{
"original_line": 1,
"combined_line": 99022,
"combined_line": 100462,
"original_file": "duk_util_cast.c"
},
{
"original_line": 1,
"combined_line": 99190,
"combined_line": 100634,
"original_file": "duk_util_double.c"
},
{
"original_line": 1,
"combined_line": 99533,
"combined_line": 100977,
"original_file": "duk_util_hashbytes.c"
},
{
"original_line": 1,
"combined_line": 99594,
"combined_line": 101039,
"original_file": "duk_util_memory.c"
},
{
"original_line": 1,
"combined_line": 99630,
"combined_line": 101075,
"original_file": "duk_util_tinyrandom.c"
}
],
"duk_version": 20600,
"duk_version": 20700,
"git_branch": "external",
"git_commit": "external",
"builtin_strings_info": [

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
/*
* Duktape public API for Duktape 2.6.0.
* Duktape public API for Duktape 2.7.0.
*
* See the API reference for documentation on call semantics. The exposed,
* supported API is between the "BEGIN PUBLIC API" and "END PUBLIC API"
@ -21,7 +21,7 @@
*
* (http://opensource.org/licenses/MIT)
*
* Copyright (c) 2013-2019 by Duktape authors (see AUTHORS.rst)
* Copyright (c) 2013-present by Duktape authors (see AUTHORS.rst)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -110,6 +110,12 @@
* * Luis de Bethencourt (https://github.com/luisbg)
* * Ian Whyman (https://github.com/v00d00)
* * Rick Sayre (https://github.com/whorfin)
* * Craig Leres (https://github.com/leres)
* * Maurici Abad (https://github.com/mauriciabad)
* * Nancy Li (https://github.com/NancyLi1013)
* * William Parks (https://github.com/WilliamParks)
* * Sam Hellawell (https://github.com/samhellawell)
* * Vladislavs Sokurenko (https://github.com/sokurenko)
*
* Other contributions
* ===================
@ -176,7 +182,7 @@
* development snapshots have 99 for patch level (e.g. 0.10.99 would be a
* development version after 0.10.0 but before the next official release).
*/
#define DUK_VERSION 20600L
#define DUK_VERSION 20700L
/* Git commit, describe, and branch for Duktape build. Useful for
* non-official snapshot builds so that application code can easily log