X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCompressWhite.vala;h=6a38ef7a35d4e4b93988c705ec78af8a7a871435;hb=dad53f90789b90b0767d049a5c449b305d64941b;hp=257c3d58ec10a5c52f3093454aa03d4ccf6fb073;hpb=ffb8d6dcc266d3e5c1e4353ee600f1d3f78bf377;p=gnome.introspection-doc-generator

diff --git a/JSDOC/CompressWhite.vala b/JSDOC/CompressWhite.vala
index 257c3d5..6a38ef7 100644
--- a/JSDOC/CompressWhite.vala
+++ b/JSDOC/CompressWhite.vala
@@ -17,6 +17,8 @@ namespace JSDOC
 	{
 		//keepWhite = keepWhite || false;
 		ts.rewind();
+		//ts.dumpAllFlat(); GLib.Process.exit(1);
+		
 		//var str = File.read(fn);
 		var rep_var = 1;
 	
@@ -71,27 +73,39 @@ namespace JSDOC
 			        ts.cursor = cu;
 			        continue;
 			    }
-			    // a = function() { ...
+			    // a = function() { ... -- add a semi colon a tthe end if not one there..
 			       
 			    if (ts.lookTok(1).data == "=" &&  ts.lookTok(2).name == "FUNCTION") {
 			        // freeze time.. 
 			        //println("got = function() ");
-			        var cu = ts.cursor;
-			        ts.cursor+=2; // move two along, and balance...
-			        
-			        if (ts.balance("(").size < 1 ){
+			        tok = ts.nextTok();
+			        tok = ts.nextTok();
 			        
-			    		print("balnaced issue\n");
+			        //tok = ts.next();
+			         var cu = ts.cursor;
+					print("NEXT = should be brac: %s\n", ts.lookTok(1).asString());
+					  
+			       print("cursor = %d", ts.cursor);
+			          
+			        if (ts.lookTok(1).data != "(" || ts.balance("(").size < 1 ){
+			    		print("balance ( issue on line %d\n", ts.toArray().get(cu).line);
 			            ts.dump(cu-40, cu+2);
 			            print(">>>>>>>>>>>>>>>>>HERE>>>>>>>>>>>>");
 			            ts.dump(cu+2, cu+40);
 			            
 			            throw new CompressWhiteError.BRACE( "could not find end lbrace!!!" );
 			        }
+			        print("cursor = %d", ts.cursor);
+			        print("CUR = should be ): %s\n", ts.lookTok(0).asString());
+
+			        tok = ts.nextTok();
+			        print("CUR = should be {: %s\n", ts.lookTok(0).asString());			        
+			        cu = ts.cursor; // set the cursor to here.. so the next bit of the code will check inside the method.
+			        print("cursor = %d", ts.cursor);
 			        //print("AFTER BALANCE (");
 			        //ts.dump(cu, ts.cursor);
 			        //ts.cursor--; // cursor at the (
-			        if (ts.balance("{").size < 1 ){
+			        if (tok.data != "{" || ts.balance("{").size < 1 ){
 
 			            ts.dump(cu-40, cu);
 			            print(">>>>>>>>>>>>>>>>>HERE>>>>>>>>>>>>");
@@ -167,6 +181,7 @@ namespace JSDOC
 			        var cu = ts.cursor;
 			        
 			        if (ts.balance("{").size < 1 ){
+
 			            ts.dump(cu-40, cu);
 			            print(">>>>>>>>>>>>>>>>>HERE>>>>>>>>>>>>");
 			            ts.dump(cu, cu+40);