JSDOC/TokenReader.js

[gnome.introspection-doc-generator] / JSDOC / DocTag.js

diff --git a/JSDOC/DocTag.js b/JSDOC/DocTag.js
index e0bc0da..b7f25ca 100644 (file)
--- a/JSDOC/DocTag.js
+++ b/JSDOC/DocTag.js
@@ -48,6 +48,11 @@ DocTag = XObject.define(
             var ret = { '*object' : 'DocTag' };
             
             for (var i in this) {
+                if (i == 'optvalues') { 
+                    ret[i] = this.optvalues;
+                    continue;
+                }
+                
                 switch (typeof(this[i])) {
                     case 'function':
                        continue;
@@ -57,9 +62,13 @@ DocTag = XObject.define(
                     case 'number':
                     case 'boolean':                    
                         ret[i] = this[i]; continue;
+                        
+                        
+                        
                     default:
                         
-                        print("unknown type:" + typeof(this[i]));
+                        print("unknown type: (" + i + ")"  + typeof(this[i]));
+                        this.toJSON = null;
                         print(JSON.stringify(this));;
                         Seed.quit();
                    }
@@ -101,7 +110,7 @@ DocTag = XObject.define(
                 var m = src.match(/^\(([^)]+)\)/);
                 print(m);
                 if (m[1].match(/\|/)) {
-                    var opts = m[1].split(/\|/);
+                    var opts = m[1].trim().split(/\s*\|\s*/);
                     this.optvalues = opts;
                     src = src.substring(m[0].length).trim();
                     print(src);