X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScope.js;h=23914787b11daa47ec5959cba6232e2d026f402c;hb=fbd039402e2ec47410eb1e2cb388b9d8321d30f6;hp=2f4e5ffbefab1f9b17d9c338ebcf39833df12efe;hpb=59700d8a41f70dd0dba92d5d9f919364a3e103f0;p=gnome.introspection-doc-generator diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js index 2f4e5ff..2391478 100644 --- a/JSDOC/Scope.js +++ b/JSDOC/Scope.js @@ -6,7 +6,7 @@ * // FIXME - I need this to do next() without doccomments.. */ -Identifier = imports['JSDOC/Identifier.js'].Identifier +Identifier = imports.Identifier.Identifier XObject = imports.XObject.XObject; @@ -170,13 +170,18 @@ Scope.prototype = { } - println("MUNGE: Scope:" + this.id+"
"); + var pickFromSet = 1; // Do not munge symbols in the global scope! if (this.parent) { - + + var all = []; + for (var ii in this.identifiers) { + all.push(ii); + } + //print("MUNGE: " + all.join(', ')); //println("MUNGE: Building FreeSyms:" + this.id+"
"); @@ -205,18 +210,21 @@ Scope.prototype = { if (!this.identifiers[i].toMunge) { + //print("SKIP toMunge==false : " + i) continue; } if (this.isProtectedVar(i)) { + //print("SKIP PROTECTED: " + i) continue; // } - if (this.identifiers[i].constructor != Identifier) { - continue; - } + //if (this.identifiers[i].constructor != Identifier) { + // print("SKIP NOT IDENTIFIER : " + i) + // continue; + // } // println("IDENT:" +i+'
'); if (!repsym.length) { @@ -233,18 +241,19 @@ Scope.prototype = { //println([ repsym,mungedValue ]); if (this.mungeM && repsym.length < mungedValue.length) { - //println("REPLACE:"+ mungedValue +" with " + repsym + "
"); + //print("REPLACE:"+ mungedValue +" with " + repsym ); mungedValue = repsym; repsym = ''; } + identifier.mungedValue = mungedValue; } //println("MUNGE: Done " + this.id+"
"); } this.munged = true; //println("Doing sub scopes"); - for (var i = 0; i < this.subScopes.length; i++) { - var ss = this.subScopes[i]; + for (var j = 0; j < this.subScopes.length; j++) { + var ss = this.subScopes[j]; ss.munge(); } }