handle anonymous packed struct types

2 files changed, 5 insertions, 3 deletions

diff --git a/src/analyzer.js b/src/analyzer.js
index 6bee2da5..bcab0fad 100644
--- a/src/analyzer.js
+++ b/src/analyzer.js
@@ -129,12 +129,14 @@ function analyzer(data) {
     }
 
     // anonymous structure definition, for example |{ i32, i8*, void ()*, i32 }|
-    if (type[0] == '{') {
+    if (type[0] == '{' || type[0] == '<') {
+      var packed = type[0] == '<';
       Types.types[type] = {
         name_: type,
-        fields: splitTokenList(tokenize(type.substr(2, type.length-4)).tokens).map(function(segment) {
+        fields: splitTokenList(tokenize(type.substr(2 + packed, type.length - 4 - 2*packed)).tokens).map(function(segment) {
           return segment[0].text;
         }),
+        packed: packed,
         lineNum: '?'
       };
       return;
diff --git a/src/parseTools.js b/src/parseTools.js
index 3d747aec..311f1f22 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -115,7 +115,7 @@ function isStructPointerType(type) {
 function isStructType(type) {
   if (isPointerType(type)) return false;
   if (new RegExp(/^\[\d+\ x\ (.*)\]/g).test(type)) return true; // [15 x ?] blocks. Like structs
-  if (new RegExp(/{ [^}]* }/g).test(type)) return true; // { i32, i8 } etc. - anonymous struct types
+  if (new RegExp(/<?{ [^}]* }>?/g).test(type)) return true; // { i32, i8 } etc. - anonymous struct types
   // See comment in isStructPointerType()
   return !Runtime.isNumberType(type) && type[0] == '%';
 }