ts.balance("{");
// if next is not ';' -> make it so...
- if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name = ="NEW_LINE") {
+ if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name = ="NEWLINE") {
ts.look(0).outData = ts.cur().data +";";
}
// restore..
// if next is not ';' -> make it so...
// although this var a=function(){},v,c; causes
if (!ts.lookTok(1).isData(';') && !ts.lookTok(1).isData('}') && ts.lookTok(1,true).isLineBreak()) {
- ts.cur().outData = ts.cur().data+";";
+ ts.cur().outData = ts.look(0).data+";";
}
// restore..
ts.cursor = cu;
// if next is not ';' -> make it so...
if (!ts.look(1).data == ';' && ts.look(1).data != '}' && ts.look(1,true).name=="NEWLINE") {
- ts.cur().outData = ts.cur().data +";";
+ ts.look(0).outData = ts.look(0).data +";";
}
// restore..
ts.cursor = cu;
- switch(tok.tokN) {
+ switch(tok.data.toUpperCase()) {
// things that need space appending
- case Script.TOKfunction:
- case Script.TOKbreak:
- case Script.TOKcontinue:
+ case "FUNCTION":
+ case "BREAK":
+ case "CONTINUE":
// if next item is a identifier..
if (ts.look(1).isTypeN(Script.TOKidentifier) || ts.look(1).data.match(/^[a-z]+$/i) ) { // as include is a keyword for us!!
tok.outData = tok.data + " ";
continue;
- case Script.TOKreturn: // if next item is not a semi; (or }
+ case "RETURN": // if next item is not a semi; (or }
if (ts.look(1).data == ';' || ts.look(1).data == '}') {
continue;
}
continue;
- case Script.TOKelse: // if next item is not a semi; (or }
+ case "ELSE": // if next item is not a semi; (or }
if (!ts.look(1).isTypeN(Script.TOKif)) {
continue;
}
tok.outData = tok.data + " ";
continue;
- case Script.TOKplusplus: // if previous was a plus or next is a + add a space..
- case Script.TOKminusminus: // if previous was a - or next is a - add a space..
+ case "++": // if previous was a plus or next is a + add a space..
+ case "--": // if previous was a - or next is a - add a space..
var p = (Script.TOKminusminus == tok.tokN ? '-' : '+');
}
continue;
- case Script.TOKin: // before and after??
- case Script.TOKinstanceof:
+ case "IN": // before and after??
+ case "INSTANCEOF":
tok.outData = " " + tok.data + " ";
continue;
- case Script.TOKvar: // always after..
- case Script.TOKnew:
- case Script.TOKdelete:
- case Script.TOKthrow:
- case Script.TOKnew:
- case Script.TOKcase:
- case Script.TOKtypeof:
- case Script.TOKvoid:
+ case "VAR": // always after..
+ case "NEW":
+ case "DELETE":
+ case "THROW":
+ case "CASE":
+
+ case "VOID":
tok.outData = tok.data + " ";
continue
- case Script.TOKsemicolon:
+
+ case "TYPEOF": // what about typeof(
+ if (ts.lookTok(1).data != '(') {
+ tok.outData = tok.data + " ";
+ }
+ continue;
+ case ";"
//remove semicolon before brace --
//if(ts.look(1).isTypeN(Script.TOKrbrace)) {
// tok.outData = '';
ts.rewind();
-
+ // NOW OUTPUT THE THING.
//var f = new File(minfile, File.NEW);
var out = '';