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/ScopeParser.js
[gnome.introspection-doc-generator]
/
JSDOC
/
ScopeParser.js
diff --git
a/JSDOC/ScopeParser.js
b/JSDOC/ScopeParser.js
index
237f6b6
..
835aa12
100644
(file)
--- a/
JSDOC/ScopeParser.js
+++ b/
JSDOC/ScopeParser.js
@@
-141,7
+141,7
@@
ScopeParser.prototype = {
this.braceNesting = 0;
this.scopes = [];
this.braceNesting = 0;
this.scopes = [];
-
+ //print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
this.globalScope = new Scope(-1, false, -1, '');
@@
-224,7
+224,7
@@
ScopeParser.prototype = {
var isObjectLitAr = [ false ];
var isInObjectLitAr;
thisScope = scope;
var isObjectLitAr = [ false ];
var isInObjectLitAr;
thisScope = scope;
- if (thisScope) {
+ if (thisScope
&& thisScope.gid != this.scopes[this.scopes.length-1]
) {
this.scopes.push(scope);
} else {
thisScope = this.scopes[this.scopes.length-1]
this.scopes.push(scope);
} else {
thisScope = this.scopes[this.scopes.length-1]
@@
-258,7
+258,7
@@
ScopeParser.prototype = {
while (true) {
token = this.ts.nextTok();
//!this.debug|| print( token.toString());
while (true) {
token = this.ts.nextTok();
//!this.debug|| print( token.toString());
-
//print('SCOPE-VAR-VAL:' + token.toString(
));
+
print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4
));
if (!token) { // can return false at EOF!
break;
}
if (!token) { // can return false at EOF!
break;
}
@@
-277,7
+277,7
@@
ScopeParser.prototype = {
if (this.mode == "BUILDING_SYMBOL_TREE") {
if (this.mode == "BUILDING_SYMBOL_TREE") {
- identifier = thisScope.getIdentifier(token.data) ;
+ identifier = thisScope.getIdentifier(token.data
,token
) ;
if (identifier == false) {
thisScope.declareIdentifier(token.data, token);
if (identifier == false) {
thisScope.declareIdentifier(token.data, token);
@@
-300,7
+300,21
@@
ScopeParser.prototype = {
} else {
//var bn = this.braceNesting;
var bn = this.braceNesting;
} else {
//var bn = this.braceNesting;
var bn = this.braceNesting;
- this.parseExpression();
+ var nts = [];
+ while (true) {
+ if (!token || token.type == 'VOID' || token.data == ',') {
+ break;
+ }
+ nts.push(token);
+ token = this.ts.nextTok();
+ }
+ if (nts.length) {
+ var TS = this.ts;
+ this.ts = new TokenStream(nts);
+ this.parseExpression();
+ this.ts = TS;
+ }
+
this.braceNesting = bn;
//this.braceNesting = bn;
//this.logR("parseScope DONE : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString());
this.braceNesting = bn;
//this.braceNesting = bn;
//this.logR("parseScope DONE : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString());
@@
-328,6
+342,7
@@
ScopeParser.prototype = {
case "PUNC.LEFT_CURLY": // {
case "PUNC.LEFT_PAREN": // (
case "PUNC.LEFT_CURLY": // {
case "PUNC.LEFT_PAREN": // (
+ case "PUNC.LEFT_BRACE": // [
//print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
//print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
@@
-348,7
+363,7
@@
ScopeParser.prototype = {
// key value..
this.ts = new TokenStream(token.props[prop].val);
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parse
Scope(false
);
+ this.parse
Expression(
);
}
this.ts = curTS;
}
this.ts = curTS;
@@
-411,7
+426,7
@@
ScopeParser.prototype = {
break;
case "KEYW.CATCH":
break;
case "KEYW.CATCH":
-
//
print('SCOPE-CATCH:' + token.toString());
+ print('SCOPE-CATCH:' + token.toString());
//println("<i>"+token.data+"</i>");
this.parseCatch();
break;
//println("<i>"+token.data+"</i>");
this.parseCatch();
break;
@@
-485,7
+500,7
@@
ScopeParser.prototype = {
//println("GOT IDENT: <B>" + symbol + "</B><BR/>");
//println("GOT IDENT (2): <B>" + symbol + "</B><BR/>");
//println("GOT IDENT: <B>" + symbol + "</B><BR/>");
//println("GOT IDENT (2): <B>" + symbol + "</B><BR/>");
- identifier = this.getIdentifier(symbol, thisScope);
+ identifier = this.getIdentifier(symbol, thisScope
, token
);
if (identifier == false) {
// BUG!find out where builtin is defined...
if (identifier == false) {
// BUG!find out where builtin is defined...
@@
-520,12
+535,13
@@
ScopeParser.prototype = {
if (symbol == "eval") {
// look back one and see if we can find a comment!!!
if (symbol == "eval") {
// look back one and see if we can find a comment!!!
- if (this.ts.look(-1).type == "COMM") {
+ //if (this.ts.look(-1).type == "COMM") {
+ if (token.prefix && token.prefix.match('/eval/')) {
// look for eval:var:noreplace\n
var _t = this;
// look for eval:var:noreplace\n
var _t = this;
- t
his.ts.look(-1).data
.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
+ t
oken.prefix
.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
- var hi = _t.getIdentifier(a, thisScope);
+ var hi = _t.getIdentifier(a, thisScope
, token
);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@
-628,20
+644,23
@@
ScopeParser.prototype = {
case '{': //Token.LC:
case '[': //Token.LB:
//print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
case '{': //Token.LC:
case '[': //Token.LB:
//print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
+ // print('SCOPE-CURLY/PAREN/BRACE:' + JSON.stringify(token, null,4));
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
if (token.props) {
for (var prop in token.props) {
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
if (token.props) {
for (var prop in token.props) {
- if (token.props[prop].val.data == 'function') {
+ if (token.props[prop].val
[0]
.data == 'function') {
// parse a function..
// parse a function..
- this.parseFunctProp(token.props[prop]);
+ this.ts = new TokenStream(token.props[prop].val);
+ this.ts.nextTok();
+ this.parseFunctionDeclaration();
continue;
}
// key value..
this.ts = new TokenStream(token.props[prop].val);
continue;
}
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parse
Scope(currentScope
);
+ this.parse
Expression(
);
}
this.ts = curTS;
}
this.ts = curTS;
@@
-717,7
+736,7
@@
ScopeParser.prototype = {
if (this.mode == 'PASS2_SYMBOL_TREE') {
if (this.mode == 'PASS2_SYMBOL_TREE') {
- identifier = this.getIdentifier(symbol, currentScope);
+ identifier = this.getIdentifier(symbol, currentScope
, token
);
//println("<B>??</B>");
if (identifier == false) {
//println("<B>??</B>");
if (identifier == false) {
@@
-763,11
+782,11
@@
ScopeParser.prototype = {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
if (symbol == "eval") {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
if (symbol == "eval") {
- if (t
his.ts.look(-1).type == 'COMM'
) {
+ if (t
oken.prefix && token.prefix.match('/eval/')
) {
// look for eval:var:noreplace\n
var _t = this;
// look for eval:var:noreplace\n
var _t = this;
- t
his.ts.look(-1).data
.replace(/eval:var:([a-z]+)/ig, function(m, a) {
- var hi = _t.getIdentifier(a, currentScope);
+ t
oken.prefix
.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+ var hi = _t.getIdentifier(a, currentScope
, token
);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@
-804,10
+823,11
@@
ScopeParser.prototype = {
var token;
var currentScope;
var identifier;
var token;
var currentScope;
var identifier;
-
+
//token = getToken(-1);
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
//token = getToken(-1);
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
+ print(token.toString());
//assert token.getType() == Token.LP; (
//token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
//assert token.getType() == Token.LP; (
//token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
@@
-822,7
+842,7
@@
ScopeParser.prototype = {
currentScope.declareIdentifier(symbol, token);
} else {
//?? why inc the refcount?? - that should be set when building the tree???
currentScope.declareIdentifier(symbol, token);
} else {
//?? why inc the refcount?? - that should be set when building the tree???
- identifier = this.getIdentifier(symbol, currentScope);
+ identifier = this.getIdentifier(symbol, currentScope
, token
);
identifier.refcount++;
}
identifier.refcount++;
}
@@
-848,17
+868,23
@@
ScopeParser.prototype = {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
// Get the name of the function and declare it in the current scope.
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
// Get the name of the function and declare it in the current scope.
symbol = token.data;
- if (currentScope.getIdentifier(symbol) != false) {
+ if (currentScope.getIdentifier(symbol
,token
) != false) {
this.warn("The function " + symbol + " has already been declared in the same scope...", true);
}
currentScope.declareIdentifier(symbol,token);
}
token = this.ts.nextTok();
}
this.warn("The function " + symbol + " has already been declared in the same scope...", true);
}
currentScope.declareIdentifier(symbol,token);
}
token = this.ts.nextTok();
}
-
+ // return function() {....
+ if (token.name == "RETURN") {
+ token = this.ts.nextTok();
+ }
+ if (token.name == "FUNCTION") {
+ token = this.ts.nextTok();
+ }
//assert token.getType() == Token.LP;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
//assert token.getType() == Token.LP;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- fnScope = new Scope(
this.braceNesting, currentScope, token.n, ''
);
+ fnScope = new Scope(
1, currentScope, token.n, '', token
);
//println("STORING SCOPE" + this.ts.cursor);
//println("STORING SCOPE" + this.ts.cursor);
@@
-867,10
+893,9
@@
ScopeParser.prototype = {
} else {
//qln("FETCHING SCOPE" + this.ts.cursor);
fnScope = this.indexedScopes[token.id];
} else {
//qln("FETCHING SCOPE" + this.ts.cursor);
fnScope = this.indexedScopes[token.id];
-
}
//if (this.mode == 'BUILDING_SYMBOL_TREE')
}
//if (this.mode == 'BUILDING_SYMBOL_TREE')
-
//
print('FUNC-PARSE:' + JSON.stringify(token,null,4));
+
//
print('FUNC-PARSE:' + JSON.stringify(token,null,4));
// Parse function arguments.
var args = token.items;
for (var argpos =0; argpos < args.length; argpos++) {
// Parse function arguments.
var args = token.items;
for (var argpos =0; argpos < args.length; argpos++) {
@@
-905,6
+930,7
@@
ScopeParser.prototype = {
_this.ts = new TokenStream(tar);
_this.parseScope(fnScope);
_this.ts = new TokenStream(tar);
_this.parseScope(fnScope);
+
});
//print(JSON.stringify(this.ts,null,4));
});
//print(JSON.stringify(this.ts,null,4));
@@
-936,10
+962,10
@@
ScopeParser.prototype = {
scope.preventMunging();
},
scope.preventMunging();
},
- getIdentifier: function(symbol, scope) {
+ getIdentifier: function(symbol, scope
, token
) {
var identifier;
while (scope != false) {
var identifier;
while (scope != false) {
- identifier = scope.getIdentifier(symbol);
+ identifier = scope.getIdentifier(symbol
, token
);
//println("ScopeParser.getIdentgetUsedSymbols("+symbol+")=" + scope.getUsedSymbols().join(','));
if (identifier) {
return identifier;
//println("ScopeParser.getIdentgetUsedSymbols("+symbol+")=" + scope.getUsedSymbols().join(','));
if (identifier) {
return identifier;