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
/
PrettyPrint.js
diff --git
a/JSDOC/PrettyPrint.js
b/JSDOC/PrettyPrint.js
index
22564a5
..
3101f30
100644
(file)
--- a/
JSDOC/PrettyPrint.js
+++ b/
JSDOC/PrettyPrint.js
@@
-3,18
+3,32
@@
TokenReader = imports.TokenReader.TokenReader;
ScopeParser= imports.ScopeParser.ScopeParser;
TokenReader = imports.TokenReader.TokenReader;
ScopeParser= imports.ScopeParser.ScopeParser;
-TokenStream = imports.TokenStream.TokenStream;
+Collapse = imports.Collapse.Collapse;
+TextStream = imports.TextStream.TextStream;
+
+
+function escapeHTML(str) {
+ return str.replace(/&/g,'&').
+ replace(/>/g,'>').
+ replace(/</g,'<').
+ replace(/"/g,'"');
+};
function toPretty(str)
{
function toPretty(str)
{
- var tr = new TokenReader();
- var toks = tr.tokenize(str,false); // dont merge xxx + . + yyyy etc.
- var sp = new ScopeParser(new TokenStream(toks));
- sp.buildSymbolTree();
+
+ var txs = new TextStream(str);
+ var tr = new TokenReader({ keepComments : true, keepWhite : true });
+ var toks = tr.tokenize(txs)
+
+ //var sp = new ScopeParser(new Collapse(toks));
+ //sp.buildSymbolTree();
+
+
// sp.mungeSymboltree();
var r = '';
// sp.mungeSymboltree();
var r = '';
- r += sp.warnings.join("<BR>");
- r == "<BR>";
+
//
r += sp.warnings.join("<BR>");
+
//
r == "<BR>";
@@
-33,7
+47,7
@@
function toPretty(str)
return 'string';
}
// other 'vary things??
return 'string';
}
// other 'vary things??
- if (tok.is('NAME') || tok.data == '.' || tok.name == 'THIS')
)
{
+ if (tok.is('NAME') || tok.data == '.' || tok.name == 'THIS') {
return 'var';
}
if (/^[a-z]+/i.test(tok.data)) {
return 'var';
}
if (/^[a-z]+/i.test(tok.data)) {
@@
-59,18
+73,11
@@
function toPretty(str)
continue;
}
continue;
}
- r += escapeHTML(toks[i].data)
.replace(/\n/g, '<BR>'
);
+ r += escapeHTML(toks[i].data)
; //.replace(/\n/g, "<BR/>\n"
);
}
if (cs.length) r +='</span>';
}
if (cs.length) r +='</span>';
+
return '<code class="jsdoc-pretty">'+r+'</code>';
}
return '<code class="jsdoc-pretty">'+r+'</code>';
}
-function escapeHTML() {
- return(
- this.replace(/&/g,'&').
- replace(/>/g,'>').
- replace(/</g,'<').
- replace(/"/g,'"')
- );
-};
\ No newline at end of file