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/BuildDocs.js
[gnome.introspection-doc-generator]
/
JSDOC
/
ScopeParser.js
diff --git
a/JSDOC/ScopeParser.js
b/JSDOC/ScopeParser.js
index
f2fcf29
..
8676d81
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));
+
//
print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
this.globalScope = new Scope(-1, false, -1, '');
@@
-426,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;
@@
-533,18
+533,22
@@
ScopeParser.prototype = {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- if (symbol == "eval") {
+ if (token.name == "EVAL") {
+
+ //print(JSON.stringify(token, null,4));
// look back one and see if we can find a comment!!!
//if (this.ts.look(-1).type == "COMM") {
// look back one and see if we can find a comment!!!
//if (this.ts.look(-1).type == "COMM") {
- if (token.prefix && token.prefix.match(
'/eval/'
)) {
+ if (token.prefix && token.prefix.match(
/eval/
)) {
// look for eval:var:noreplace\n
// look for eval:var:noreplace\n
+ //print("MATCH!?");
var _t = this;
token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
var _t = this;
token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
-
+ //print("GOT: " + a);
var hi = _t.getIdentifier(a, thisScope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
var hi = _t.getIdentifier(a, thisScope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
- // println("PROTECT "+a+" from munge");
+ // print("PROTECT "+a+" from munge");
+ //print(JSON.stringify(hi,null,4));
hi.toMunge = false;
}
hi.toMunge = false;
}
@@
-620,7
+624,7
@@
ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + token.toString());
+ //print('EXP
R
' + token.toString());
//println("<i>"+token.data+"</i>");
//println("<i>"+token.data+"</i>");
@@
-770,6
+774,8
@@
ScopeParser.prototype = {
case 'KEYW':
//if (this.mode == 'BUILDING_SYMBOL_TREE')
// print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
case 'KEYW':
//if (this.mode == 'BUILDING_SYMBOL_TREE')
// print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+
+ //print('EXPR-KEYW:' + token.toString());
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@
-780,12
+786,18
@@
ScopeParser.prototype = {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
- if (symbol == "eval") {
- if (token.prefix && token.prefix.match('/eval/')) {
+
+ if (token.name == "EVAL") {
+ //print(JSON.stringify(token,null,4));
+ if (token.prefix && token.prefix.match(/eval:var:/g)) {
// look for eval:var:noreplace\n
// look for eval:var:noreplace\n
+ // print("GOT MATCH?");
var _t = this;
token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
var _t = this;
token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+
+ //print("PROTECT: " + a);
+
+
var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {