Update to Duktape 1.4.0 release.

2016-01-12 11:25:30 +01:00 · 2016-01-12 11:25:30 +01:00 · 2937b2f871
parent 6122517bf4
commit 2937b2f871
3 changed files with 1770 additions and 1368 deletions
--- a/javascript/duktape/duk_config.h
+++ b/javascript/duktape/duk_config.h
@ -1,9 +1,9 @@
 /*
 *  duk_config.h configuration header generated by genconfig.py.
 *
- *  Git commit: b7b1c5fd2d1d4550140d57e05a7b32f540082bfa
- *  Git describe: v1.3.0-383-gb7b1c5f
- *  Git branch: duk-config-improvements
+ *  Git commit: cad6f595382a0cc1a7e4207794ade5be11b3e397
+ *  Git describe: v1.4.0
+ *  Git branch: master
 *
 *  Supported platforms:
 *      - Mac OSX, iPhone, Darwin
@ -199,6 +199,12 @@
 #define DUK_F_NO_STDINT_H
 #endif

+/* C++ */
+#undef DUK_F_CPP
+#if defined(__cplusplus)
+#define DUK_F_CPP
+#endif
+
 /* Intel x86 (32-bit), x64 (64-bit) or x32 (64-bit but 32-bit pointers),
 * define only one of DUK_F_X86, DUK_F_X64, DUK_F_X32.
 * https://sites.google.com/site/x32abi/
@ -273,12 +279,6 @@
 #define DUK_F_CLANG
 #endif

-/* C++ */
-#undef DUK_F_CPP
-#if defined(__cplusplus)
-#define DUK_F_CPP
-#endif
-
 /* C99 or above */
 #undef DUK_F_C99
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
@ -334,11 +334,6 @@
 #define DUK_F_VBCC
 #endif

-/* uclibc */
-#if defined(__UCLIBC__)
-#define DUK_F_UCLIBC
-#endif
-
 /*
 *  Platform autodetection
 */
@ -688,6 +683,10 @@
 #include <stdint.h>
 #endif

+#if defined(DUK_F_CPP)
+#include <exception>  /* std::exception */
+#endif
+
 /*
 *  Architecture autodetection
 */
@ -1264,6 +1263,11 @@
 #define DUK_F_VARIADIC_MACROS_PROVIDED
 #endif  /* autodetect compiler */

