summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ast-writer.cc4
-rw-r--r--src/binary-reader-ast.cc4
-rw-r--r--src/binary-reader-interpreter.cc4
-rw-r--r--src/binary-reader-linker.cc6
-rw-r--r--src/binary-reader-linker.h4
-rw-r--r--src/binary-reader-objdump.cc4
-rw-r--r--src/binary-reader-opcnt.cc4
-rw-r--r--src/binary-reader.cc4
-rw-r--r--src/binary-writer-spec.cc4
-rw-r--r--src/binary-writer.cc4
-rw-r--r--src/generate-names.cc4
-rw-r--r--src/resolve-names.cc4
-rw-r--r--src/tools/wasm-link.cc1
-rw-r--r--src/validator.cc4
-rw-r--r--src/wasm-link.h2
15 files changed, 57 insertions, 0 deletions
diff --git a/src/ast-writer.cc b/src/ast-writer.cc
index 46abed59..ebf5a469 100644
--- a/src/ast-writer.cc
+++ b/src/ast-writer.cc
@@ -33,6 +33,8 @@
namespace wabt {
+namespace {
+
static const uint8_t s_is_char_escaped[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -69,6 +71,8 @@ struct Context {
int func_type_index;
};
+} // namespace
+
static void indent(Context* ctx) {
ctx->indent += INDENT_SIZE;
}
diff --git a/src/binary-reader-ast.cc b/src/binary-reader-ast.cc
index 2ab46655..8cd4fb4e 100644
--- a/src/binary-reader-ast.cc
+++ b/src/binary-reader-ast.cc
@@ -34,6 +34,8 @@
namespace wabt {
+namespace {
+
struct LabelNode {
LabelType label_type;
Expr** first;
@@ -51,6 +53,8 @@ struct Context {
Expr** current_init_expr;
};
+} // namespace
+
static bool handle_error(Context* ctx, uint32_t offset, const char* message);
static void WABT_PRINTF_FORMAT(2, 3)
diff --git a/src/binary-reader-interpreter.cc b/src/binary-reader-interpreter.cc
index a9a3f937..38f0a4b9 100644
--- a/src/binary-reader-interpreter.cc
+++ b/src/binary-reader-interpreter.cc
@@ -55,6 +55,8 @@
namespace wabt {
+namespace {
+
typedef uint32_t Uint32;
WABT_DEFINE_VECTOR(uint32, Uint32);
WABT_DEFINE_VECTOR(uint32_vector, Uint32Vector);
@@ -94,6 +96,8 @@ struct Context {
uint32_t import_env_index;
};
+} // namespace
+
static Label* get_label(Context* ctx, uint32_t depth) {
assert(depth < ctx->label_stack.size);
return &ctx->label_stack.data[ctx->label_stack.size - depth - 1];
diff --git a/src/binary-reader-linker.cc b/src/binary-reader-linker.cc
index dc537259..5b3d36f8 100644
--- a/src/binary-reader-linker.cc
+++ b/src/binary-reader-linker.cc
@@ -22,6 +22,9 @@
#define RELOC_SIZE 5
namespace wabt {
+namespace link {
+
+namespace {
struct Context {
LinkerInputBinary* binary;
@@ -30,6 +33,8 @@ struct Context {
Section* current_section;
};
+} // namespace
+
static Result on_reloc_count(uint32_t count,
BinarySection section_code,
StringSlice section_name,
@@ -334,4 +339,5 @@ Result read_binary_linker(LinkerInputBinary* input_info,
&read_options);
}
+} // namespace link
} // namespace wabt
diff --git a/src/binary-reader-linker.h b/src/binary-reader-linker.h
index d2c04344..5a543bb3 100644
--- a/src/binary-reader-linker.h
+++ b/src/binary-reader-linker.h
@@ -23,6 +23,9 @@
namespace wabt {
struct Stream;
+
+namespace link {
+
struct LinkerInputBinary;
struct LinkOptions {
@@ -32,6 +35,7 @@ struct LinkOptions {
Result read_binary_linker(struct LinkerInputBinary* input_info,
struct LinkOptions* options);
+} // namespace link
} // namespace wabt
#endif /* WABT_BINARY_READER_LINKER_H_ */
diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc
index 64f909bf..5fd401c9 100644
--- a/src/binary-reader-objdump.cc
+++ b/src/binary-reader-objdump.cc
@@ -27,6 +27,8 @@
namespace wabt {
+namespace {
+
typedef uint32_t Uint32;
WABT_DEFINE_VECTOR(uint32, Uint32);
@@ -49,6 +51,8 @@ struct Context {
uint32_t next_reloc;
};
+} // namespace
+
static bool should_print_details(Context* ctx) {
if (ctx->options->mode != ObjdumpMode::Details)
return false;
diff --git a/src/binary-reader-opcnt.cc b/src/binary-reader-opcnt.cc
index 51f86e26..edf2f0b3 100644
--- a/src/binary-reader-opcnt.cc
+++ b/src/binary-reader-opcnt.cc
@@ -27,10 +27,14 @@
namespace wabt {
+namespace {
+
struct Context {
OpcntData* opcnt_data;
};
+} // namespace
+
static Result add_int_counter_value(IntCounterVector* vec,
intmax_t value) {
for (size_t i = 0; i < vec->size; ++i) {
diff --git a/src/binary-reader.cc b/src/binary-reader.cc
index eda66edc..43ce11e6 100644
--- a/src/binary-reader.cc
+++ b/src/binary-reader.cc
@@ -40,6 +40,8 @@
namespace wabt {
+namespace {
+
typedef uint32_t Uint32;
WABT_DEFINE_VECTOR(type, Type)
WABT_DEFINE_VECTOR(uint32, Uint32);
@@ -138,6 +140,8 @@ struct LoggingContext {
int indent;
};
+} // namespace
+
static BinaryReaderContext* get_user_context(Context* ctx) {
ctx->user_ctx.user_data = ctx->reader->user_data;
ctx->user_ctx.data = ctx->data;
diff --git a/src/binary-writer-spec.cc b/src/binary-writer-spec.cc
index cb4edefb..8f444d12 100644
--- a/src/binary-writer-spec.cc
+++ b/src/binary-writer-spec.cc
@@ -28,6 +28,8 @@
namespace wabt {
+namespace {
+
struct Context {
MemoryWriter json_writer;
Stream json_stream;
@@ -39,6 +41,8 @@ struct Context {
size_t num_modules;
};
+} // namespace
+
static void convert_backslash_to_slash(char* s, size_t length) {
for (size_t i = 0; i < length; ++i)
if (s[i] == '\\')
diff --git a/src/binary-writer.cc b/src/binary-writer.cc
index 235c3c9b..53567e32 100644
--- a/src/binary-writer.cc
+++ b/src/binary-writer.cc
@@ -35,6 +35,8 @@
namespace wabt {
+namespace {
+
/* TODO(binji): better leb size guess. Some sections we know will only be 1
byte, but others we can be fairly certain will be larger. */
static const size_t LEB_SECTION_SIZE_GUESS = 1;
@@ -69,6 +71,8 @@ struct Context {
size_t last_subsection_payload_offset;
};
+} // namespace
+
void destroy_reloc_section(RelocSection* reloc_section) {
destroy_reloc_vector(&reloc_section->relocations);
}
diff --git a/src/generate-names.cc b/src/generate-names.cc
index e1d872c7..7da47662 100644
--- a/src/generate-names.cc
+++ b/src/generate-names.cc
@@ -29,6 +29,8 @@
namespace wabt {
+namespace {
+
struct Context {
Module* module;
ExprVisitor visitor;
@@ -36,6 +38,8 @@ struct Context {
uint32_t label_count;
};
+} // namespace
+
static bool has_name(StringSlice* str) {
return str->length > 0;
}
diff --git a/src/resolve-names.cc b/src/resolve-names.cc
index 5e7f85ec..f5eac911 100644
--- a/src/resolve-names.cc
+++ b/src/resolve-names.cc
@@ -24,6 +24,8 @@
namespace wabt {
+namespace {
+
typedef Label* LabelPtr;
WABT_DEFINE_VECTOR(label_ptr, LabelPtr);
@@ -38,6 +40,8 @@ struct Context {
Result result;
};
+} // namespace
+
static void WABT_PRINTF_FORMAT(3, 4)
print_error(Context* ctx, const Location* loc, const char* fmt, ...) {
ctx->result = Result::Error;
diff --git a/src/tools/wasm-link.cc b/src/tools/wasm-link.cc
index a979dc03..63db62dc 100644
--- a/src/tools/wasm-link.cc
+++ b/src/tools/wasm-link.cc
@@ -31,6 +31,7 @@
#define FIRST_KNOWN_SECTION static_cast<size_t>(BinarySection::Type)
using namespace wabt;
+using namespace wabt::link;
enum { FLAG_DEBUG, FLAG_OUTPUT, FLAG_RELOCATABLE, FLAG_HELP, NUM_FLAGS };
diff --git a/src/validator.cc b/src/validator.cc
index 07cdcc42..b559e49d 100644
--- a/src/validator.cc
+++ b/src/validator.cc
@@ -30,6 +30,8 @@
namespace wabt {
+namespace {
+
enum class ActionResultKind {
Error,
Types,
@@ -59,6 +61,8 @@ struct Context {
Result result;
};
+} // namespace
+
static void WABT_PRINTF_FORMAT(3, 4)
print_error(Context* ctx, const Location* loc, const char* fmt, ...) {
ctx->result = Result::Error;
diff --git a/src/wasm-link.h b/src/wasm-link.h
index e6831726..8b7f8b2f 100644
--- a/src/wasm-link.h
+++ b/src/wasm-link.h
@@ -24,6 +24,7 @@
#define WABT_LINK_MODULE_NAME "__extern"
namespace wabt {
+namespace link {
struct LinkerInputBinary;
@@ -128,6 +129,7 @@ struct LinkerInputBinary {
};
WABT_DEFINE_VECTOR(binary, LinkerInputBinary);
+} // namespace link
} // namespace wabt
#endif /* WABT_LINK_H_ */