diff options
| -rwxr-xr-x | check.py | 3 | ||||
| -rw-r--r-- | src/wasm-s-parser.h | 40 |
2 files changed, 32 insertions, 11 deletions
@@ -83,7 +83,8 @@ if len(requested) == 0: #spec_tests = [] # XXX [os.path.join('spec', t) for t in sorted(os.listdir(os.path.join('test', 'spec')))] # 'address' : filed issue, test looks invalid # 'labels', 'switch': todo once switch is stable - spec_tests = [os.path.join('spec', t + '.wast') for t in ['conversions', 'endianness', 'exports', 'f32_cmp', 'f32', 'f64_cmp', 'f64', 'fac', 'float_exprs', 'forward', 'func_ptrs', 'functions', 'has_feature', 'i32', 'i64', 'imports', 'int_exprs', 'int_literals', 'labels', 'left-to-right', 'memory_redundancy', 'memory_trap', 'names', 'resizing', 'runaway-recursion', 'select', 'store_retval', 'traps']] + # 'memory' XXX TODO + spec_tests = [os.path.join('spec', t + '.wast') for t in ['conversions', 'endianness', 'exports', 'f32_cmp', 'f32', 'f64_cmp', 'f64', 'fac', 'float_exprs', 'forward', 'func_ptrs', 'functions', 'has_feature', 'i32', 'i64', 'imports', 'int_exprs', 'int_literals', 'left-to-right', 'memory_redundancy', 'memory_trap', 'names', 'resizing', 'runaway-recursion', 'select', 'store_retval', 'traps']] else: spec_tests = requested[:] diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index f3df437da..e92f56eea 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -14,6 +14,7 @@ namespace wasm { int debug; using namespace cashew; + // Globals IString MODULE("module"), @@ -36,6 +37,13 @@ IString MODULE("module"), NEG_NAN("-nan"), FAKE_RETURN("fake_return_waka123"); +int unhex(char c) { + if (c >= '0' && c <= '9') return c - '0'; + if (c >= 'a' && c <= 'f') return c - 'a' + 10; + if (c >= 'A' && c <= 'F') return c - 'A' + 10; + abort(); +} + // // An element in an S-Expression: a list or a string // @@ -181,23 +189,35 @@ private: dollared = true; } char *start = input; - bool quoted = false; if (input[0] == '"') { - quoted = true; + // parse escaping \", and \a7 into 0xa7 the character code + input++; + std::string str; while (1) { - start++; - input = strchr(start, '"'); - assert(input); - if (input[-1] != '\\') break; + if (input[0] == '"') break; + if (input[0] == '\\') { + if (input[1] == '"') { + str += '"'; + input += 2; + continue; + } else if (input[1] == '\\') { + str += '\\'; + input += 2; + } else { + str += (char)(unhex(input[1])*16 + unhex(input[2])); + input += 3; + continue; + } + } + str += input[0]; + input++; } - assert(input); input++; - } else { - while (input[0] && !isspace(input[0]) && input[0] != ')') input++; + return allocator.alloc<Element>()->setString(IString(str.c_str(), false), dollared); } + while (input[0] && !isspace(input[0]) && input[0] != ')') input++; char temp = input[0]; input[0] = 0; - if (quoted) input[-1] = 0; auto ret = allocator.alloc<Element>()->setString(IString(start, false), dollared); // TODO: reuse the string here, carefully input[0] = temp; return ret; |