diff options
author | Alon Zakai <alonzakai@gmail.com> | 2011-11-16 12:49:20 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2011-11-16 12:49:20 -0800 |
commit | 6d245d091d7c6778dc48588c74b8eb4b782dac6e (patch) | |
tree | c56bbf799b31e01bf939a62a443688df11578851 | |
parent | f240c68de7fc6399af7b7ea08a42d9ee7c8d2748 (diff) | |
parent | ad62644c541a46b27c9542935655fc86a7d6d645 (diff) |
Merge branch 'master' of github.com:kripken/emscripten
-rw-r--r-- | src/modules.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules.js b/src/modules.js index 7c61aea0..00f5266e 100644 --- a/src/modules.js +++ b/src/modules.js @@ -34,7 +34,7 @@ var Debugging = { var form2 = new RegExp(/^ .*, !dbg !(\d+) *; .*$/); var form3 = new RegExp(/^!(\d+) = metadata !{i32 (\d+), (?:i32 \d+|null), metadata !(\d+), .*}$/); var form3a = new RegExp(/^!(\d+) = metadata !{i32 \d+, (?:i32 \d+|metadata !\d+), (?:i32 \d+|null), (?:i32 \d+|null), metadata !(\d+), (?:i32 \d+|null)}.*/); - var form3ab = new RegExp(/^!(\d+) = metadata !{i32 \d+, (?:i32 \d+|null), metadata !(\d+), .*$/); + var form3ab = new RegExp(/^!(\d+) = metadata !{i32 \d+, (?:metadata !\d+|i32 \d+|null), metadata !(\d+).*$/); var form3ac = new RegExp(/^!(\d+) = metadata !{i32 \d+, (?:metadata !\d+|null), metadata !"[^"]+", metadata !(\d+)[^\[]*.*$/); var form3ad = new RegExp(/^!(\d+) = metadata !{i32 \d+, (?:i32 \d+|null), (?:i32 \d+|null), metadata !"[^"]*", metadata !"[^"]*", metadata !"[^"]*", metadata !(\d+),.*$/); var form3b = new RegExp(/^!(\d+) = metadata !{i32 \d+, metadata !"([^"]+)", metadata !"([^"]+)", (metadata !\d+|null)}.*$/); |