Add support for union types to callbacks

This addresses https://github.com/darobin/respec/issues/182
w3c · Apr 5, 2013 · f65d78e · f65d78e
1 parent 230fe9b
commit f65d78e
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/js/core/webidl-oldschool.js b/js/core/webidl-oldschool.js
@@ -189,8 +189,8 @@ define(
                     return isOptional;
                 }
             }
-            
-            
+
+
         ,   definition:    function ($idl) {
                 var def = { children: [] }
                 ,   str = $idl.attr("title")
@@ -342,7 +342,7 @@ define(
                 ,   str = norm($dt.text());
                 obj.description = $dd.contents();
                 str = this.parseExtendedAttributes(str, obj);
-                
+
                 // CONST
                 if (this.parseConst(obj, str)) return obj;
 
@@ -388,7 +388,7 @@ define(
                 str = this.parseExtendedAttributes(str, obj);
 
                 // MEMBER
-                var match = /^\s*\b(.*?)\s+([A-Za-z][A-Za-z0-9]*)\s*$/.exec(str);
+                var match = /^\s*(.*?)\s+([A-Za-z][A-Za-z0-9]*)\s*$/.exec(str);
                 if (match) {
                     obj.type = "member";
                     var type = match[1];
@@ -625,7 +625,7 @@ define(
                 }
                 return obj;
             },
-            
+
             parseDatatype:  function (obj, type) {
                 type = this.nullable(obj, type);
                 type = this.array(obj, type);
@@ -643,7 +643,7 @@ define(
                     obj.datatype = type;
                 }
             },
-            
+
             parseStatic:  function (obj, type) {
                 if (/^static\s+/.test(type)) {
                     type = type.replace(/^static\s+/, "");
@@ -654,7 +654,7 @@ define(
                 }
                 return type;
             },
-            
+
             parseExtendedAttributes:    function (str, obj) {
                 if (!str) return;
                 return str.replace(/^\s*\[([^\]]+)\]\s*/, function (x, m1) { obj.extendedAttributes = m1; return ""; });
@@ -848,7 +848,7 @@ define(
                             sn.text(">", span);
                         }
                         else {
-                            sn.element("a", {}, span, it.datatype);
+                            sn.element("a", {}, span, it.isUnionType ? "(" + it.datatype.join(" or ") + ")" : it.datatype);
                         }
                         if (it.nullable) sn.text(", nullable", dt);
                         if (it.defaultValue) {
@@ -1122,17 +1122,17 @@ define(
                     }
                     else return $(idlModuleTmpl(opt));
                 }
-                
+
                 else if (obj.type === "typedef") {
                     opt.nullable = obj.nullable ? "?" : "";
                     opt.arr = arrsq(obj);
                     return $(idlTypedefTmpl(opt));
                 }
-                
+
                 else if (obj.type === "implements") {
                     return $(idlImplementsTmpl(opt));
                 }
-                
+
                 else if (obj.type === "interface") {
                     // stop gap fix for duplicate IDs while we're transitioning the code
                     var div = this.doc.createElement("div")
@@ -1174,7 +1174,7 @@ define(
                     ,   children:   children
                     });
                 }
-                
+
                 else if (obj.type === "exception") {
                     var maxAttr = 0, maxConst = 0;
                     obj.children.forEach(function (it) {
@@ -1195,7 +1195,7 @@ define(
                     ;
                     return idlExceptionTmpl({ obj: obj, indent: indent, children: children });
                 }
-                
+
                 else if (obj.type === "dictionary") {
                     var max = 0;
                     obj.children.forEach(function (it) {
@@ -1214,7 +1214,7 @@ define(
                     ;
                     return idlDictionaryTmpl({ obj: obj, indent: indent, children: children, partial: obj.partial ? "partial " : "" });
                 }
-                
+
                 else if (obj.type === "callback") {
                     var params = obj.children
                                     .map(function (it) {
@@ -1235,7 +1235,7 @@ define(
                     ,   children:   params
                     });
                 }
-                
+
                 else if (obj.type === "enum") {
                     var children = obj.children
                                       .map(function (it) { return idlEnumItemTmpl({ obj: it, parentID: obj.refId, indent: indent + 1 }); })