Fixed greedy expressions in parameter parser. Fixes apm#4

Squarespace · Oct 7, 2011 · 5344f86 · 5344f86
1 parent 399ecfa
commit 5344f86
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/docparser.js b/lib/docparser.js
@@ -37,7 +37,7 @@ YUI.add('docparser', function(Y) {
     */
     stringlog = function(data) {
         var line, file;
-        
+
         if (data.file && data.line) {
             file = data.file;
             line = data.line;
@@ -80,9 +80,9 @@ YUI.add('docparser', function(Y) {
     CURRENT_FILE = 'currentfile',
     CURRENT_CLASS = 'currentclass',
 
-    REGEX_TYPE = /(.*)\{(.*)\}(.*)/,
+    REGEX_TYPE = /(.*?)\{(.*?)\}(.*)/,
     REGEX_FIRSTWORD = /^\s*?([^\s]+)(.*)/,
-    REGEX_OPTIONAL = /\[(.*)\]/,
+    REGEX_OPTIONAL = /\[(.*?)\]/,
     REGEX_START_COMMENT = /^\s*\/\*\*/,
     REGEX_END_COMMENT = /\*\/\s*$/,
     REGEX_LINES = /\r\n|\n/,
@@ -769,7 +769,7 @@ Y.log('param name/type/descript missing: ' + stringlog(block), 'warn', 'docparse
                 this.set(MAIN_MODULE, '');
                 var clazz = this.classes[this.get(CURRENT_CLASS)];
                 if (clazz) {
-                    //Handles case where @module comes after @class in a new directory of files 
+                    //Handles case where @module comes after @class in a new directory of files
                     if (clazz.module !== val) {
                         if (this.modules[clazz.module]) {
                             delete this.modules[clazz.module].submodules[clazz.submodule];