From 61635213cdb31a4859ebf747f2b62051dbac58f9 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 25 Mar 2021 14:04:56 +1100 Subject: [PATCH] =?UTF-8?q?Add=20"=E2=80=BC"=20to=20"WUFFS=20C=20HEADER=20?= =?UTF-8?q?ENDS=20HERE"=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/wuffs-c/release.go | 2 +- internal/cgen/base/all-impl.c | 2 +- internal/cgen/cgen.go | 2 +- internal/cgen/data/data.go | 2 +- release/c/wuffs-unsupported-snapshot.c | 2 +- script/wuffs-deflate-decoder-decode-huffman.c | 12 ++++++------ 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go index f89e0055..55fd8b18 100644 --- a/cmd/wuffs-c/release.go +++ b/cmd/wuffs-c/release.go @@ -144,7 +144,7 @@ func doGenrelease(args []string) error { } var ( - grImplStartsHere = []byte("\n// WUFFS C HEADER ENDS HERE.\n#ifdef WUFFS_IMPLEMENTATION\n") + grImplStartsHere = []byte("\n// ‼ WUFFS C HEADER ENDS HERE.\n#ifdef WUFFS_IMPLEMENTATION\n") grImplEndsHere = []byte("#endif // WUFFS_IMPLEMENTATION\n") grIncludeQuote = []byte("#include \"") grNN = []byte("\n\n") diff --git a/internal/cgen/base/all-impl.c b/internal/cgen/base/all-impl.c index 60e5ec32..f176dd34 100644 --- a/internal/cgen/base/all-impl.c +++ b/internal/cgen/base/all-impl.c @@ -54,7 +54,7 @@ extern "C" { } // extern "C" #endif -// WUFFS C HEADER ENDS HERE. +// ‼ WUFFS C HEADER ENDS HERE. #ifdef WUFFS_IMPLEMENTATION #ifdef __cplusplus diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index 1c3bd8b7..b7bf01de 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -664,7 +664,7 @@ func (g *gen) generate() ([]byte, error) { } var ( - wiStartImpl = []byte("\n// WUFFS C HEADER ENDS HERE.\n#ifdef WUFFS_IMPLEMENTATION\n\n") + wiStartImpl = []byte("\n// ‼ WUFFS C HEADER ENDS HERE.\n#ifdef WUFFS_IMPLEMENTATION\n\n") wiEnd = []byte("\n#endif // WUFFS_IMPLEMENTATION\n\n") ) diff --git a/internal/cgen/data/data.go b/internal/cgen/data/data.go index 02707961..c9ba84f7 100644 --- a/internal/cgen/data/data.go +++ b/internal/cgen/data/data.go @@ -19,7 +19,7 @@ package data const BaseAllImplC = "" + "#ifndef WUFFS_INCLUDE_GUARD__BASE\n#define WUFFS_INCLUDE_GUARD__BASE\n\n#if defined(WUFFS_IMPLEMENTATION) && !defined(WUFFS_CONFIG__MODULES)\n#define WUFFS_CONFIG__MODULES\n#define WUFFS_CONFIG__MODULE__BASE\n#endif\n\n// !! WUFFS MONOLITHIC RELEASE DISCARDS EVERYTHING ABOVE.\n\n// !! INSERT base/copyright\n\n#include \n#include \n#include \n#include \n\n// Note that Clang also defines __GNUC__.\n#ifdef __cplusplus\n#if (__cplusplus >= 201103L) || defined(_MSC_VER)\n#include \n#define WUFFS_BASE__HAVE_EQ_DELETE\n#define WUFFS_BASE__HAVE_UNIQUE_PTR\n#elif defined(__GNUC__)\n#warning \"Wuffs' C++ code expects -std=c++11 or later\"\n#endif\n\nextern \"C\" {\n#endif\n\n// !! INSERT base/all-public.h.\n\n// !! INSERT InterfaceDeclarations.\n\n" + "" + - "// ----------------\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n// WUFFS C HEADER ENDS HERE.\n#ifdef WUFFS_IMPLEMENTATION\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n// !! INSERT base/all-private.h.\n\n" + + "// ----------------\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n// ‼ WUFFS C HEADER ENDS HERE.\n#ifdef WUFFS_IMPLEMENTATION\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n// !! INSERT base/all-private.h.\n\n" + "" + "// ----------------\n\n#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \\\n defined(WUFFS_CONFIG__MODULE__BASE__CORE)\n\nconst uint8_t wuffs_base__low_bits_mask__u8[8] = {\n 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F,\n};\n\nconst uint16_t wuffs_base__low_bits_mask__u16[16] = {\n 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F,\n 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF,\n};\n\nconst uint32_t wuffs_base__low_bits_mask__u32[32] = {\n 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000F, 0x0000001F,\n 0x0000003F, 0x0000007F, 0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF,\n 0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF, 0x0001FFFF,\n 0x0003FFFF, 0x0007FFFF, 0x000FFFFF, 0x001FFFFF, 0x003FFFFF, 0x007FFFFF,\n 0x00FFFFFF, 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF, 0x0FFFFFFF, 0x1FFFFFFF,\n 0x3FFFFFFF, 0x7FFFFFFF,\n};\n\nconst uint64_t wuffs_base__low_bits_mask__u64[64] = {\n 0x0000000000000000, 0x0000000000000001, 0x000000000" + "0000003,\n 0x0000000000000007, 0x000000000000000F, 0x000000000000001F,\n 0x000000000000003F, 0x000000000000007F, 0x00000000000000FF,\n 0x00000000000001FF, 0x00000000000003FF, 0x00000000000007FF,\n 0x0000000000000FFF, 0x0000000000001FFF, 0x0000000000003FFF,\n 0x0000000000007FFF, 0x000000000000FFFF, 0x000000000001FFFF,\n 0x000000000003FFFF, 0x000000000007FFFF, 0x00000000000FFFFF,\n 0x00000000001FFFFF, 0x00000000003FFFFF, 0x00000000007FFFFF,\n 0x0000000000FFFFFF, 0x0000000001FFFFFF, 0x0000000003FFFFFF,\n 0x0000000007FFFFFF, 0x000000000FFFFFFF, 0x000000001FFFFFFF,\n 0x000000003FFFFFFF, 0x000000007FFFFFFF, 0x00000000FFFFFFFF,\n 0x00000001FFFFFFFF, 0x00000003FFFFFFFF, 0x00000007FFFFFFFF,\n 0x0000000FFFFFFFFF, 0x0000001FFFFFFFFF, 0x0000003FFFFFFFFF,\n 0x0000007FFFFFFFFF, 0x000000FFFFFFFFFF, 0x000001FFFFFFFFFF,\n 0x000003FFFFFFFFFF, 0x000007FFFFFFFFFF, 0x00000FFFFFFFFFFF,\n 0x00001FFFFFFFFFFF, 0x00003FFFFFFFFFFF, 0x00007FFFFFFFFFFF,\n 0x0000FFFFFFFFFFFF, 0x0001FFFFFFFFFFFF, 0x0003FFFFF" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 2578e86f..d255a788 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -9755,7 +9755,7 @@ DecodeJson(DecodeJsonCallbacks& callbacks, #endif // defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) -// WUFFS C HEADER ENDS HERE. +// ‼ WUFFS C HEADER ENDS HERE. #ifdef WUFFS_IMPLEMENTATION #ifdef __cplusplus diff --git a/script/wuffs-deflate-decoder-decode-huffman.c b/script/wuffs-deflate-decoder-decode-huffman.c index b3e88ef9..35b09e38 100644 --- a/script/wuffs-deflate-decoder-decode-huffman.c +++ b/script/wuffs-deflate-decoder-decode-huffman.c @@ -32,7 +32,7 @@ // implementation, edit release/c/wuffs-unsupported-snapshot.c and find the // lines that say // -// // WUFFS C HEADER ENDS HERE. +// // ‼ WUFFS C HEADER ENDS HERE. // #ifdef WUFFS_IMPLEMENTATION // // After that, add this line: @@ -54,11 +54,11 @@ $ git diff release/c/wuffs-unsupported-snapshot.c diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c -index 1e1941ae..d2d59fef 100644 +index d255a788..2a112728 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c -@@ -9283,6 +9283,8 @@ DecodeJsonResult DecodeJson( - // WUFFS C HEADER ENDS HERE. +@@ -9758,6 +9758,8 @@ DecodeJson(DecodeJsonCallbacks& callbacks, + // ‼ WUFFS C HEADER ENDS HERE. #ifdef WUFFS_IMPLEMENTATION +#include "../../script/wuffs-deflate-decoder-decode-huffman.c" @@ -66,7 +66,7 @@ index 1e1941ae..d2d59fef 100644 #ifdef __cplusplus extern "C" { #endif -@@ -22335,7 +22337,7 @@ wuffs_deflate__decoder__decode_blocks( +@@ -25326,7 +25328,7 @@ wuffs_deflate__decoder__decode_blocks( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); } @@ -75,7 +75,7 @@ index 1e1941ae..d2d59fef 100644 if (a_src) { iop_a_src = a_src->data.ptr + a_src->meta.ri; } -@@ -22343,7 +22345,7 @@ wuffs_deflate__decoder__decode_blocks( +@@ -25334,7 +25336,7 @@ wuffs_deflate__decoder__decode_blocks( if (a_src) { a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); }