diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-02-12 11:59:59 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-12 11:59:59 -0800 |
| commit | 277ac5239057721ebe3c6e7813dc478eeab2cea0 (patch) | |
| tree | 1491262d2f68487ece010c2d04dbcb47e6e2f4a0 | |
| parent | f8cb7deeffa7c2bc79f938821759634e8dce0168 (diff) | |
| parent | 881246b9028e68ee8caf0b738d360ed398812a57 (diff) | |
Merge branch 'regexp-syntax-fix' of github.com:svaarala/emscripten into incoming
Conflicts:
AUTHORS
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/parseTools.js | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -122,4 +122,5 @@ a license to everyone to use it as detailed in LICENSE.) * James S Urquhart <jamesu@gmail.com> * Boris Gjenero <boris.gjenero@gmail.com> * jonas echterhoff <jonas@unity3d.com> +* Sami Vaarala <sami.vaarala@iki.fi> diff --git a/src/parseTools.js b/src/parseTools.js index bad080b7..fe56580e 100644 --- a/src/parseTools.js +++ b/src/parseTools.js @@ -162,7 +162,7 @@ function isArrayType(type) { function isStructType(type) { if (isPointerType(type)) return false; if (isArrayType(type)) return true; - if (/<?{ ?[^}]* ?}>?/.test(type)) return true; // { i32, i8 } etc. - anonymous struct types + if (/<?\{ ?[^}]* ?\}>?/.test(type)) return true; // { i32, i8 } etc. - anonymous struct types // See comment in isStructPointerType() return type[0] == '%'; } @@ -172,7 +172,7 @@ function isVectorType(type) { } function isStructuralType(type) { - return /^{ ?[^}]* ?}$/.test(type); // { i32, i8 } etc. - anonymous struct types + return /^\{ ?[^}]* ?\}$/.test(type); // { i32, i8 } etc. - anonymous struct types } function getStructuralTypeParts(type) { // split { i32, i8 } etc. into parts |