X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.vala;h=b8bf9a79b4df058cbb2c84334b49cedd02836ba0;hb=f8117e1b218663ed72316151a1ae4ad406c0f058;hp=68ea1873c0516e910c52c506546effb4abab2179;hpb=136cfce71c2a965cbd45e4ce3da3b4ab5bd0c180;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.vala b/JSDOC/ScopeParser.vala
index 68ea187..b8bf9a7 100644
--- a/JSDOC/ScopeParser.vala
+++ b/JSDOC/ScopeParser.vala
@@ -647,7 +647,7 @@ namespace JSDOC {
 	                                }
 	                                // key value..
 	                                
-	                                this.ts = new TokenStream(token.props[prop].val);
+	                                this.ts = new TokenStream(val.vals);
 	                                this.parseExpression(scope);
 	                                
 	                            }
@@ -659,11 +659,12 @@ namespace JSDOC {
 	                        }
 	                        
 	                        
-	                        var _this = this;
-	                        token.items.forEach(function(expr) {
-	                              _this.ts = new TokenStream(expr);
-	                              _this.parseExpression(scope)
-	                        });
+ 
+	                        foreach(var expr in token.items) {
+ 
+	                              this.ts = new TokenStream(expr);
+	                              this.parseExpression(scope);
+	                        }
 	                        this.ts = curTS;
 	                    
 	                    
@@ -675,9 +676,9 @@ namespace JSDOC {
 	                    
 	                     
 	                        
-	                    case ')': //Token.RP:
-	                    case ']': //Token.RB:
-	                    case '}': //Token.RB:
+	                    case ")": //Token.RP:
+	                    case "]": //Token.RB:
+	                    case "}": //Token.RB:
 	                        //print("<< EXIT EXPRESSION");
 	                        return;
 	                       
@@ -691,7 +692,7 @@ namespace JSDOC {
 	                }
 	                break;
 	                
-	            case 'STRN': // used for object lit detection..
+	            case "STRN": // used for object lit detection..
 	                //if (this.mode == 'BUILDING_SYMBOL_TREE')    
 	                    //print("EXPR-STR:" + JSON.stringify(token, null, 4));
 	           
@@ -700,8 +701,8 @@ namespace JSDOC {
 	            
 	                  
 	         
-	            case 'NAME':
-	                if (this.mode == 'BUILDING_SYMBOL_TREE') {
+	            case "NAME":
+	                if (this.mode == ScopeParserMode.BUILDING_SYMBOL_TREE) {
 	                    
 	                    //print("EXPR-NAME:" + JSON.stringify(token, null, 4));
 	                } else {
@@ -718,11 +719,11 @@ namespace JSDOC {
 	                    //skip '.'
 	                    break;
 	                }
-	                if (symbol == 'this') {
+	                if (symbol == "this") {
 	                    break;
 	                   }
 	                
-	                if (this.mode == 'PASS2_SYMBOL_TREE') {
+	                if (this.mode == ScopeParserMode.PASS2_SYMBOL_TREE) {
 
 	                    identifier = this.getIdentifier(symbol, scope, token);
 	                    //println("<B>??</B>");