summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2016-04-06 15:28:30 -0700
committerDerek Schuff <dschuff@chromium.org>2016-04-06 15:28:30 -0700
commit265225f703a6d94dd20d42c322233b52d73f22f8 (patch)
tree179c88b0dcbfa928084caea5a69c15c320190651
parentc4c82597aaf43d7fee3cd8877801d9dd91e33f7b (diff)
downloadbinaryen-265225f703a6d94dd20d42c322233b52d73f22f8.tar.gz
binaryen-265225f703a6d94dd20d42c322233b52d73f22f8.tar.bz2
binaryen-265225f703a6d94dd20d42c322233b52d73f22f8.zip
Fix output of initializer list metadata
* Fix output of initializer list metadata Turns out trailing commas aren't valid JSON
-rw-r--r--src/s2wasm.h7
-rw-r--r--test/dot_s/initializers.wast2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/s2wasm.h b/src/s2wasm.h
index c2e8c77a0..701d86f18 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -1443,7 +1443,12 @@ public:
o << "\"staticBump\": " << (nextStatic - globalBase) << ", ";
o << "\"initializers\": [";
- for (const auto& func : initializerFunctions) o << "\"" << func.c_str() << "\", ";
+ first = true;
+ for (const auto& func : initializerFunctions) {
+ if (first) first = false;
+ else o << ", ";
+ o << "\"" << func.c_str() << "\"";
+ }
o << "]";
o << " }";
diff --git a/test/dot_s/initializers.wast b/test/dot_s/initializers.wast
index 5360753a1..4d64f9ffc 100644
--- a/test/dot_s/initializers.wast
+++ b/test/dot_s/initializers.wast
@@ -12,4 +12,4 @@
(return)
)
)
-;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": ["main", "f2", ] }
+;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": ["main", "f2"] }