Merge pull request #80 from andrjohns/sync-dev

Update cpp11 and QuickJS-NG sources for CRAN errors
andrjohns · Feb 26, 2025 · 78e0ede · 78e0ede
2 parents bd3c2c6 + 728a2df
commit 78e0ede
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/R-CMD-check-special.yaml b/.github/workflows/R-CMD-check-special.yaml
@@ -31,9 +31,9 @@ jobs:
           - { label: "c23",
               name: "c23",
               container: "ghcr.io/r-hub/containers/c23:latest"}
-          - { label: "gcc14",
-              name: "gcc14",
-              container: "ghcr.io/r-hub/containers/gcc14:latest"}
+          - { label: "gcc15",
+              name: "gcc15",
+              container: "ghcr.io/r-hub/containers/gcc15:latest"}
           - { label: "clang20",
               name: "clang20",
               container: "ghcr.io/r-hub/containers/clang20:latest"}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: QuickJSR
 Title: Interface for the 'QuickJS' Lightweight 'JavaScript' Engine
-Version: 1.5.2
+Version: 1.6.0
 Authors@R: c(
     person(c("Andrew", "R."), "Johnson", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-7000-8065")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# QuickJSR 1.6.0
+  * Sync bundled QuickJS-NG engine to 9d6e372 to address gcc-ubsan error
+  * Patch bundled cpp11 headers for whitespace in literal operator declarations
+
 # QuickJSR 1.5.2
   * Fix conversions of NULL/NA/undefined values between R and JS
 

diff --git a/inst/include/cpp11/R.hpp b/inst/include/cpp11/R.hpp
@@ -51,7 +51,7 @@
 namespace cpp11 {
 namespace literals {
 
-constexpr R_xlen_t operator"" _xl(unsigned long long int value) { return value; }
+constexpr R_xlen_t operator""_xl(unsigned long long int value) { return value; }
 
 }  // namespace literals
 

diff --git a/inst/include/cpp11/named_arg.hpp b/inst/include/cpp11/named_arg.hpp
@@ -41,7 +41,7 @@ class named_arg {
 
 namespace literals {
 
-inline named_arg operator"" _nm(const char* name, std::size_t) { return named_arg(name); }
+inline named_arg operator""_nm(const char* name, std::size_t) { return named_arg(name); }
 
 }  // namespace literals
 

diff --git a/src/quickjs b/src/quickjs
+48 −25		.github/workflows/ci.yml
+4 −4		.github/workflows/release.yml
+1 −1		.github/workflows/tsan.yml
+46 −38		CMakeLists.txt
+4 −4		LICENSE
+4 −10		Makefile
+157 −0		api-test.c
+11 −6		cutils.c
+24 −40		cutils.h
+2 −2		dirent_compat.h
+1 −1		docs/docs/cli.md
+4 −0		docs/docs/projects.md
+6 −1		docs/docs/stdlib.md
+3 −1		docs/docs/supported_platforms.md
+1 −1		fuzz.c
+28 −30		gen/function_source.c
+8 −11		gen/hello.c
+29 −30		gen/hello_module.c
+1,468 −1,468		gen/repl.c
+152 −152		gen/standalone.c
+22 −25		gen/test_fib.c
+61 −63		libbf.c
+61 −61		libregexp.c
+4 −7		libregexp.h
+19 −17		libunicode.c
+9 −12		libunicode.h
+27 −33		qjs.c
+10 −13		qjsc.c
+95 −81		quickjs-libc.c
+4 −4		quickjs-libc.h
+1 −5		quickjs-opcode.h
+1,902 −2,127		quickjs.c
+147 −61		quickjs.h
+97 −89		run-test262.c
+1 −1		test262
+6 −0		test262.conf
+0 −1		test262_errors.txt
+1 −0		tests.conf
+7 −0		tests/bug775.js
+7 −0		tests/bug776.js
+2 −0		tests/bug832.js
+26 −0		tests/bug858.js
+6 −0		tests/bug904.js
+8 −0		tests/destructured-export.js
+0 −0		tests/empty.js
+6 −6		tests/test_builtin.js
+0 −1,750		tests/test_conv.c
+5 −3		tests/test_std.js
+25 −25		unicode_gen.c