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/TokenStream.vala
[gnome.introspection-doc-generator]
/
JSDOC
/
Packer.vala
diff --git
a/JSDOC/Packer.vala
b/JSDOC/Packer.vala
index
a17702c
..
9c8221b
100644
(file)
--- a/
JSDOC/Packer.vala
+++ b/
JSDOC/Packer.vala
@@
-283,14
+283,15
@@
namespace JSDOC
}
}
- print("MERGING SOURCE");
+ print("MERGING SOURCE
\n
");
for(var i=0; i < this.files.size; i++) {
var file = this.files[i];
var minfile = this.tmpDir + "/" + file.replace("/", ".");
for(var i=0; i < this.files.size; i++) {
var file = this.files[i];
var minfile = this.tmpDir + "/" + file.replace("/", ".");
- if ( FileUtils.test(minfile, FileTest.EXISTS)) {
+ if ( !FileUtils.test(minfile, FileTest.EXISTS)) {
+ print("skipping source %s - does not exist\n", minfile);
continue;
}
string str;
continue;
}
string str;
@@
-298,7
+299,7
@@
namespace JSDOC
print("using MIN FILE %s\n", minfile);
if (str.length > 0) {
if (this.targetStream != null) {
print("using MIN FILE %s\n", minfile);
if (str.length > 0) {
if (this.targetStream != null) {
- this.targetStream.write(("//" + file + "\n").data);
+ this.targetStream.write(("//
" + file + "\n").data);
this.targetStream.write((str + "\n").data);
} else {
this.targetStream.write((str + "\n").data);
} else {
@@
-312,13
+313,16
@@
namespace JSDOC
}
}
}
}
- //print("Output file: " + this.target);
+ if (this.target.length > 0 ) {
+ print("Output file: " + this.target);
+ }
if (this.targetDebug.length > 0) {
print("Output debug file: %s\n" , this.targetDebug);
if (this.targetDebug.length > 0) {
print("Output debug file: %s\n" , this.targetDebug);
- } else {
-
+ }
+
+ if (this.outstr.length > 0 ) {
+ print(this.outstr);
}
}
-
@@
-371,7
+375,7
@@
namespace JSDOC
sp.printWarnings();
//print(sp.warnings.join("\n"));
sp.printWarnings();
//print(sp.warnings.join("\n"));
-
+ // compress works on the original array - in theory the replacements have already been done by now
var outf = CompressWhite(new TokenStream(toks.tokens), this, this.keepWhite); // do not kill whitespace..
var outf = CompressWhite(new TokenStream(toks.tokens), this, this.keepWhite); // do not kill whitespace..