+/* uclibc */
+#if defined(__UCLIBC__)
+#define DUK_F_UCLIBC
+#endif
+
 /*
 *  Wrapper typedefs and constants for integer types, also sanity check types.
 *
@ -2671,6 +2675,14 @@ typedef FILE duk_file;
 #define DUK_USE_COMMONJS_MODULES
 #endif

+#if defined(DUK_OPT_CPP_EXCEPTIONS)
+#define DUK_USE_CPP_EXCEPTIONS
+#elif defined(DUK_OPT_NO_CPP_EXCEPTIONS)
+#undef DUK_USE_CPP_EXCEPTIONS
+#else
+#undef DUK_USE_CPP_EXCEPTIONS
+#endif
+
 #if defined(DUK_OPT_DATAPTR16)
 #define DUK_USE_DATAPTR16
 #elif defined(DUK_OPT_NO_DATAPTR16)
@ -2760,7 +2772,7 @@ typedef FILE duk_file;
 #elif defined(DUK_OPT_NO_DEBUGGER_THROW_NOTIFY)
 #undef DUK_USE_DEBUGGER_THROW_NOTIFY
 #else
-#undef DUK_USE_DEBUGGER_THROW_NOTIFY
+#define DUK_USE_DEBUGGER_THROW_NOTIFY
 #endif

 #if defined(DUK_OPT_DEBUGGER_TRANSPORT_TORTURE)
@ -3484,27 +3496,9 @@ typedef FILE duk_file;
 #if defined(DUK_USE_DATAPTR_ENC16) && !defined(DUK_USE_DATAPTR16)
 #error config option DUK_USE_DATAPTR_ENC16 requires option DUK_USE_DATAPTR16 (which is missing)
 #endif
-#if defined(DUK_USE_DEBUGGER_DUMPHEAP) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_DUMPHEAP requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_FWD_LOGGING) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_FWD_LOGGING requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_FWD_PRINTALERT) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_FWD_PRINTALERT requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_PAUSE_UNCAUGHT) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_PAUSE_UNCAUGHT requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
 #if defined(DUK_USE_DEBUGGER_SUPPORT) && !defined(DUK_USE_INTERRUPT_COUNTER)
 #error config option DUK_USE_DEBUGGER_SUPPORT requires option DUK_USE_INTERRUPT_COUNTER (which is missing)
 #endif
-#if defined(DUK_USE_DEBUGGER_THROW_NOTIFY) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_THROW_NOTIFY requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_TRANSPORT_TORTURE) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_TRANSPORT_TORTURE requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
 #if defined(DUK_USE_DEEP_C_STACK)
 #error unsupported config option used (option has been removed): DUK_USE_DEEP_C_STACK
 #endif
@ -3620,6 +3614,10 @@ typedef FILE duk_file;
 #error unsupported config option used (option has been removed): DUK_USE_UNALIGNED_ACCESSES_POSSIBLE
 #endif

+#if defined(DUK_USE_CPP_EXCEPTIONS) && !defined(__cplusplus)
+#error DUK_USE_CPP_EXCEPTIONS enabled but not compiling with a C++ compiler
+#endif
+
 /*
 *  Convert DUK_USE_BYTEORDER, from whatever source, into currently used
 *  internal defines.  If detection failed, #error out.
--- a/javascript/duktape/duktape.c
+++ b/javascript/duktape/duktape.c
--- a/javascript/duktape/duktape.h
+++ b/javascript/duktape/duktape.h
@ -1,12 +1,12 @@
 /*
- *  Duktape public API for Duktape 1.3.99.
+ *  Duktape public API for Duktape 1.4.0.
 *  See the API reference for documentation on call semantics.
 *  The exposed API is inside the DUK_API_PUBLIC_H_INCLUDED
 *  include guard.  Other parts of the header are Duktape
 *  internal and related to platform/compiler/feature detection.
 *
- *  Git commit b7b1c5fd2d1d4550140d57e05a7b32f540082bfa (v1.3.0-383-gb7b1c5f).
- *  Git branch duk-config-improvements.
+ *  Git commit cad6f595382a0cc1a7e4207794ade5be11b3e397 (v1.4.0).
+ *  Git branch master.
 *
 *  See Duktape AUTHORS.rst and LICENSE.txt for copyright and
 *  licensing information.
@ -20,7 +20,7 @@
 *  
 *  (http://opensource.org/licenses/MIT)
 *  
- *  Copyright (c) 2013-2015 by Duktape authors (see AUTHORS.rst)
+ *  Copyright (c) 2013-2016 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
@ -71,6 +71,7 @@
 *  * Legimet <legimet.calc@gmail.com>
 *  * Karl Skomski <karl@skomski.com>
 *  * Bruce Pascoe <fatcerberus1@gmail.com>
+ *  * Ren\u00e9 Hollander <rene@rene8888.at>
 *  
 *  Other contributions
 *  ===================
@ -107,6 +108,7 @@
 *  * https://github.com/sstruchtrup
 *  * Michael Drake (https://github.com/tlsa)
 *  * https://github.com/chris-y
+ *  * Laurent Zubiaur (https://github.com/lzubiaur)
 *  
 *  If you are accidentally missing from this list, send me an e-mail
 *  (``sami.vaarala@iki.fi``) and I'll fix the omission.
@ -211,16 +213,16 @@ struct duk_number_list_entry {
 * 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                       10399L
+#define DUK_VERSION                       10400L

 /* Git commit, describe, and branch for Duktape build.  Useful for
 * non-official snapshot builds so that application code can easily log
 * which Duktape snapshot was used.  Not available in the Ecmascript
 * environment.
 */
-#define DUK_GIT_COMMIT                    "b7b1c5fd2d1d4550140d57e05a7b32f540082bfa"
-#define DUK_GIT_DESCRIBE                  "v1.3.0-383-gb7b1c5f"
-#define DUK_GIT_BRANCH                    "duk-config-improvements"
+#define DUK_GIT_COMMIT                    "cad6f595382a0cc1a7e4207794ade5be11b3e397"
+#define DUK_GIT_DESCRIBE                  "v1.4.0"
+#define DUK_GIT_BRANCH                    "master"

 /* Duktape debug protocol version used by this build. */
 #define DUK_DEBUG_PROTOCOL_VERSION        1
@ -556,7 +558,7 @@ DUK_EXTERNAL_DECL duk_idx_t duk_push_error_object_va_raw(duk_context *ctx, duk_e
 DUK_EXTERNAL_DECL void *duk_push_buffer_raw(duk_context *ctx, duk_size_t size, duk_small_uint_t flags);

 #define duk_push_buffer(ctx,size,dynamic) \
-	duk_push_buffer_raw((ctx), (size), (dynamic) ? DUK_BUF_FLAG_DYNAMIC : 0);
+	duk_push_buffer_raw((ctx), (size), (dynamic) ? DUK_BUF_FLAG_DYNAMIC : 0)
 #define duk_push_fixed_buffer(ctx,size) \
 	duk_push_buffer_raw((ctx), (size), 0 /*flags*/)
 #define duk_push_dynamic_buffer(ctx,size) \