JSDOC/CompressWhite.vala

diff --git a/JSDOC/CompressWhite.vala b/JSDOC/CompressWhite.vala
index 2f38a95..6df8aa5 100644 (file)
--- a/JSDOC/CompressWhite.vala
+++ b/JSDOC/CompressWhite.vala
@@ -214,17 +214,17 @@ namespace JSDOC
                                    
                                        
                                    case "ELSE": // if next item is not a semi; (or }
                                    
                                        
                                    case "ELSE": // if next item is not a semi; (or }

-                                       if (!ts.lookTok(1).name == "IF") {
+                                       if (ts.lookTok(1).name != "IF") {

                                            continue;
                                        }
                                            continue;
                                        }

-                                       
+                                       // add a space if next element is 'IF'

                                        tok.outData =  tok.data + " ";
                                        continue;
                                    
                                    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..
                                    
                                        tok.outData =  tok.data + " ";
                                        continue;
                                    
                                    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 = (tok.data == "--" ? '-' : '+'); 
+                                       var p = (tok.data == "--" ? "-" : "+"); 

                                    
                                        if (ts.lookTok(1).data == p) {
                                            tok.outData =  tok.data + " ";
                                    
                                        if (ts.lookTok(1).data == p) {
                                            tok.outData =  tok.data + " ";


@@ -253,7 +253,7 @@ namespace JSDOC
                                        continue;
                                        
                                    case "TYPEOF": // what about typeof(
                                        continue;
                                        
                                    case "TYPEOF": // what about typeof(

-                                       if (ts.lookTok(1).data != '(') {
+                                       if (ts.lookTok(1).data != "(") {

                                            tok.outData =  tok.data + " ";
                                        }
                                        continue;
                                            tok.outData =  tok.data + " ";
                                        }
                                        continue;


@@ -279,12 +279,12 @@ namespace JSDOC
                        //try { out.length = ts.slen; } catch (e) {} // prealloc.
                
                        out = '';
                        //try { out.length = ts.slen; } catch (e) {} // prealloc.
                
                        out = '';

-                       var tok;
+                       Token tok;

                        while (true) {
                                
                                tok = keepWhite ? ts.next() : ts.nextTok();
                                
                        while (true) {
                                
                                tok = keepWhite ? ts.next() : ts.nextTok();
                                

-                               if (!tok) {
+                               if (tok == null) {

                                    break;
                                }
                                if (tok.type == "COMM") {
                                    break;
                                }
                                if (tok.type == "COMM") {