projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JSDOC/TokenReader.js
[gnome.introspection-doc-generator]
/
JSDOC
/
ScopeParser.js
diff --git
a/JSDOC/ScopeParser.js
b/JSDOC/ScopeParser.js
index
aae3b2c
..
7c77be0
100644
(file)
--- a/
JSDOC/ScopeParser.js
+++ b/
JSDOC/ScopeParser.js
@@
-1,7
+1,7
@@
//<Script type="text/javascript">
//<Script type="text/javascript">
-Scope = imports.Scope.Scope;
-TokenStream = imports.TokenStream.TokenStream;
+
const
Scope = imports.Scope.Scope;
+
const
TokenStream = imports.TokenStream.TokenStream;
/**
* Scope stuff
*
/**
* Scope stuff
*
@@
-11,7
+11,7
@@
TokenStream = imports.TokenStream.TokenStream;
*
*/
*
*/
-ScopeParser = function(ts) {
+
const
ScopeParser = function(ts) {
this.ts = ts; // {TokenStream}
this.warnings = [];
this.indexedg = {};
this.ts = ts; // {TokenStream}
this.warnings = [];
this.indexedg = {};
@@
-176,6
+176,8
@@
ScopeParser.prototype = {
this.globalScope.munge();
this.globalScope.munge();
+ this.globalScope.dump();
+
},
},
@@
-226,9
+228,9
@@
ScopeParser.prototype = {
//this.dumpToken(token , this.scopes, this.braceNesting);
//print('SCOPE:' + token.toString());
//this.log(token.data);
//this.dumpToken(token , this.scopes, this.braceNesting);
//print('SCOPE:' + token.toString());
//this.log(token.data);
- if (token.type == 'NAME') {
+
//
if (token.type == 'NAME') {
// print('*' + token.data);
// print('*' + token.data);
- }
+
//
}
switch(token.type + '.' + token.name) {
case "KEYW.VAR":
case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
switch(token.type + '.' + token.name) {
case "KEYW.VAR":
case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
@@
-362,8
+364,10
@@
ScopeParser.prototype = {
// ( ... ) or { .... } not object literals..
var _this = this;
// ( ... ) or { .... } not object literals..
var _this = this;
- token.items.forEach(function(expr) {
- //print(JSON.stringify(expr, null,4));
+ for (var xx =0; xx < token.items.length; xx++) {
+ expr = token.items[xx];
+ //token.items.forEach(function(expr) {
+ //print(expr.toString());
_this.ts = new TokenStream(expr);
//if (curTS.data == '(') {
_this.parseScope(scope)
_this.ts = new TokenStream(expr);
//if (curTS.data == '(') {
_this.parseScope(scope)
@@
-371,7
+375,7
@@
ScopeParser.prototype = {
// _this.parseExpression(scope)
//}
// _this.parseExpression(scope)
//}
- }
);
+ }
this.ts = curTS;
//print("NOT PROPS"); Seed.quit();
this.ts = curTS;
//print("NOT PROPS"); Seed.quit();
@@
-570,7
+574,7
@@
ScopeParser.prototype = {
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
- while (
token = this.ts.nextTok(
)) {
+ while (
(token = this.ts.nextTok()
)) {
@@
-797,7
+801,7
@@
ScopeParser.prototype = {
var symbol;
var token;
var symbol;
var token;
- var scope;
+
var identifier;
//token = getToken(-1);
var identifier;
//token = getToken(-1);
@@
-825,7
+829,7
@@
ScopeParser.prototype = {
identifier.refcount++;
}
identifier.refcount++;
}
- token = this.ts.nextTok();
+
//
token = this.ts.nextTok();
//assert token.getType() == Token.RP; // )
},
//assert token.getType() == Token.RP; // )
},
@@
-860,9
+864,7
@@
ScopeParser.prototype = {
while (token.data != "(") {
//print(token.toString());
token = this.ts.nextTok();
while (token.data != "(") {
//print(token.toString());
token = this.ts.nextTok();
-
-
-
+
}
}
@@
-958,4
+960,4
@@
ScopeParser.prototype = {
}
return false;
}
}
return false;
}
-};
\ No newline at end of file
+};