X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScope.js;h=5fe7403f1007939bf227d9de5dde693eaebe83ec;hp=342f01841f480e44b2c396d4b2a0dde482ae6b8c;hb=bb1da2c04b0e59e75cff3317798af860f3439a11;hpb=96bf2cea538bad4477c8d58a925bb85ac3efb608

diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index 342f018..5fe7403 100644
--- a/JSDOC/Scope.js
+++ b/JSDOC/Scope.js
@@ -10,7 +10,7 @@ Identifier = imports.Identifier.Identifier
 XObject = imports.XObject.XObject; 
 
 
-function Scope(braceN, parent, startTokN, lastIdent)
+function Scope(braceN, parent, startTokN, lastIdent, token)
 {
     if (lastIdent.length) {
        //  println("NEW SCOPE: " + lastIdent);
@@ -23,9 +23,10 @@ function Scope(braceN, parent, startTokN, lastIdent)
     this.subScopes = [];
     this.hints = { };
     this.ident = lastIdent;
+    this.gid = Scope.gid++;
     
-    
-    //println("ADD SCOPE(" + this.id + ") TO "+ (parent ? this.parent.id : 'TOP') + "<BR/>");
+    print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP') + ' : ' + 
+        (token ? token.toString() : ''));
     
     if (parent) {
         this.parent.subScopes.push(this);
@@ -54,7 +55,7 @@ Scope.prototype = {
     protectedVars : {}, // only used by to parent..
     declareIdentifier : function(symbol, token) {
         
-        print("ADD IDENT(" + this.id + "):" + symbol+"");
+        print("SCOPE : " + this.gid +  " : " + token.toString()+"");
         
         if (typeof(this.identifiers[symbol])== 'undefined') {
             
@@ -72,8 +73,17 @@ Scope.prototype = {
         this.addToParentScope(symbol);
         return this.identifiers[symbol];
     },
-    getIdentifier : function(symbol) {
-        return (typeof(this.identifiers[symbol])== 'undefined') ? false : this.identifiers[symbol];
+    getIdentifier : function(symbol, token) {
+        if (typeof(this.identifiers[symbol])== 'undefined') {
+            if (['String', 'Date'].indexOf(symbol)> -1) {
+                return false;
+            }
+            
+            print("SCOPE : " + this.gid +" = SYMBOL NOT FOUND?" + token.toString());
+            return false;
+        }
+         print("SCOPE : " + this.gid +" = FOUND:" + token.toString());
+        return this.identifiers[symbol];
     },
     
     addHint : function(varName, varType) {
@@ -313,4 +323,4 @@ XObject.extend(Scope, {
 })
 // init the scope constants..
 Scope.init();
- 
\ No newline at end of file
+Scope.gid = 0;
\ No newline at end of file