diff options
Diffstat (limited to 'src')
88 files changed, 301 insertions, 295 deletions
diff --git a/src/apply-names.cc b/src/apply-names.cc index f6a6b116..2080e958 100644 --- a/src/apply-names.cc +++ b/src/apply-names.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "apply-names.h" +#include "src/apply-names.h" #include <cassert> #include <cstdio> #include <vector> -#include "expr-visitor.h" -#include "ir.h" -#include "string-view.h" +#include "src/expr-visitor.h" +#include "src/ir.h" +#include "src/string-view.h" namespace wabt { diff --git a/src/apply-names.h b/src/apply-names.h index 3088608c..1837c370 100644 --- a/src/apply-names.h +++ b/src/apply-names.h @@ -17,7 +17,7 @@ #ifndef WABT_APPLY_NAMES_H_ #define WABT_APPLY_NAMES_H_ -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/binary-reader-interpreter.cc b/src/binary-reader-interpreter.cc index ee51c07d..a5086c78 100644 --- a/src/binary-reader-interpreter.cc +++ b/src/binary-reader-interpreter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "binary-reader-interpreter.h" +#include "src/binary-reader-interpreter.h" #include <cassert> #include <cinttypes> @@ -22,12 +22,12 @@ #include <cstdio> #include <vector> -#include "binary-reader-nop.h" -#include "cast.h" -#include "error-handler.h" -#include "interpreter.h" -#include "type-checker.h" -#include "writer.h" +#include "src/binary-reader-nop.h" +#include "src/cast.h" +#include "src/error-handler.h" +#include "src/interpreter.h" +#include "src/type-checker.h" +#include "src/writer.h" namespace wabt { diff --git a/src/binary-reader-interpreter.h b/src/binary-reader-interpreter.h index bf2013a9..ce1bf872 100644 --- a/src/binary-reader-interpreter.h +++ b/src/binary-reader-interpreter.h @@ -17,7 +17,7 @@ #ifndef WABT_BINARY_READER_INTERPRETER_H_ #define WABT_BINARY_READER_INTERPRETER_H_ -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/binary-reader-ir.cc b/src/binary-reader-ir.cc index 83d56747..e69cdec8 100644 --- a/src/binary-reader-ir.cc +++ b/src/binary-reader-ir.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "binary-reader-ir.h" +#include "src/binary-reader-ir.h" #include <cassert> #include <cinttypes> @@ -23,11 +23,11 @@ #include <cstdio> #include <vector> -#include "binary-reader-nop.h" -#include "cast.h" -#include "common.h" -#include "error-handler.h" -#include "ir.h" +#include "src/binary-reader-nop.h" +#include "src/cast.h" +#include "src/common.h" +#include "src/error-handler.h" +#include "src/ir.h" namespace wabt { diff --git a/src/binary-reader-ir.h b/src/binary-reader-ir.h index 227663b7..74ed6b22 100644 --- a/src/binary-reader-ir.h +++ b/src/binary-reader-ir.h @@ -17,7 +17,7 @@ #ifndef WABT_BINARY_READER_IR_H_ #define WABT_BINARY_READER_IR_H_ -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/binary-reader-linker.cc b/src/binary-reader-linker.cc index 05ccf438..aab17f1a 100644 --- a/src/binary-reader-linker.cc +++ b/src/binary-reader-linker.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "binary-reader-linker.h" +#include "src/binary-reader-linker.h" #include <vector> -#include "binary-reader-nop.h" -#include "wasm-link.h" +#include "src/binary-reader-nop.h" +#include "src/wasm-link.h" #define RELOC_SIZE 5 diff --git a/src/binary-reader-linker.h b/src/binary-reader-linker.h index 73ae2f22..79b43878 100644 --- a/src/binary-reader-linker.h +++ b/src/binary-reader-linker.h @@ -17,8 +17,8 @@ #ifndef WABT_BINARY_READER_LINKER_H_ #define WABT_BINARY_READER_LINKER_H_ -#include "common.h" -#include "stream.h" +#include "src/common.h" +#include "src/stream.h" namespace wabt { diff --git a/src/binary-reader-logging.cc b/src/binary-reader-logging.cc index 8af52125..9a2d4e9a 100644 --- a/src/binary-reader-logging.cc +++ b/src/binary-reader-logging.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "binary-reader-logging.h" +#include "src/binary-reader-logging.h" #include <cinttypes> -#include "stream.h" +#include "src/stream.h" namespace wabt { diff --git a/src/binary-reader-logging.h b/src/binary-reader-logging.h index c7eef652..6256bff2 100644 --- a/src/binary-reader-logging.h +++ b/src/binary-reader-logging.h @@ -17,7 +17,7 @@ #ifndef WABT_BINARY_READER_LOGGING_H_ #define WABT_BINARY_READER_LOGGING_H_ -#include "binary-reader.h" +#include "src/binary-reader.h" namespace wabt { diff --git a/src/binary-reader-nop.h b/src/binary-reader-nop.h index a85e79aa..2faa18cf 100644 --- a/src/binary-reader-nop.h +++ b/src/binary-reader-nop.h @@ -17,7 +17,7 @@ #ifndef WABT_BINARY_READER_NOP_H_ #define WABT_BINARY_READER_NOP_H_ -#include "binary-reader.h" +#include "src/binary-reader.h" namespace wabt { diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc index ad8f600f..0b5cb5a4 100644 --- a/src/binary-reader-objdump.cc +++ b/src/binary-reader-objdump.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "binary-reader-objdump.h" +#include "src/binary-reader-objdump.h" #include <algorithm> #include <cassert> @@ -23,8 +23,8 @@ #include <cstring> #include <vector> -#include "binary-reader-nop.h" -#include "literal.h" +#include "src/binary-reader-nop.h" +#include "src/literal.h" namespace wabt { diff --git a/src/binary-reader-objdump.h b/src/binary-reader-objdump.h index 32585995..7bd09fb7 100644 --- a/src/binary-reader-objdump.h +++ b/src/binary-reader-objdump.h @@ -20,9 +20,9 @@ #include <string> #include <vector> -#include "common.h" -#include "feature.h" -#include "stream.h" +#include "src/common.h" +#include "src/feature.h" +#include "src/stream.h" namespace wabt { diff --git a/src/binary-reader-opcnt.cc b/src/binary-reader-opcnt.cc index 40f68d22..e7ab6f32 100644 --- a/src/binary-reader-opcnt.cc +++ b/src/binary-reader-opcnt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "binary-reader-opcnt.h" +#include "src/binary-reader-opcnt.h" #include <cassert> #include <cinttypes> @@ -22,10 +22,10 @@ #include <cstdint> #include <cstdio> -#include "binary-reader-nop.h" -#include "common.h" -#include "literal.h" -#include "stream.h" +#include "src/binary-reader-nop.h" +#include "src/common.h" +#include "src/literal.h" +#include "src/stream.h" namespace wabt { diff --git a/src/binary-reader-opcnt.h b/src/binary-reader-opcnt.h index 28bcca32..912271ed 100644 --- a/src/binary-reader-opcnt.h +++ b/src/binary-reader-opcnt.h @@ -20,8 +20,8 @@ #include <map> #include <vector> -#include "common.h" -#include "opcode.h" +#include "src/common.h" +#include "src/opcode.h" namespace wabt { diff --git a/src/binary-reader.cc b/src/binary-reader.cc index 01e08e58..2ae82315 100644 --- a/src/binary-reader.cc +++ b/src/binary-reader.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "binary-reader.h" +#include "src/binary-reader.h" #include <cassert> #include <cinttypes> @@ -24,11 +24,12 @@ #include <cstring> #include <vector> -#include "binary.h" -#include "binary-reader-logging.h" #include "config.h" -#include "stream.h" -#include "utf8.h" + +#include "src/binary.h" +#include "src/binary-reader-logging.h" +#include "src/stream.h" +#include "src/utf8.h" #if HAVE_ALLOCA #include <alloca.h> diff --git a/src/binary-reader.h b/src/binary-reader.h index b510bce8..b96ecb8a 100644 --- a/src/binary-reader.h +++ b/src/binary-reader.h @@ -20,11 +20,11 @@ #include <stddef.h> #include <stdint.h> -#include "binary.h" -#include "common.h" -#include "feature.h" -#include "opcode.h" -#include "string-view.h" +#include "src/binary.h" +#include "src/common.h" +#include "src/feature.h" +#include "src/opcode.h" +#include "src/string-view.h" namespace wabt { diff --git a/src/binary-writer-spec.cc b/src/binary-writer-spec.cc index e1f39725..d8cfd175 100644 --- a/src/binary-writer-spec.cc +++ b/src/binary-writer-spec.cc @@ -14,19 +14,20 @@ * limitations under the License. */ -#include "binary-writer-spec.h" +#include "src/binary-writer-spec.h" #include <cassert> #include <cinttypes> -#include "binary.h" -#include "binary-writer.h" -#include "cast.h" #include "config.h" -#include "ir.h" -#include "stream.h" -#include "string-view.h" -#include "writer.h" + +#include "src/binary.h" +#include "src/binary-writer.h" +#include "src/cast.h" +#include "src/ir.h" +#include "src/stream.h" +#include "src/string-view.h" +#include "src/writer.h" namespace wabt { diff --git a/src/binary-writer-spec.h b/src/binary-writer-spec.h index e0efb768..3d39c289 100644 --- a/src/binary-writer-spec.h +++ b/src/binary-writer-spec.h @@ -17,9 +17,9 @@ #ifndef WABT_BINARY_WRITER_SPEC_H_ #define WABT_BINARY_WRITER_SPEC_H_ -#include "binary-writer.h" -#include "common.h" -#include "ir.h" +#include "src/binary-writer.h" +#include "src/common.h" +#include "src/ir.h" namespace wabt { diff --git a/src/binary-writer.cc b/src/binary-writer.cc index 6fb4235d..128f8afa 100644 --- a/src/binary-writer.cc +++ b/src/binary-writer.cc @@ -14,8 +14,7 @@ * limitations under the License. */ -#include "binary-writer.h" -#include "config.h" +#include "src/binary-writer.h" #include <cassert> #include <cmath> @@ -24,12 +23,14 @@ #include <cstdio> #include <vector> -#include "binary.h" -#include "cast.h" -#include "ir.h" -#include "stream.h" -#include "string-view.h" -#include "writer.h" +#include "config.h" + +#include "src/binary.h" +#include "src/cast.h" +#include "src/ir.h" +#include "src/stream.h" +#include "src/string-view.h" +#include "src/writer.h" #define PRINT_HEADER_NO_INDEX -1 #define MAX_U32_LEB128_BYTES 5 diff --git a/src/binary-writer.h b/src/binary-writer.h index 2ddb0178..4e90e89b 100644 --- a/src/binary-writer.h +++ b/src/binary-writer.h @@ -17,9 +17,9 @@ #ifndef WABT_BINARY_WRITER_H_ #define WABT_BINARY_WRITER_H_ -#include "common.h" -#include "opcode.h" -#include "stream.h" +#include "src/common.h" +#include "src/opcode.h" +#include "src/stream.h" namespace wabt { diff --git a/src/binary.cc b/src/binary.cc index 74e34fb0..b0cd32a2 100644 --- a/src/binary.cc +++ b/src/binary.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "binary.h" +#include "src/binary.h" namespace wabt { diff --git a/src/binary.h b/src/binary.h index d784fff1..cab44d33 100644 --- a/src/binary.h +++ b/src/binary.h @@ -17,7 +17,7 @@ #ifndef WABT_BINARY_H_ #define WABT_BINARY_H_ -#include "common.h" +#include "src/common.h" #define WABT_BINARY_MAGIC 0x6d736100 #define WABT_BINARY_VERSION 1 diff --git a/src/binding-hash.cc b/src/binding-hash.cc index 0eed179d..68bbc424 100644 --- a/src/binding-hash.cc +++ b/src/binding-hash.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "binding-hash.h" +#include "src/binding-hash.h" #include <algorithm> #include <vector> -#include "ir.h" +#include "src/ir.h" namespace wabt { diff --git a/src/binding-hash.h b/src/binding-hash.h index 04de1afd..84730668 100644 --- a/src/binding-hash.h +++ b/src/binding-hash.h @@ -22,8 +22,8 @@ #include <vector> #include <unordered_map> -#include "common.h" -#include "string-view.h" +#include "src/common.h" +#include "src/string-view.h" namespace wabt { @@ -19,7 +19,7 @@ #include <type_traits> -#include "common.h" +#include "src/common.h" // Modeled after LLVM's dynamic casts: // http://llvm.org/docs/ProgrammersManual.html#the-isa-cast-and-dyn-cast-templates diff --git a/src/color.cc b/src/color.cc index e104dd98..8fdc5d00 100644 --- a/src/color.cc +++ b/src/color.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "color.h" +#include "src/color.h" #include <cstdlib> -#include "common.h" +#include "src/common.h" #if _WIN32 #include <io.h> diff --git a/src/common.cc b/src/common.cc index 2187c715..922489be 100644 --- a/src/common.cc +++ b/src/common.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "common.h" +#include "src/common.h" #include <cassert> #include <climits> diff --git a/src/common.h b/src/common.h index fab8b67c..8de7f7d2 100644 --- a/src/common.h +++ b/src/common.h @@ -31,8 +31,9 @@ #include <vector> #include "config.h" -#include "result.h" -#include "string-view.h" + +#include "src/result.h" +#include "src/string-view.h" #define WABT_FATAL(...) fprintf(stderr, __VA_ARGS__), exit(1) #define WABT_ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) diff --git a/src/emscripten-helpers.cc b/src/emscripten-helpers.cc index d1e53f5d..8542b612 100644 --- a/src/emscripten-helpers.cc +++ b/src/emscripten-helpers.cc @@ -21,21 +21,21 @@ #include <memory> -#include "apply-names.h" -#include "binary-reader.h" -#include "binary-reader-ir.h" -#include "binary-writer.h" -#include "common.h" -#include "error-handler.h" -#include "ir.h" -#include "generate-names.h" -#include "resolve-names.h" -#include "stream.h" -#include "validator.h" -#include "wast-lexer.h" -#include "wast-parser.h" -#include "wat-writer.h" -#include "writer.h" +#include "src/apply-names.h" +#include "src/binary-reader.h" +#include "src/binary-reader-ir.h" +#include "src/binary-writer.h" +#include "src/common.h" +#include "src/error-handler.h" +#include "src/ir.h" +#include "src/generate-names.h" +#include "src/resolve-names.h" +#include "src/stream.h" +#include "src/validator.h" +#include "src/wast-lexer.h" +#include "src/wast-parser.h" +#include "src/wat-writer.h" +#include "src/writer.h" struct WabtParseWastResult { wabt::Result result; diff --git a/src/error-handler.cc b/src/error-handler.cc index 86d42b9a..693c76d1 100644 --- a/src/error-handler.cc +++ b/src/error-handler.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "error-handler.h" +#include "src/error-handler.h" #include <algorithm> diff --git a/src/error-handler.h b/src/error-handler.h index 6d99983d..84e96dc8 100644 --- a/src/error-handler.h +++ b/src/error-handler.h @@ -19,8 +19,8 @@ #include <string> -#include "color.h" -#include "common.h" +#include "src/color.h" +#include "src/common.h" namespace wabt { diff --git a/src/expr-visitor.cc b/src/expr-visitor.cc index f421f195..9d0d211d 100644 --- a/src/expr-visitor.cc +++ b/src/expr-visitor.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "expr-visitor.h" +#include "src/expr-visitor.h" -#include "cast.h" -#include "ir.h" +#include "src/cast.h" +#include "src/ir.h" namespace wabt { diff --git a/src/expr-visitor.h b/src/expr-visitor.h index 249fccc4..d7023c27 100644 --- a/src/expr-visitor.h +++ b/src/expr-visitor.h @@ -17,8 +17,8 @@ #ifndef WABT_EXPR_VISITOR_H_ #define WABT_EXPR_VISITOR_H_ -#include "common.h" -#include "ir.h" +#include "src/common.h" +#include "src/ir.h" namespace wabt { diff --git a/src/feature.cc b/src/feature.cc index c6df92c2..989511ba 100644 --- a/src/feature.cc +++ b/src/feature.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "feature.h" +#include "src/feature.h" -#include "option-parser.h" +#include "src/option-parser.h" namespace wabt { @@ -25,7 +25,7 @@ void Features::AddOptions(OptionParser* parser) { parser->AddOption("enable-" flag, help, \ [this]() { variable##_enabled_ = true; }); -#include "feature.def" +#include "src/feature.def" #undef WABT_FEATURE } diff --git a/src/feature.h b/src/feature.h index b406ae1b..d2a5891c 100644 --- a/src/feature.h +++ b/src/feature.h @@ -17,7 +17,7 @@ #ifndef WABT_FEATURE_H_ #define WABT_FEATURE_H_ -#include "common.h" +#include "src/common.h" namespace wabt { @@ -29,13 +29,13 @@ class Features { #define WABT_FEATURE(variable, flag, help) \ bool variable##_enabled() const { return variable##_enabled_; } -#include "feature.def" +#include "src/feature.def" #undef WABT_FEATURE private: #define WABT_FEATURE(variable, flag, help) \ bool variable##_enabled_ = false; -#include "feature.def" +#include "src/feature.def" #undef WABT_FEATURE }; diff --git a/src/generate-names.cc b/src/generate-names.cc index b6d13954..f225442a 100644 --- a/src/generate-names.cc +++ b/src/generate-names.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "generate-names.h" +#include "src/generate-names.h" #include <cassert> #include <cstdio> #include <string> #include <vector> -#include "expr-visitor.h" -#include "ir.h" +#include "src/expr-visitor.h" +#include "src/ir.h" namespace wabt { diff --git a/src/generate-names.h b/src/generate-names.h index 9a956284..f30ee842 100644 --- a/src/generate-names.h +++ b/src/generate-names.h @@ -17,7 +17,7 @@ #ifndef WABT_GENERATE_NAMES_H_ #define WABT_GENERATE_NAMES_H_ -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/hash-util.cc b/src/hash-util.cc index ab22bd05..efb84270 100644 --- a/src/hash-util.cc +++ b/src/hash-util.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "hash-util.h" +#include "src/hash-util.h" #include "config.h" diff --git a/src/interpreter-opcode.def b/src/interpreter-opcode.def index 78730704..b2d2b0a0 100644 --- a/src/interpreter-opcode.def +++ b/src/interpreter-opcode.def @@ -30,7 +30,7 @@ * tr t1 t2 m prefix code Name text * ============================================================ */ -#include "opcode.def" +#include "src/opcode.def" WABT_OPCODE(___, ___, ___, 0, 0, 0xc0, Alloca, "alloca") WABT_OPCODE(___, ___, ___, 0, 0, 0xc1, BrUnless, "br_unless") WABT_OPCODE(___, ___, ___, 0, 0, 0xc2, CallHost, "call_host") diff --git a/src/interpreter.cc b/src/interpreter.cc index 5c9404cc..ad49efab 100644 --- a/src/interpreter.cc +++ b/src/interpreter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "interpreter.h" +#include "src/interpreter.h" #include <algorithm> #include <cassert> @@ -24,8 +24,8 @@ #include <type_traits> #include <vector> -#include "cast.h" -#include "stream.h" +#include "src/cast.h" +#include "src/stream.h" namespace wabt { namespace interpreter { @@ -33,7 +33,7 @@ namespace interpreter { static const char* s_opcode_name[] = { #define WABT_OPCODE(rtype, type1, type2, mem_size, prefix, code, NAME, text) \ text, -#include "interpreter-opcode.def" +#include "src/interpreter-opcode.def" #undef WABT_OPCODE "<invalid>", diff --git a/src/interpreter.h b/src/interpreter.h index cca4f173..6db47fc4 100644 --- a/src/interpreter.h +++ b/src/interpreter.h @@ -23,10 +23,10 @@ #include <memory> #include <vector> -#include "binding-hash.h" -#include "common.h" -#include "opcode.h" -#include "writer.h" +#include "src/binding-hash.h" +#include "src/common.h" +#include "src/opcode.h" +#include "src/writer.h" namespace wabt { @@ -97,7 +97,7 @@ static const IstreamOffset kInvalidIstreamOffset = ~0; enum class Opcode { #define WABT_OPCODE(rtype, type1, type2, mem_size, prefix, code, Name, text) \ Name, -#include "interpreter-opcode.def" +#include "src/interpreter-opcode.def" #undef WABT_OPCODE Invalid, }; @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "ir.h" +#include "src/ir.h" #include <cassert> #include <cstddef> -#include "cast.h" +#include "src/cast.h" namespace { @@ -25,11 +25,11 @@ #include <vector> #include <type_traits> -#include "binding-hash.h" -#include "common.h" -#include "intrusive-list.h" -#include "opcode.h" -#include "string-view.h" +#include "src/binding-hash.h" +#include "src/common.h" +#include "src/intrusive-list.h" +#include "src/opcode.h" +#include "src/string-view.h" namespace wabt { diff --git a/src/lexer-source-line-finder.cc b/src/lexer-source-line-finder.cc index 245fa16d..e2669d43 100644 --- a/src/lexer-source-line-finder.cc +++ b/src/lexer-source-line-finder.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "lexer-source-line-finder.h" +#include "src/lexer-source-line-finder.h" #include <algorithm> -#include "lexer-source.h" +#include "src/lexer-source.h" namespace wabt { diff --git a/src/lexer-source-line-finder.h b/src/lexer-source-line-finder.h index 8b939eb9..b615c5c2 100644 --- a/src/lexer-source-line-finder.h +++ b/src/lexer-source-line-finder.h @@ -21,8 +21,8 @@ #include <string> #include <vector> -#include "common.h" -#include "range.h" +#include "src/common.h" +#include "src/range.h" namespace wabt { diff --git a/src/lexer-source.cc b/src/lexer-source.cc index f116fa93..8a455015 100644 --- a/src/lexer-source.cc +++ b/src/lexer-source.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "lexer-source.h" +#include "src/lexer-source.h" #include <algorithm> diff --git a/src/lexer-source.h b/src/lexer-source.h index 4f128d63..e05b8be6 100644 --- a/src/lexer-source.h +++ b/src/lexer-source.h @@ -22,8 +22,8 @@ #include <string> #include <vector> -#include "common.h" -#include "range.h" +#include "src/common.h" +#include "src/range.h" namespace wabt { diff --git a/src/literal.cc b/src/literal.cc index 8bc04a19..53671d7d 100644 --- a/src/literal.cc +++ b/src/literal.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "literal.h" +#include "src/literal.h" #include <cassert> #include <cerrno> diff --git a/src/literal.h b/src/literal.h index f100d080..53f8fbdb 100644 --- a/src/literal.h +++ b/src/literal.h @@ -19,7 +19,7 @@ #include <cstdint> -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/opcode.cc b/src/opcode.cc index aee21f01..e01e9320 100644 --- a/src/opcode.cc +++ b/src/opcode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "opcode.h" +#include "src/opcode.h" #include <algorithm> -#include "feature.h" +#include "src/feature.h" namespace wabt { @@ -27,13 +27,13 @@ Opcode::Info Opcode::infos_[] = { #define WABT_OPCODE(rtype, type1, type2, mem_size, prefix, code, Name, text) \ {text, Type::rtype, Type::type1, Type::type2, \ mem_size, prefix, code, PrefixCode(prefix, code)}, -#include "opcode.def" +#include "src/opcode.def" #undef WABT_OPCODE }; #define WABT_OPCODE(rtype, type1, type2, mem_size, prefix, code, Name, text) \ /* static */ Opcode Opcode::Name##_Opcode(Opcode::Name); -#include "opcode.def" +#include "src/opcode.def" #undef WABT_OPCODE // static diff --git a/src/opcode.h b/src/opcode.h index fb876d94..30417ec7 100644 --- a/src/opcode.h +++ b/src/opcode.h @@ -17,7 +17,7 @@ #ifndef WABT_OPCODE_H_ #define WABT_OPCODE_H_ -#include "common.h" +#include "src/common.h" namespace wabt { @@ -31,7 +31,7 @@ struct Opcode { enum Enum { #define WABT_OPCODE(rtype, type1, type2, mem_size, prefix, code, Name, text) \ Name, -#include "opcode.def" +#include "src/opcode.def" #undef WABT_OPCODE Invalid, }; @@ -39,7 +39,7 @@ struct Opcode { // Static opcode objects. #define WABT_OPCODE(rtype, type1, type2, mem_size, prefix, code, Name, text) \ static Opcode Name##_Opcode; -#include "opcode.def" +#include "src/opcode.def" #undef WABT_OPCODE Opcode() = default; // Provided so Opcode can be member of a union. diff --git a/src/option-parser.cc b/src/option-parser.cc index e3eefeb2..168a7c9e 100644 --- a/src/option-parser.cc +++ b/src/option-parser.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "option-parser.h" +#include "src/option-parser.h" #include <cstdarg> #include <cstdio> diff --git a/src/option-parser.h b/src/option-parser.h index 883e5f30..945434a9 100644 --- a/src/option-parser.h +++ b/src/option-parser.h @@ -21,7 +21,7 @@ #include <string> #include <vector> -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/prebuilt/wast-lexer-gen.cc b/src/prebuilt/wast-lexer-gen.cc index b312e09f..7760f82e 100644 --- a/src/prebuilt/wast-lexer-gen.cc +++ b/src/prebuilt/wast-lexer-gen.cc @@ -16,17 +16,17 @@ * limitations under the License. */ -#include "wast-lexer.h" +#include "src/wast-lexer.h" #include <cassert> #include <cstdio> #include "config.h" -#include "circular-array.h" -#include "error-handler.h" -#include "lexer-source.h" -#include "wast-parser.h" +#include "src/circular-array.h" +#include "src/error-handler.h" +#include "src/lexer-source.h" +#include "src/wast-parser.h" #define YYMAXFILL 29 diff --git a/src/resolve-names.cc b/src/resolve-names.cc index c2d48b5f..47f254c1 100644 --- a/src/resolve-names.cc +++ b/src/resolve-names.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "resolve-names.h" +#include "src/resolve-names.h" #include <cassert> #include <cstdio> -#include "cast.h" -#include "error-handler.h" -#include "expr-visitor.h" -#include "ir.h" -#include "wast-lexer.h" -#include "wast-parser-lexer-shared.h" +#include "src/cast.h" +#include "src/error-handler.h" +#include "src/expr-visitor.h" +#include "src/ir.h" +#include "src/wast-lexer.h" +#include "src/wast-parser-lexer-shared.h" namespace wabt { diff --git a/src/resolve-names.h b/src/resolve-names.h index b064775b..76c95518 100644 --- a/src/resolve-names.h +++ b/src/resolve-names.h @@ -17,7 +17,7 @@ #ifndef WABT_RESOLVE_NAMES_H_ #define WABT_RESOLVE_NAMES_H_ -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/stream.cc b/src/stream.cc index a94bcbb6..e976e82a 100644 --- a/src/stream.cc +++ b/src/stream.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "stream.h" +#include "src/stream.h" #include <cassert> #include <cctype> diff --git a/src/stream.h b/src/stream.h index 89ee73c9..666d830b 100644 --- a/src/stream.h +++ b/src/stream.h @@ -21,8 +21,8 @@ #include <memory> #include <vector> -#include "common.h" -#include "writer.h" +#include "src/common.h" +#include "src/writer.h" namespace wabt { diff --git a/src/string-view.cc b/src/string-view.cc index e796207b..428f2f36 100644 --- a/src/string-view.cc +++ b/src/string-view.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "string-view.h" +#include "src/string-view.h" #include <algorithm> #include <limits> diff --git a/src/string-view.h b/src/string-view.h index e6823b37..4b8f5487 100644 --- a/src/string-view.h +++ b/src/string-view.h @@ -22,7 +22,7 @@ #include <iterator> #include <string> -#include "hash-util.h" +#include "src/hash-util.h" namespace wabt { diff --git a/src/test-intrusive-list.cc b/src/test-intrusive-list.cc index 734fb6e8..b8fe6d55 100644 --- a/src/test-intrusive-list.cc +++ b/src/test-intrusive-list.cc @@ -18,7 +18,7 @@ #include <memory> -#include "intrusive-list.h" +#include "src/intrusive-list.h" using namespace wabt; diff --git a/src/test-string-view.cc b/src/test-string-view.cc index bba972f6..4a4499dd 100644 --- a/src/test-string-view.cc +++ b/src/test-string-view.cc @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -#include "string-view.h" +#include "src/string-view.h" #include <cstring> #include <functional> diff --git a/src/test-utf8.cc b/src/test-utf8.cc index 61bbfabf..f08be4ff 100644 --- a/src/test-utf8.cc +++ b/src/test-utf8.cc @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -#include "utf8.h" +#include "src/utf8.h" using namespace wabt; diff --git a/src/tools/wasm-interp.cc b/src/tools/wasm-interp.cc index 326d0f0b..3feeb6c8 100644 --- a/src/tools/wasm-interp.cc +++ b/src/tools/wasm-interp.cc @@ -23,17 +23,17 @@ #include <string> #include <vector> -#include "binary-reader-interpreter.h" -#include "binary-reader.h" -#include "cast.h" -#include "error-handler.h" -#include "feature.h" -#include "interpreter.h" -#include "literal.h" -#include "option-parser.h" -#include "stream.h" -#include "wast-lexer.h" -#include "wast-parser.h" +#include "src/binary-reader-interpreter.h" +#include "src/binary-reader.h" +#include "src/cast.h" +#include "src/error-handler.h" +#include "src/feature.h" +#include "src/interpreter.h" +#include "src/literal.h" +#include "src/option-parser.h" +#include "src/stream.h" +#include "src/wast-lexer.h" +#include "src/wast-parser.h" using namespace wabt; using namespace wabt::interpreter; diff --git a/src/tools/wasm-link.cc b/src/tools/wasm-link.cc index ddba640b..f00b9603 100644 --- a/src/tools/wasm-link.cc +++ b/src/tools/wasm-link.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "wasm-link.h" +#include "src/wasm-link.h" #include <memory> #include <vector> -#include "binary-reader.h" -#include "binding-hash.h" -#include "binary-writer.h" -#include "option-parser.h" -#include "stream.h" -#include "writer.h" -#include "binary-reader-linker.h" +#include "src/binary-reader.h" +#include "src/binding-hash.h" +#include "src/binary-writer.h" +#include "src/option-parser.h" +#include "src/stream.h" +#include "src/writer.h" +#include "src/binary-reader-linker.h" #define FIRST_KNOWN_SECTION static_cast<size_t>(BinarySection::Type) #define LOG_DEBUG(fmt, ...) if (s_debug) s_log_stream->Writef(fmt, __VA_ARGS__); diff --git a/src/tools/wasm-objdump.cc b/src/tools/wasm-objdump.cc index 47752dd5..578f5c31 100644 --- a/src/tools/wasm-objdump.cc +++ b/src/tools/wasm-objdump.cc @@ -18,13 +18,13 @@ #include <cstdlib> #include <cstring> -#include "common.h" -#include "feature.h" -#include "option-parser.h" -#include "stream.h" -#include "writer.h" -#include "binary-reader.h" -#include "binary-reader-objdump.h" +#include "src/common.h" +#include "src/feature.h" +#include "src/option-parser.h" +#include "src/stream.h" +#include "src/writer.h" +#include "src/binary-reader.h" +#include "src/binary-reader-objdump.h" using namespace wabt; diff --git a/src/tools/wasm-opcodecnt.cc b/src/tools/wasm-opcodecnt.cc index 6677fb57..fcd9d2fa 100644 --- a/src/tools/wasm-opcodecnt.cc +++ b/src/tools/wasm-opcodecnt.cc @@ -23,10 +23,10 @@ #include <map> #include <vector> -#include "binary-reader.h" -#include "binary-reader-opcnt.h" -#include "option-parser.h" -#include "stream.h" +#include "src/binary-reader.h" +#include "src/binary-reader-opcnt.h" +#include "src/option-parser.h" +#include "src/stream.h" #define ERROR(fmt, ...) \ fprintf(stderr, "%s:%d: " fmt, __FILE__, __LINE__, __VA_ARGS__) diff --git a/src/tools/wasm2wast.cc b/src/tools/wasm2wast.cc index ab8c4f9c..213324ff 100644 --- a/src/tools/wasm2wast.cc +++ b/src/tools/wasm2wast.cc @@ -19,19 +19,19 @@ #include <cstdio> #include <cstdlib> -#include "apply-names.h" -#include "binary-reader.h" -#include "binary-reader-ir.h" -#include "error-handler.h" -#include "feature.h" -#include "generate-names.h" -#include "ir.h" -#include "option-parser.h" -#include "stream.h" -#include "validator.h" -#include "wast-lexer.h" -#include "wat-writer.h" -#include "writer.h" +#include "src/apply-names.h" +#include "src/binary-reader.h" +#include "src/binary-reader-ir.h" +#include "src/error-handler.h" +#include "src/feature.h" +#include "src/generate-names.h" +#include "src/ir.h" +#include "src/option-parser.h" +#include "src/stream.h" +#include "src/validator.h" +#include "src/wast-lexer.h" +#include "src/wat-writer.h" +#include "src/writer.h" using namespace wabt; diff --git a/src/tools/wast-desugar.cc b/src/tools/wast-desugar.cc index 43246d19..f1f7b730 100644 --- a/src/tools/wast-desugar.cc +++ b/src/tools/wast-desugar.cc @@ -20,18 +20,19 @@ #include <cstdio> #include <cstdlib> -#include "apply-names.h" -#include "common.h" #include "config.h" -#include "error-handler.h" -#include "feature.h" -#include "generate-names.h" -#include "ir.h" -#include "option-parser.h" -#include "stream.h" -#include "wast-parser.h" -#include "wat-writer.h" -#include "writer.h" + +#include "src/apply-names.h" +#include "src/common.h" +#include "src/error-handler.h" +#include "src/feature.h" +#include "src/generate-names.h" +#include "src/ir.h" +#include "src/option-parser.h" +#include "src/stream.h" +#include "src/wast-parser.h" +#include "src/wat-writer.h" +#include "src/writer.h" using namespace wabt; diff --git a/src/tools/wast2wasm.cc b/src/tools/wast2wasm.cc index 1926ad83..c58ae5b9 100644 --- a/src/tools/wast2wasm.cc +++ b/src/tools/wast2wasm.cc @@ -23,18 +23,18 @@ #include "config.h" -#include "binary-writer.h" -#include "binary-writer-spec.h" -#include "common.h" -#include "error-handler.h" -#include "feature.h" -#include "ir.h" -#include "option-parser.h" -#include "resolve-names.h" -#include "stream.h" -#include "validator.h" -#include "wast-parser.h" -#include "writer.h" +#include "src/binary-writer.h" +#include "src/binary-writer-spec.h" +#include "src/common.h" +#include "src/error-handler.h" +#include "src/feature.h" +#include "src/ir.h" +#include "src/option-parser.h" +#include "src/resolve-names.h" +#include "src/stream.h" +#include "src/validator.h" +#include "src/wast-parser.h" +#include "src/writer.h" using namespace wabt; diff --git a/src/tracing.cc b/src/tracing.cc index f4669894..c7e88c60 100644 --- a/src/tracing.cc +++ b/src/tracing.cc @@ -15,7 +15,7 @@ */ #define WABT_TRACING 1 -#include "tracing.h" +#include "src/tracing.h" namespace { diff --git a/src/tracing.h b/src/tracing.h index dce1b89a..dbba716c 100644 --- a/src/tracing.h +++ b/src/tracing.h @@ -29,7 +29,7 @@ #define WABT_TRACING 0 #endif -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/type-checker.cc b/src/type-checker.cc index 89d1fbf2..b213a4c3 100644 --- a/src/type-checker.cc +++ b/src/type-checker.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "type-checker.h" +#include "src/type-checker.h" namespace wabt { diff --git a/src/type-checker.h b/src/type-checker.h index 849c701d..d7216cd8 100644 --- a/src/type-checker.h +++ b/src/type-checker.h @@ -20,8 +20,8 @@ #include <functional> #include <vector> -#include "common.h" -#include "opcode.h" +#include "src/common.h" +#include "src/opcode.h" namespace wabt { diff --git a/src/utf8.cc b/src/utf8.cc index 3855fb71..cabd8d27 100644 --- a/src/utf8.cc +++ b/src/utf8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "utf8.h" +#include "src/utf8.h" #include <cstdint> diff --git a/src/validator.cc b/src/validator.cc index 602d8395..b01e6373 100644 --- a/src/validator.cc +++ b/src/validator.cc @@ -14,20 +14,21 @@ * limitations under the License. */ -#include "validator.h" -#include "config.h" +#include "src/validator.h" #include <cassert> #include <cinttypes> #include <cstdarg> #include <cstdio> -#include "binary-reader.h" -#include "cast.h" -#include "error-handler.h" -#include "ir.h" -#include "type-checker.h" -#include "wast-parser-lexer-shared.h" +#include "config.h" + +#include "src/binary-reader.h" +#include "src/cast.h" +#include "src/error-handler.h" +#include "src/ir.h" +#include "src/type-checker.h" +#include "src/wast-parser-lexer-shared.h" namespace wabt { diff --git a/src/validator.h b/src/validator.h index bcb5b10f..4ec063c4 100644 --- a/src/validator.h +++ b/src/validator.h @@ -17,7 +17,7 @@ #ifndef WABT_VALIDATOR_H_ #define WABT_VALIDATOR_H_ -#include "wast-lexer.h" +#include "src/wast-lexer.h" namespace wabt { diff --git a/src/wasm-link.h b/src/wasm-link.h index beec2031..f3467cee 100644 --- a/src/wasm-link.h +++ b/src/wasm-link.h @@ -20,8 +20,8 @@ #include <memory> #include <vector> -#include "binary.h" -#include "common.h" +#include "src/binary.h" +#include "src/common.h" namespace wabt { namespace link { diff --git a/src/wast-lexer.cc b/src/wast-lexer.cc index 05cdd60e..57919329 100644 --- a/src/wast-lexer.cc +++ b/src/wast-lexer.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "wast-lexer.h" +#include "src/wast-lexer.h" #include <cassert> #include <cstdio> #include "config.h" -#include "circular-array.h" -#include "error-handler.h" -#include "lexer-source.h" -#include "wast-parser.h" +#include "src/circular-array.h" +#include "src/error-handler.h" +#include "src/lexer-source.h" +#include "src/wast-parser.h" /*!max:re2c */ diff --git a/src/wast-lexer.h b/src/wast-lexer.h index 20ef2bb6..cc370322 100644 --- a/src/wast-lexer.h +++ b/src/wast-lexer.h @@ -21,10 +21,10 @@ #include <cstdio> #include <memory> -#include "common.h" -#include "lexer-source-line-finder.h" -#include "literal.h" -#include "opcode.h" +#include "src/common.h" +#include "src/lexer-source-line-finder.h" +#include "src/literal.h" +#include "src/opcode.h" namespace wabt { diff --git a/src/wast-parser-lexer-shared.cc b/src/wast-parser-lexer-shared.cc index 80a9b8bd..e7931530 100644 --- a/src/wast-parser-lexer-shared.cc +++ b/src/wast-parser-lexer-shared.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "wast-parser-lexer-shared.h" +#include "src/wast-parser-lexer-shared.h" -#include "common.h" -#include "error-handler.h" -#include "wast-lexer.h" +#include "src/common.h" +#include "src/error-handler.h" +#include "src/wast-lexer.h" namespace wabt { diff --git a/src/wast-parser.cc b/src/wast-parser.cc index 4eb605ec..030b17e6 100644 --- a/src/wast-parser.cc +++ b/src/wast-parser.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "wast-parser.h" +#include "src/wast-parser.h" -#include "binary-reader.h" -#include "binary-reader-ir.h" -#include "cast.h" -#include "error-handler.h" -#include "wast-parser-lexer-shared.h" +#include "src/binary-reader.h" +#include "src/binary-reader-ir.h" +#include "src/cast.h" +#include "src/error-handler.h" +#include "src/wast-parser-lexer-shared.h" #define WABT_TRACING 0 -#include "tracing.h" +#include "src/tracing.h" #define EXPECT(token_type) CHECK_RESULT(Expect(TokenType::token_type)) diff --git a/src/wast-parser.h b/src/wast-parser.h index dc9fe11e..ed01cf26 100644 --- a/src/wast-parser.h +++ b/src/wast-parser.h @@ -19,11 +19,11 @@ #include <array> -#include "circular-array.h" -#include "feature.h" -#include "ir.h" -#include "intrusive-list.h" -#include "wast-lexer.h" +#include "src/circular-array.h" +#include "src/feature.h" +#include "src/ir.h" +#include "src/intrusive-list.h" +#include "src/wast-lexer.h" namespace wabt { diff --git a/src/wat-writer.cc b/src/wat-writer.cc index 496899ce..d93c2069 100644 --- a/src/wat-writer.cc +++ b/src/wat-writer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "wat-writer.h" +#include "src/wat-writer.h" #include <algorithm> #include <cassert> @@ -26,15 +26,15 @@ #include <string> #include <vector> -#include "cast.h" -#include "common.h" -#include "ir.h" -#include "literal.h" -#include "stream.h" -#include "writer.h" +#include "src/cast.h" +#include "src/common.h" +#include "src/ir.h" +#include "src/literal.h" +#include "src/stream.h" +#include "src/writer.h" #define WABT_TRACING 0 -#include "tracing.h" +#include "src/tracing.h" #define INDENT_SIZE 2 #define NO_FORCE_NEWLINE 0 diff --git a/src/wat-writer.h b/src/wat-writer.h index 56b65029..a8ec8a5c 100644 --- a/src/wat-writer.h +++ b/src/wat-writer.h @@ -17,7 +17,7 @@ #ifndef WABT_WAT_WRITER_H_ #define WABT_WAT_WRITER_H_ -#include "common.h" +#include "src/common.h" namespace wabt { diff --git a/src/writer.cc b/src/writer.cc index 5df7e854..8347f0a5 100644 --- a/src/writer.cc +++ b/src/writer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "writer.h" +#include "src/writer.h" #include <cassert> #include <cerrno> diff --git a/src/writer.h b/src/writer.h index 84fb7867..2d199ee4 100644 --- a/src/writer.h +++ b/src/writer.h @@ -19,7 +19,7 @@ #include <stdio.h> -#include "common.h" +#include "src/common.h" #include <memory> #include <vector> |