Browse code

fixes for bb #177: if all we have is a script in a html file still normalize it keep global scope, we need it to parse variable names in the correct scope

git-svn: trunk@4058

Török Edvin authored on 2008/08/01 23:50:50
Showing 3 changed files
... ...
@@ -1646,6 +1646,9 @@ abort:
1646 1646
 		html_tag_contents_done(hrefs,in_ahref);
1647 1647
 
1648 1648
 	if(js_state) {
1649
+		/*  output script so far */
1650
+		cli_js_parse_done(js_state);
1651
+		cli_js_output(js_state, dirname);
1649 1652
 		cli_js_destroy(js_state);
1650 1653
 		js_state = NULL;
1651 1654
 	}
... ...
@@ -855,7 +855,6 @@ void cli_js_parse_done(struct parser_state* state)
855 855
 
856 856
 	yylex_destroy(state->scanner);
857 857
 	state->scanner = NULL;
858
-	state->global = NULL; /* make this state invalid for parsing */
859 858
 }
860 859
 
861 860
 
... ...
@@ -350,13 +350,13 @@ static const char jstest_buf7[] =
350 350
 "var z=\"tst" B64 "tst\";";
351 351
 
352 352
 static const char jstest_expected7[] =
353
-"var z=\"tst" B64 "tst\";";
353
+"var n000=\"tst" B64 "tst\";";
354 354
 
355 355
 static const char jstest_buf8[] =
356 356
 "var z=\'tst" B64 "tst\';";
357 357
 
358 358
 static const char jstest_expected8[] =
359
-"var z=\"tst" B64 "tst\";";
359
+"var n000=\"tst" B64 "tst\";";
360 360
 
361 361
 static const char jstest_buf9[] =
362 362
 "eval(unescape('%61%6c%65%72%74%28%27%74%65%73%74%27%29%3b'));";
... ...
@@ -374,7 +374,7 @@ static const char jstest_buf11[] =
374 374
 "var x=123456789 ;";
375 375
 
376 376
 static const char jstest_expected11[] =
377
-"var x=123456789;";
377
+"var n000=123456789;";
378 378
 
379 379
 static struct {
380 380
 	const char *in;