/[jscoverage]/trunk/instrument-js.cpp
ViewVC logotype

Diff of /trunk/instrument-js.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 174 by siliconforks, Sat Sep 20 23:27:14 2008 UTC revision 370 by siliconforks, Mon Oct 27 20:34:27 2008 UTC
# Line 26  Line 26 
26  #include <string.h>  #include <string.h>
27    
28  #include <jsapi.h>  #include <jsapi.h>
29    #include <jsarena.h>
30  #include <jsatom.h>  #include <jsatom.h>
31    #include <jsemit.h>
32    #include <jsexn.h>
33  #include <jsfun.h>  #include <jsfun.h>
34  #include <jsinterp.h>  #include <jsinterp.h>
35    #include <jsiter.h>
36  #include <jsparse.h>  #include <jsparse.h>
37  #include <jsregexp.h>  #include <jsregexp.h>
38  #include <jsscope.h>  #include <jsscope.h>
39  #include <jsstr.h>  #include <jsstr.h>
40    
41  #include "encoding.h"  #include "encoding.h"
42    #include "global.h"
43    #include "highlight.h"
44  #include "resource-manager.h"  #include "resource-manager.h"
45  #include "util.h"  #include "util.h"
46    
47    struct IfDirective {
48      const jschar * condition_start;
49      const jschar * condition_end;
50      uint16_t start_line;
51      uint16_t end_line;
52      struct IfDirective * next;
53    };
54    
55    bool jscoverage_mozilla = false;
56    
57    static bool * exclusive_directives = NULL;
58    
59  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
60  static JSContext * context = NULL;  static JSContext * context = NULL;
61  static JSObject * global = NULL;  static JSObject * global = NULL;
62    static JSVersion js_version = JSVERSION_ECMA_3;
63    
64  /*  /*
65  JSParseNode objects store line numbers starting from 1.  JSParseNode objects store line numbers starting from 1.
# Line 48  Line 67 
67  */  */
68  static const char * file_id = NULL;  static const char * file_id = NULL;
69  static char * lines = NULL;  static char * lines = NULL;
70    static uint16_t num_lines = 0;
71    
72    void jscoverage_set_js_version(const char * version) {
73      js_version = JS_StringToVersion(version);
74      if (js_version != JSVERSION_UNKNOWN) {
75        return;
76      }
77    
78      char * end;
79      js_version = (JSVersion) strtol(version, &end, 10);
80      if ((size_t) (end - version) != strlen(version)) {
81        fatal("invalid version: %s", version);
82      }
83    }
84    
85  void jscoverage_init(void) {  void jscoverage_init(void) {
86    runtime = JS_NewRuntime(8L * 1024L * 1024L);    runtime = JS_NewRuntime(8L * 1024L * 1024L);
# Line 60  Line 93 
93      fatal("cannot create context");      fatal("cannot create context");
94    }    }
95    
96      JS_SetVersion(context, js_version);
97    
98    global = JS_NewObject(context, NULL, NULL, NULL);    global = JS_NewObject(context, NULL, NULL, NULL);
99    if (global == NULL) {    if (global == NULL) {
100      fatal("cannot create global object");      fatal("cannot create global object");
# Line 75  Line 110 
110    JS_DestroyRuntime(runtime);    JS_DestroyRuntime(runtime);
111  }  }
112    
113    static void print_javascript(const jschar * characters, size_t num_characters, Stream * f) {
114      for (size_t i = 0; i < num_characters; i++) {
115        jschar c = characters[i];
116        /*
117        XXX does not handle no-break space, other unicode "space separator"
118        */
119        switch (c) {
120        case 0x9:
121        case 0xB:
122        case 0xC:
123          Stream_write_char(f, c);
124          break;
125        default:
126          if (32 <= c && c <= 126) {
127            Stream_write_char(f, c);
128          }
129          else {
130            Stream_printf(f, "\\u%04x", c);
131          }
132          break;
133        }
134      }
135    }
136    
137  static void print_string(JSString * s, Stream * f) {  static void print_string(JSString * s, Stream * f) {
138    size_t length = JSSTRING_LENGTH(s);    size_t length = JSSTRING_LENGTH(s);
139    jschar * characters = JSSTRING_CHARS(s);    jschar * characters = JSSTRING_CHARS(s);
# Line 109  Line 168 
168        case 0xa:        case 0xa:
169          Stream_write_string(f, "\\n");          Stream_write_string(f, "\\n");
170          break;          break;
171          /* IE doesn't support this */
172          /*
173        case 0xb:        case 0xb:
174          Stream_write_string(f, "\\v");          Stream_write_string(f, "\\v");
175          break;          break;
176          */
177        case 0xc:        case 0xc:
178          Stream_write_string(f, "\\f");          Stream_write_string(f, "\\f");
179          break;          break;
# Line 158  Line 220 
220    
221  static const char * get_op(uint8 op) {  static const char * get_op(uint8 op) {
222    switch(op) {    switch(op) {
223      case JSOP_OR:
224        return "||";
225      case JSOP_AND:
226        return "&&";
227    case JSOP_BITOR:    case JSOP_BITOR:
228      return "|";      return "|";
229    case JSOP_BITXOR:    case JSOP_BITXOR:
# Line 168  Line 234 
234      return "==";      return "==";
235    case JSOP_NE:    case JSOP_NE:
236      return "!=";      return "!=";
237    case JSOP_NEW_EQ:    case JSOP_STRICTEQ:
238      return "===";      return "===";
239    case JSOP_NEW_NE:    case JSOP_STRICTNE:
240      return "!==";      return "!==";
241    case JSOP_LT:    case JSOP_LT:
242      return "<";      return "<";
# Line 202  Line 268 
268  }  }
269    
270  static void instrument_expression(JSParseNode * node, Stream * f);  static void instrument_expression(JSParseNode * node, Stream * f);
271  static void instrument_statement(JSParseNode * node, Stream * f, int indent);  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if);
272    static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if);
273    
274  enum FunctionType {  enum FunctionType {
275    FUNCTION_NORMAL,    FUNCTION_NORMAL,
276    FUNCTION_GETTER_OR_SETTER    FUNCTION_GETTER_OR_SETTER
277  };  };
278    
279    static void output_for_in(JSParseNode * node, Stream * f) {
280      assert(node->pn_type == TOK_FOR);
281      assert(node->pn_arity == PN_BINARY);
282      Stream_write_string(f, "for ");
283      if (node->pn_iflags & JSITER_FOREACH) {
284        Stream_write_string(f, "each ");
285      }
286      Stream_write_char(f, '(');
287      instrument_expression(node->pn_left, f);
288      Stream_write_char(f, ')');
289    }
290    
291    static void output_array_comprehension_or_generator_expression(JSParseNode * node, Stream * f) {
292      assert(node->pn_type == TOK_LEXICALSCOPE);
293      assert(node->pn_arity == PN_NAME);
294      JSParseNode * for_node = node->pn_expr;
295      assert(for_node->pn_type == TOK_FOR);
296      assert(for_node->pn_arity == PN_BINARY);
297      JSParseNode * p = for_node;
298      while (p->pn_type == TOK_FOR) {
299        p = p->pn_right;
300      }
301      JSParseNode * if_node = NULL;
302      if (p->pn_type == TOK_IF) {
303        if_node = p;
304        assert(if_node->pn_arity == PN_TERNARY);
305        p = if_node->pn_kid2;
306      }
307      assert(p->pn_arity == PN_UNARY);
308      p = p->pn_kid;
309      if (p->pn_type == TOK_YIELD) {
310        /* for generator expressions */
311        p = p->pn_kid;
312      }
313    
314      instrument_expression(p, f);
315      p = for_node;
316      while (p->pn_type == TOK_FOR) {
317        Stream_write_char(f, ' ');
318        output_for_in(p, f);
319        p = p->pn_right;
320      }
321      if (if_node) {
322        Stream_write_string(f, " if (");
323        instrument_expression(if_node->pn_kid1, f);
324        Stream_write_char(f, ')');
325      }
326    }
327    
328  static void instrument_function(JSParseNode * node, Stream * f, int indent, enum FunctionType type) {  static void instrument_function(JSParseNode * node, Stream * f, int indent, enum FunctionType type) {
329      assert(node->pn_type == TOK_FUNCTION);
330    assert(node->pn_arity == PN_FUNC);    assert(node->pn_arity == PN_FUNC);
331    assert(ATOM_IS_OBJECT(node->pn_funAtom));    JSObject * object = node->pn_funpob->object;
   JSObject * object = ATOM_TO_OBJECT(node->pn_funAtom);  
332    assert(JS_ObjectIsFunction(context, object));    assert(JS_ObjectIsFunction(context, object));
333    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
334    assert(function);    assert(function);
335    assert(object == function->object);    assert(object == &function->object);
336    Stream_printf(f, "%*s", indent, "");    Stream_printf(f, "%*s", indent, "");
337    if (type == FUNCTION_NORMAL) {    if (type == FUNCTION_NORMAL) {
338      Stream_write_string(f, "function");      Stream_write_string(f, "function");
# Line 228  Line 344 
344      print_string_atom(function->atom, f);      print_string_atom(function->atom, f);
345    }    }
346    
347    /* function parameters */    /*
348      function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
349      js_DecompileFunction in jsopcode.cpp
350      */
351    Stream_write_string(f, "(");    Stream_write_string(f, "(");
352    JSAtom ** params = xnew(JSAtom *, function->nargs);    JSArenaPool pool;
353    for (int i = 0; i < function->nargs; i++) {    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
354      /* initialize to NULL for sanity check */    jsuword * local_names = NULL;
355      params[i] = NULL;    if (JS_GET_LOCAL_NAME_COUNT(function)) {
356    }      local_names = js_GetLocalNameArray(context, function, &pool);
357    JSScope * scope = OBJ_SCOPE(object);      if (local_names == NULL) {
358    for (JSScopeProperty * scope_property = SCOPE_LAST_PROP(scope); scope_property != NULL; scope_property = scope_property->parent) {        fatal("out of memory");
     if (scope_property->getter != js_GetArgument) {  
       continue;  
359      }      }
     assert(scope_property->flags & SPROP_HAS_SHORTID);  
     assert((uint16) scope_property->shortid < function->nargs);  
     assert(JSID_IS_ATOM(scope_property->id));  
     params[(uint16) scope_property->shortid] = JSID_TO_ATOM(scope_property->id);  
360    }    }
361    for (int i = 0; i < function->nargs; i++) {    for (int i = 0; i < function->nargs; i++) {
     assert(params[i] != NULL);  
362      if (i > 0) {      if (i > 0) {
363        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
364      }      }
365      if (ATOM_IS_STRING(params[i])) {      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
366        print_string_atom(params[i], f);      if (param == NULL) {
367          fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported parameter type for function");
368      }      }
369        print_string_atom(param, f);
370    }    }
371      JS_FinishArenaPool(&pool);
372    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
   free(params);  
373    
374    /* function body */    /* function body */
375    instrument_statement(node->pn_body, f, indent + 2);    if (function->flags & JSFUN_EXPR_CLOSURE) {
376        /* expression closure */
377        output_statement(node->pn_body, f, indent + 2, false);
378      }
379      else {
380        instrument_statement(node->pn_body, f, indent + 2, false);
381      }
382    
383    Stream_write_string(f, "}\n");    Stream_write_string(f, "}\n");
384  }  }
385    
386  static void instrument_function_call(JSParseNode * node, Stream * f) {  static void instrument_function_call(JSParseNode * node, Stream * f) {
387    instrument_expression(node->pn_head, f);    JSParseNode * function_node = node->pn_head;
388      if (function_node->pn_type == TOK_FUNCTION) {
389        JSObject * object = function_node->pn_funpob->object;
390        assert(JS_ObjectIsFunction(context, object));
391        JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
392        assert(function);
393        assert(object == &function->object);
394    
395        if (function_node->pn_flags & TCF_GENEXP_LAMBDA) {
396          /* it's a generator expression */
397          Stream_write_char(f, '(');
398          output_array_comprehension_or_generator_expression(function_node->pn_body, f);
399          Stream_write_char(f, ')');
400          return;
401        }
402        else {
403          Stream_write_char(f, '(');
404          instrument_expression(function_node, f);
405          Stream_write_char(f, ')');
406        }
407      }
408      else {
409        instrument_expression(function_node, f);
410      }
411    Stream_write_char(f, '(');    Stream_write_char(f, '(');
412    for (struct JSParseNode * p = node->pn_head->pn_next; p != NULL; p = p->pn_next) {    for (struct JSParseNode * p = function_node->pn_next; p != NULL; p = p->pn_next) {
413      if (p != node->pn_head->pn_next) {      if (p != node->pn_head->pn_next) {
414        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
415      }      }
# Line 275  Line 418 
418    Stream_write_char(f, ')');    Stream_write_char(f, ')');
419  }  }
420    
421    static void instrument_declarations(JSParseNode * list, Stream * f) {
422      assert(list->pn_arity == PN_LIST);
423      for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
424        switch (p->pn_type) {
425        case TOK_NAME:
426          assert(p->pn_arity == PN_NAME);
427          if (p != list->pn_head) {
428            Stream_write_string(f, ", ");
429          }
430          print_string_atom(p->pn_atom, f);
431          if (p->pn_expr != NULL) {
432            Stream_write_string(f, " = ");
433            instrument_expression(p->pn_expr, f);
434          }
435          break;
436        case TOK_ASSIGN:
437        case TOK_RB:
438        case TOK_RC:
439          /* destructuring */
440          instrument_expression(p, f);
441          break;
442        default:
443          abort();
444          break;
445        }
446      }
447    }
448    
449  /*  /*
450  See <Expressions> in jsparse.h.  See <Expressions> in jsparse.h.
451  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
# Line 333  Line 504 
504      instrument_expression(node->pn_kid3, f);      instrument_expression(node->pn_kid3, f);
505      break;      break;
506    case TOK_OR:    case TOK_OR:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " || ");  
     instrument_expression(node->pn_right, f);  
     break;  
507    case TOK_AND:    case TOK_AND:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " && ");  
     instrument_expression(node->pn_right, f);  
     break;  
508    case TOK_BITOR:    case TOK_BITOR:
509    case TOK_BITXOR:    case TOK_BITXOR:
510    case TOK_BITAND:    case TOK_BITAND:
# Line 397  Line 560 
560        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
561        break;        break;
562      default:      default:
563        abort();        fatal_source(file_id, node->pn_pos.begin.lineno, "unknown operator (%d)", node->pn_op);
564        break;        break;
565      }      }
566      break;      break;
# Line 454  Line 617 
617      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
618      {      {
619        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
620        /* XXX - semantics changed in 1.7 */        bool must_quote;
621        if (! ATOM_KEYWORD(node->pn_atom) && js_IsIdentifier(s)) {        if (JSSTRING_LENGTH(s) == 0) {
622          Stream_write_char(f, '.');          must_quote = true;
623          print_string_atom(node->pn_atom, f);        }
624          else if (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF) {
625            must_quote = true;
626          }
627          else if (! js_IsIdentifier(s)) {
628            must_quote = true;
629        }        }
630        else {        else {
631            must_quote = false;
632          }
633          if (must_quote) {
634          Stream_write_char(f, '[');          Stream_write_char(f, '[');
635          print_quoted_string_atom(node->pn_atom, f);          print_quoted_string_atom(node->pn_atom, f);
636          Stream_write_char(f, ']');          Stream_write_char(f, ']');
637        }        }
638          else {
639            Stream_write_char(f, '.');
640            print_string_atom(node->pn_atom, f);
641          }
642      }      }
643      break;      break;
644    case TOK_LB:    case TOK_LB:
# Line 494  Line 669 
669    case TOK_RC:    case TOK_RC:
670      Stream_write_char(f, '{');      Stream_write_char(f, '{');
671      for (struct JSParseNode * p = node->pn_head; p != NULL; p = p->pn_next) {      for (struct JSParseNode * p = node->pn_head; p != NULL; p = p->pn_next) {
672        assert(p->pn_type == TOK_COLON);        if (p->pn_type != TOK_COLON) {
673            fatal_source(file_id, p->pn_pos.begin.lineno, "unsupported node type (%d)", p->pn_type);
674          }
675        if (p != node->pn_head) {        if (p != node->pn_head) {
676          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
677        }        }
# Line 502  Line 679 
679        /* check whether this is a getter or setter */        /* check whether this is a getter or setter */
680        switch (p->pn_op) {        switch (p->pn_op) {
681        case JSOP_GETTER:        case JSOP_GETTER:
         Stream_write_string(f, "get ");  
         instrument_expression(p->pn_left, f);  
         instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);  
         break;  
682        case JSOP_SETTER:        case JSOP_SETTER:
683          Stream_write_string(f, "set ");          if (p->pn_op == JSOP_GETTER) {
684              Stream_write_string(f, "get ");
685            }
686            else {
687              Stream_write_string(f, "set ");
688            }
689          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
690            if (p->pn_right->pn_type != TOK_FUNCTION) {
691              fatal_source(file_id, p->pn_pos.begin.lineno, "expected function");
692            }
693          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);
694          break;          break;
695        default:        default:
# Line 531  Line 712 
712    case TOK_STRING:    case TOK_STRING:
713      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
714      break;      break;
715    case TOK_OBJECT:    case TOK_REGEXP:
716      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
717      case JSOP_OBJECT:      {
718        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
719        abort();        jsval result;
720        break;        js_regexp_toString(context, object, &result);
721      case JSOP_REGEXP:        print_regex(result, f);
       assert(ATOM_IS_OBJECT(node->pn_atom));  
       {  
         JSObject * object = ATOM_TO_OBJECT(node->pn_atom);  
         jsval result;  
         js_regexp_toString(context, object, 0, NULL, &result);  
         print_regex(result, f);  
       }  
       break;  
     default:  
       abort();  
       break;  
722      }      }
723      break;      break;
724    case TOK_NUMBER:    case TOK_NUMBER:
# Line 594  Line 764 
764      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
765      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
766      break;      break;
767    default:    case TOK_LEXICALSCOPE:
768      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      assert(node->pn_arity == PN_NAME);
769    }      assert(node->pn_expr->pn_type == TOK_LET);
770  }      assert(node->pn_expr->pn_arity == PN_BINARY);
771        Stream_write_string(f, "let(");
772  static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {      assert(node->pn_expr->pn_left->pn_type == TOK_LP);
773    assert(node->pn_arity == PN_LIST);      assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
774    Stream_printf(f, "%*s", indent, "");      instrument_declarations(node->pn_expr->pn_left, f);
775    Stream_write_string(f, "var ");      Stream_write_string(f, ") ");
776    for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      instrument_expression(node->pn_expr->pn_right, f);
777      assert(p->pn_type == TOK_NAME);      break;
778      assert(p->pn_arity == PN_NAME);    case TOK_YIELD:
779      if (p != node->pn_head) {      assert(node->pn_arity == PN_UNARY);
780        Stream_write_string(f, ", ");      Stream_write_string(f, "yield");
781        if (node->pn_kid != NULL) {
782          Stream_write_char(f, ' ');
783          instrument_expression(node->pn_kid, f);
784      }      }
785      print_string_atom(p->pn_atom, f);      break;
786      if (p->pn_expr != NULL) {    case TOK_ARRAYCOMP:
787        Stream_write_string(f, " = ");      assert(node->pn_arity == PN_LIST);
788        instrument_expression(p->pn_expr, f);      {
789          JSParseNode * block_node;
790          switch (node->pn_count) {
791          case 1:
792            block_node = node->pn_head;
793            break;
794          case 2:
795            block_node = node->pn_head->pn_next;
796            break;
797          default:
798            abort();
799            break;
800          }
801          Stream_write_char(f, '[');
802          output_array_comprehension_or_generator_expression(block_node, f);
803          Stream_write_char(f, ']');
804      }      }
805        break;
806      case TOK_VAR:
807        assert(node->pn_arity == PN_LIST);
808        Stream_write_string(f, "var ");
809        instrument_declarations(node, f);
810        break;
811      case TOK_LET:
812        assert(node->pn_arity == PN_LIST);
813        Stream_write_string(f, "let ");
814        instrument_declarations(node, f);
815        break;
816      default:
817        fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
818    }    }
819  }  }
820    
821  static void output_statement(JSParseNode * node, Stream * f, int indent) {  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
822    switch (node->pn_type) {    switch (node->pn_type) {
823    case TOK_FUNCTION:    case TOK_FUNCTION:
824      instrument_function(node, f, indent, FUNCTION_NORMAL);      instrument_function(node, f, indent, FUNCTION_NORMAL);
# Line 628  Line 829 
829      Stream_write_string(f, "{\n");      Stream_write_string(f, "{\n");
830  */  */
831      for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {
832        instrument_statement(p, f, indent);        instrument_statement(p, f, indent, false);
833      }      }
834  /*  /*
835      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
# Line 636  Line 837 
837  */  */
838      break;      break;
839    case TOK_IF:    case TOK_IF:
840      {
841      assert(node->pn_arity == PN_TERNARY);      assert(node->pn_arity == PN_TERNARY);
842    
843        uint16_t line = node->pn_pos.begin.lineno;
844        if (! is_jscoverage_if) {
845          if (line > num_lines) {
846            fatal("file %s contains more than 65,535 lines", file_id);
847          }
848          if (line >= 2 && exclusive_directives[line - 2]) {
849            is_jscoverage_if = true;
850          }
851        }
852    
853      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
854      Stream_write_string(f, "if (");      Stream_write_string(f, "if (");
855      instrument_expression(node->pn_kid1, f);      instrument_expression(node->pn_kid1, f);
856      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
857      instrument_statement(node->pn_kid2, f, indent + 2);      if (is_jscoverage_if && node->pn_kid3) {
858          uint16_t else_start = node->pn_kid3->pn_pos.begin.lineno;
859          uint16_t else_end = node->pn_kid3->pn_pos.end.lineno + 1;
860          Stream_printf(f, "%*s", indent + 2, "");
861          Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, else_start, else_end);
862        }
863        instrument_statement(node->pn_kid2, f, indent + 2, false);
864      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
865      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
866      if (node->pn_kid3) {  
867        if (node->pn_kid3 || is_jscoverage_if) {
868        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
869        Stream_write_string(f, "else {\n");        Stream_write_string(f, "else {\n");
870        instrument_statement(node->pn_kid3, f, indent + 2);  
871          if (is_jscoverage_if) {
872            uint16_t if_start = node->pn_kid2->pn_pos.begin.lineno + 1;
873            uint16_t if_end = node->pn_kid2->pn_pos.end.lineno + 1;
874            Stream_printf(f, "%*s", indent + 2, "");
875            Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_start, if_end);
876          }
877    
878          if (node->pn_kid3) {
879            instrument_statement(node->pn_kid3, f, indent + 2, is_jscoverage_if);
880          }
881    
882        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
883        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
884      }      }
885    
886      break;      break;
887      }
888    case TOK_SWITCH:    case TOK_SWITCH:
889      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
890      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
891      Stream_write_string(f, "switch (");      Stream_write_string(f, "switch (");
892      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
893      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
894      for (struct JSParseNode * p = node->pn_right->pn_head; p != NULL; p = p->pn_next) {      {
895        Stream_printf(f, "%*s", indent, "");        JSParseNode * list = node->pn_right;
896        switch (p->pn_type) {        if (list->pn_type == TOK_LEXICALSCOPE) {
897        case TOK_CASE:          list = list->pn_expr;
898          Stream_write_string(f, "case ");        }
899          instrument_expression(p->pn_left, f);        for (struct JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
900          Stream_write_string(f, ":\n");          Stream_printf(f, "%*s", indent, "");
901          break;          switch (p->pn_type) {
902        case TOK_DEFAULT:          case TOK_CASE:
903          Stream_write_string(f, "default:\n");            Stream_write_string(f, "case ");
904          break;            instrument_expression(p->pn_left, f);
905        default:            Stream_write_string(f, ":\n");
906          abort();            break;
907          break;          case TOK_DEFAULT:
908              Stream_write_string(f, "default:\n");
909              break;
910            default:
911              abort();
912              break;
913            }
914            instrument_statement(p->pn_right, f, indent + 2, false);
915        }        }
       instrument_statement(p->pn_right, f, indent + 2);  
916      }      }
917      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
918      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 688  Line 927 
927      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
928      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
929      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
930      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
931      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
932      break;      break;
933    case TOK_DO:    case TOK_DO:
934      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
935      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
936      Stream_write_string(f, "do {\n");      Stream_write_string(f, "do {\n");
937      instrument_statement(node->pn_left, f, indent + 2);      instrument_statement(node->pn_left, f, indent + 2, false);
938      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
939      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
940      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
# Line 705  Line 944 
944    case TOK_FOR:    case TOK_FOR:
945      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
946      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
947      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
948      case TOK_IN:      case TOK_IN:
949        /* for/in */        /* for/in */
950        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
951        switch (node->pn_left->pn_left->pn_type) {        output_for_in(node, f);
       case TOK_VAR:  
         instrument_var_statement(node->pn_left->pn_left, f, 0);  
         break;  
       case TOK_NAME:  
         instrument_expression(node->pn_left->pn_left, f);  
         break;  
       default:  
         /* this is undocumented: for (x.value in y) */  
         instrument_expression(node->pn_left->pn_left, f);  
         break;  
 /*  
       default:  
         fprintf(stderr, "unexpected node type: %d\n", node->pn_left->pn_left->pn_type);  
         abort();  
         break;  
 */  
       }  
       Stream_write_string(f, " in ");  
       instrument_expression(node->pn_left->pn_right, f);  
952        break;        break;
953      case TOK_RESERVED:      case TOK_RESERVED:
954        /* for (;;) */        /* for (;;) */
955        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
956          Stream_write_string(f, "for (");
957        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
958          if (node->pn_left->pn_kid1->pn_type == TOK_VAR) {          instrument_expression(node->pn_left->pn_kid1, f);
           instrument_var_statement(node->pn_left->pn_kid1, f, 0);  
         }  
         else {  
           instrument_expression(node->pn_left->pn_kid1, f);  
         }  
959        }        }
960        Stream_write_string(f, ";");        Stream_write_string(f, ";");
961        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 752  Line 967 
967          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
968          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
969        }        }
970          Stream_write_char(f, ')');
971        break;        break;
972      default:      default:
973        abort();        abort();
974        break;        break;
975      }      }
976      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
977      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
978      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
979      break;      break;
980    case TOK_THROW:    case TOK_THROW:
# Line 771  Line 987 
987    case TOK_TRY:    case TOK_TRY:
988      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
989      Stream_write_string(f, "try {\n");      Stream_write_string(f, "try {\n");
990      instrument_statement(node->pn_kid1, f, indent + 2);      instrument_statement(node->pn_kid1, f, indent + 2, false);
991      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
992      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
993      {      if (node->pn_kid2) {
994        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
995          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
996            assert(scope->pn_type == TOK_LEXICALSCOPE);
997            JSParseNode * catch = scope->pn_expr;
998          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
999          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1000          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
1001            /* this may not be a name - destructuring assignment */
1002            /*
1003          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
1004          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
1005          if (catch->pn_kid1->pn_expr) {          */
1006            instrument_expression(catch->pn_kid1, f);
1007            if (catch->pn_kid2) {
1008            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1009            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
1010          }          }
1011          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
1012          instrument_statement(catch->pn_kid3, f, indent + 2);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
1013          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1014          Stream_write_string(f, "}\n");          Stream_write_string(f, "}\n");
1015        }        }
# Line 794  Line 1017 
1017      if (node->pn_kid3) {      if (node->pn_kid3) {
1018        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1019        Stream_write_string(f, "finally {\n");        Stream_write_string(f, "finally {\n");
1020        instrument_statement(node->pn_kid3, f, indent + 2);        instrument_statement(node->pn_kid3, f, indent + 2, false);
1021        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1022        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
1023      }      }
# Line 820  Line 1043 
1043      Stream_write_string(f, "with (");      Stream_write_string(f, "with (");
1044      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
1045      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
1046      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
1047      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1048      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1049      break;      break;
1050    case TOK_VAR:    case TOK_VAR:
1051      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1052        instrument_expression(node, f);
1053      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1054      break;      break;
1055    case TOK_RETURN:    case TOK_RETURN:
# Line 858  Line 1082 
1082      /*      /*
1083      ... use output_statement instead of instrument_statement.      ... use output_statement instead of instrument_statement.
1084      */      */
1085      output_statement(node->pn_expr, f, indent);      output_statement(node->pn_expr, f, indent, false);
1086        break;
1087      case TOK_LEXICALSCOPE:
1088        /* let statement */
1089        assert(node->pn_arity == PN_NAME);
1090        switch (node->pn_expr->pn_type) {
1091        case TOK_LET:
1092          /* let statement */
1093          assert(node->pn_expr->pn_arity == PN_BINARY);
1094          instrument_statement(node->pn_expr, f, indent, false);
1095          break;
1096        case TOK_LC:
1097          /* block */
1098          Stream_printf(f, "%*s", indent, "");
1099          Stream_write_string(f, "{\n");
1100          instrument_statement(node->pn_expr, f, indent + 2, false);
1101          Stream_printf(f, "%*s", indent, "");
1102          Stream_write_string(f, "}\n");
1103          break;
1104        case TOK_FOR:
1105          instrument_statement(node->pn_expr, f, indent, false);
1106          break;
1107        default:
1108          abort();
1109          break;
1110        }
1111        break;
1112      case TOK_LET:
1113        switch (node->pn_arity) {
1114        case PN_BINARY:
1115          /* let statement */
1116          Stream_printf(f, "%*s", indent, "");
1117          Stream_write_string(f, "let (");
1118          assert(node->pn_left->pn_type == TOK_LP);
1119          assert(node->pn_left->pn_arity == PN_LIST);
1120          instrument_declarations(node->pn_left, f);
1121          Stream_write_string(f, ") {\n");
1122          instrument_statement(node->pn_right, f, indent + 2, false);
1123          Stream_printf(f, "%*s", indent, "");
1124          Stream_write_string(f, "}\n");
1125          break;
1126        case PN_LIST:
1127          /* let definition */
1128          Stream_printf(f, "%*s", indent, "");
1129          instrument_expression(node, f);
1130          Stream_write_string(f, ";\n");
1131          break;
1132        default:
1133          abort();
1134          break;
1135        }
1136        break;
1137      case TOK_DEBUGGER:
1138        Stream_printf(f, "%*s", indent, "");
1139        Stream_write_string(f, "debugger;\n");
1140      break;      break;
1141    default:    default:
1142      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
1143    }    }
1144  }  }
1145    
# Line 870  Line 1148 
1148  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
1149  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1150  */  */
1151  static void instrument_statement(JSParseNode * node, Stream * f, int indent) {  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
1152    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1153      int line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1154        if (line > num_lines) {
1155          fatal("file %s contains more than 65,535 lines", file_id);
1156        }
1157    
1158      /* the root node has line number 0 */      /* the root node has line number 0 */
1159      if (line != 0) {      if (line != 0) {
1160        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
# Line 880  Line 1162 
1162        lines[line - 1] = 1;        lines[line - 1] = 1;
1163      }      }
1164    }    }
1165    output_statement(node, f, indent);    output_statement(node, f, indent, is_jscoverage_if);
1166  }  }
1167    
1168  void jscoverage_instrument_js(const char * id, const char * encoding, Stream * input, Stream * output) {  static bool characters_start_with(const jschar * characters, size_t line_start, size_t line_end, const char * prefix) {
1169    file_id = id;    const jschar * characters_end = characters + line_end;
1170      const jschar * cp = characters + line_start;
1171      const char * bp = prefix;
1172      for (;;) {
1173        if (*bp == '\0') {
1174          return true;
1175        }
1176        else if (cp == characters_end) {
1177          return false;
1178        }
1179        else if (*cp != *bp) {
1180          return false;
1181        }
1182        bp++;
1183        cp++;
1184      }
1185    }
1186    
1187    /* scan the javascript */  static bool characters_are_white_space(const jschar * characters, size_t line_start, size_t line_end) {
1188    size_t input_length = input->length;    /* XXX - other Unicode space */
1189    jschar * base = NULL;    const jschar * end = characters + line_end;
1190    int result = jscoverage_bytes_to_characters(encoding, input->data, input->length, &base, &input_length);    for (const jschar * p = characters + line_start; p < end; p++) {
1191    if (result == JSCOVERAGE_ERROR_ENCODING_NOT_SUPPORTED) {      jschar c = *p;
1192      fatal("encoding %s not supported in file %s", encoding, id);      if (c == 0x9 || c == 0xB || c == 0xC || c == 0x20 || c == 0xA0) {
1193    }        continue;
1194    else if (result == JSCOVERAGE_ERROR_INVALID_BYTE_SEQUENCE) {      }
1195      fatal("error decoding %s in file %s", encoding, id);      else {
1196    }        return false;
1197    JSTokenStream * token_stream = js_NewTokenStream(context, base, input_length, NULL, 1, NULL);      }
   if (token_stream == NULL) {  
     fatal("cannot create token stream from file: %s", file_id);  
1198    }    }
1199      return true;
1200    }
1201    
1202    static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1203      fatal_source(file_id, report->lineno, message);
1204    }
1205    
1206    void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {
1207      file_id = id;
1208    
1209    /* parse the javascript */    /* parse the javascript */
1210    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseContext parse_context;
1211      if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1212        fatal("cannot create token stream from file %s", file_id);
1213      }
1214      JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1215      JSParseNode * node = js_ParseScript(context, global, &parse_context);
1216    if (node == NULL) {    if (node == NULL) {
1217      fatal("parse error in file: %s", file_id);      js_ReportUncaughtException(context);
1218        fatal("parse error in file %s", file_id);
1219    }    }
1220    int num_lines = node->pn_pos.end.lineno;    JS_SetErrorReporter(context, old_error_reporter);
1221      num_lines = node->pn_pos.end.lineno;
1222    lines = xmalloc(num_lines);    lines = xmalloc(num_lines);
1223    for (int i = 0; i < num_lines; i++) {    for (unsigned int i = 0; i < num_lines; i++) {
1224      lines[i] = 0;      lines[i] = 0;
1225    }    }
1226    
1227      /* search code for conditionals */
1228      exclusive_directives = xnew(bool, num_lines);
1229      for (unsigned int i = 0; i < num_lines; i++) {
1230        exclusive_directives[i] = false;
1231      }
1232    
1233      bool has_conditionals = false;
1234      struct IfDirective * if_directives = NULL;
1235      size_t line_number = 0;
1236      size_t i = 0;
1237      while (i < num_characters) {
1238        if (line_number == UINT16_MAX) {
1239          fatal("file %s contains more than 65,535 lines", file_id);
1240        }
1241        line_number++;
1242        size_t line_start = i;
1243        jschar c;
1244        bool done = false;
1245        while (! done && i < num_characters) {
1246          c = characters[i];
1247          switch (c) {
1248          case '\r':
1249          case '\n':
1250          case 0x2028:
1251          case 0x2029:
1252            done = true;
1253            break;
1254          default:
1255            i++;
1256          }
1257        }
1258        size_t line_end = i;
1259        if (i < num_characters) {
1260          i++;
1261          if (c == '\r' && i < num_characters && characters[i] == '\n') {
1262            i++;
1263          }
1264        }
1265    
1266        if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_IF")) {
1267          has_conditionals = true;
1268    
1269          if (characters_are_white_space(characters, line_start + 16, line_end)) {
1270            exclusive_directives[line_number - 1] = true;
1271          }
1272          else {
1273            struct IfDirective * if_directive = xnew(struct IfDirective, 1);
1274            if_directive->condition_start = characters + line_start + 16;
1275            if_directive->condition_end = characters + line_end;
1276            if_directive->start_line = line_number;
1277            if_directive->end_line = 0;
1278            if_directive->next = if_directives;
1279            if_directives = if_directive;
1280          }
1281        }
1282        else if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_ENDIF")) {
1283          for (struct IfDirective * p = if_directives; p != NULL; p = p->next) {
1284            if (p->end_line == 0) {
1285              p->end_line = line_number;
1286              break;
1287            }
1288          }
1289        }
1290      }
1291    
1292    /*    /*
1293    An instrumented JavaScript file has 3 sections:    An instrumented JavaScript file has 4 sections:
1294    1. initialization    1. initialization
1295    2. instrumented source code    2. instrumented source code
1296    3. original source code    3. conditionals
1297      4. original source code
1298    */    */
1299    
1300    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1301    instrument_statement(node, instrumented, 0);    instrument_statement(node, instrumented, 0, false);
1302      js_FinishParseContext(context, &parse_context);
1303    
1304    /* write line number info to the output */    /* write line number info to the output */
1305    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
1306    Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");    if (jscoverage_mozilla) {
1307    Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");      Stream_write_string(output, "try {\n");
1308        Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
1309        Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
1310        Stream_write_string(output, "}\n");
1311        Stream_write_string(output, "catch (e) {\n");
1312        Stream_write_string(output, "  _$jscoverage = {};\n");
1313        Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
1314        Stream_write_string(output, "}\n");
1315      }
1316      else {
1317        Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
1318        Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
1319      }
1320    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
1321    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
1322    for (int i = 0; i < num_lines; i++) {    for (int i = 0; i < num_lines; i++) {
# Line 936  Line 1327 
1327    Stream_write_string(output, "}\n");    Stream_write_string(output, "}\n");
1328    free(lines);    free(lines);
1329    lines = NULL;    lines = NULL;
1330      free(exclusive_directives);
1331      exclusive_directives = NULL;
1332    
1333      /* conditionals */
1334      if (has_conditionals) {
1335        Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);
1336      }
1337    
1338    /* copy the instrumented source code to the output */    /* copy the instrumented source code to the output */
1339    Stream_write(output, instrumented->data, instrumented->length);    Stream_write(output, instrumented->data, instrumented->length);
   Stream_write_char(output, '\n');  
1340    
1341    /* conditionals */    /* conditionals */
1342    bool has_conditionals = false;    for (struct IfDirective * if_directive = if_directives; if_directive != NULL; if_directive = if_directive->next) {
1343    size_t line_number = 0;      Stream_write_string(output, "if (!(");
1344    size_t i = 0;      print_javascript(if_directive->condition_start, if_directive->condition_end - if_directive->condition_start, output);
1345    while (i < input_length) {      Stream_write_string(output, ")) {\n");
1346      line_number++;      Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_directive->start_line, if_directive->end_line);
1347      size_t line_start = i;      Stream_write_string(output, "}\n");
1348      while (i < input_length && base[i] != '\r' && base[i] != '\n') {    }
1349        i++;  
1350      }    /* free */
1351      size_t line_end = i;    while (if_directives != NULL) {
1352      if (i < input_length) {      struct IfDirective * if_directive = if_directives;
1353        if (base[i] == '\r') {      if_directives = if_directives->next;
1354          line_end = i;      free(if_directive);
         i++;  
         if (i < input_length && base[i] == '\n') {  
           i++;  
         }  
       }  
       else if (base[i] == '\n') {  
         line_end = i;  
         i++;  
       }  
       else {  
         abort();  
       }  
     }  
     char * line = js_DeflateString(context, base + line_start, line_end - line_start);  
     if (str_starts_with(line, "//#JSCOVERAGE_IF")) {  
       if (! has_conditionals) {  
         has_conditionals = true;  
         Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);  
       }  
       Stream_printf(output, "if (!%s) {\n", line + 16);  
       Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = ", file_id, line_number);  
     }  
     else if (str_starts_with(line, "//#JSCOVERAGE_ENDIF")) {  
       Stream_printf(output, "%d;\n", line_number);  
       Stream_printf(output, "}\n");  
     }  
     JS_free(context, line);  
1355    }    }
1356    
1357    /* copy the original source to the output */    /* copy the original source to the output */
1358    i = 0;    Stream_printf(output, "_$jscoverage['%s'].source = ", file_id);
1359    while (i < input_length) {    jscoverage_write_source(id, characters, num_characters, output);
1360      Stream_write_string(output, "// ");    Stream_printf(output, ";\n");
     size_t line_start = i;  
     while (i < input_length && base[i] != '\r' && base[i] != '\n') {  
       i++;  
     }  
1361    
1362      size_t line_end = i;    Stream_delete(instrumented);
1363      if (i < input_length) {  
1364        if (base[i] == '\r') {    file_id = NULL;
1365          line_end = i;  }
1366    
1367    void jscoverage_write_source(const char * id, const jschar * characters, size_t num_characters, Stream * output) {
1368      Stream_write_string(output, "[");
1369      if (jscoverage_highlight) {
1370        Stream * highlighted_stream = Stream_new(num_characters);
1371        jscoverage_highlight_js(context, id, characters, num_characters, highlighted_stream);
1372        size_t i = 0;
1373        while (i < highlighted_stream->length) {
1374          if (i > 0) {
1375            Stream_write_char(output, ',');
1376          }
1377    
1378          Stream_write_char(output, '"');
1379          bool done = false;
1380          while (! done) {
1381            char c = highlighted_stream->data[i];
1382            switch (c) {
1383            case 0x8:
1384              /* backspace */
1385              Stream_write_string(output, "\\b");
1386              break;
1387            case 0x9:
1388              /* horizontal tab */
1389              Stream_write_string(output, "\\t");
1390              break;
1391            case 0xa:
1392              /* line feed (new line) */
1393              done = true;
1394              break;
1395            /* IE doesn't support this */
1396            /*
1397            case 0xb:
1398              Stream_write_string(output, "\\v");
1399              break;
1400            */
1401            case 0xc:
1402              /* form feed */
1403              Stream_write_string(output, "\\f");
1404              break;
1405            case 0xd:
1406              /* carriage return */
1407              done = true;
1408              if (i + 1 < highlighted_stream->length && highlighted_stream->data[i + 1] == '\n') {
1409                i++;
1410              }
1411              break;
1412            case '"':
1413              Stream_write_string(output, "\\\"");
1414              break;
1415            case '\\':
1416              Stream_write_string(output, "\\\\");
1417              break;
1418            default:
1419              Stream_write_char(output, c);
1420              break;
1421            }
1422          i++;          i++;
1423          if (i < input_length && base[i] == '\n') {          if (i >= highlighted_stream->length) {
1424            i++;            done = true;
1425          }          }
1426        }        }
1427        else if (base[i] == '\n') {        Stream_write_char(output, '"');
1428          line_end = i;      }
1429        Stream_delete(highlighted_stream);
1430      }
1431      else {
1432        size_t i = 0;
1433        while (i < num_characters) {
1434          if (i > 0) {
1435            Stream_write_char(output, ',');
1436          }
1437    
1438          Stream_write_char(output, '"');
1439          bool done = false;
1440          while (! done) {
1441            jschar c = characters[i];
1442            switch (c) {
1443            case 0x8:
1444              /* backspace */
1445              Stream_write_string(output, "\\b");
1446              break;
1447            case 0x9:
1448              /* horizontal tab */
1449              Stream_write_string(output, "\\t");
1450              break;
1451            case 0xa:
1452              /* line feed (new line) */
1453              done = true;
1454              break;
1455            /* IE doesn't support this */
1456            /*
1457            case 0xb:
1458              Stream_write_string(output, "\\v");
1459              break;
1460            */
1461            case 0xc:
1462              /* form feed */
1463              Stream_write_string(output, "\\f");
1464              break;
1465            case 0xd:
1466              /* carriage return */
1467              done = true;
1468              if (i + 1 < num_characters && characters[i + 1] == '\n') {
1469                i++;
1470              }
1471              break;
1472            case '"':
1473              Stream_write_string(output, "\\\"");
1474              break;
1475            case '\\':
1476              Stream_write_string(output, "\\\\");
1477              break;
1478            case '&':
1479              Stream_write_string(output, "&amp;");
1480              break;
1481            case '<':
1482              Stream_write_string(output, "&lt;");
1483              break;
1484            case '>':
1485              Stream_write_string(output, "&gt;");
1486              break;
1487            case 0x2028:
1488            case 0x2029:
1489              done = true;
1490              break;
1491            default:
1492              if (32 <= c && c <= 126) {
1493                Stream_write_char(output, c);
1494              }
1495              else {
1496                Stream_printf(output, "&#%d;", c);
1497              }
1498              break;
1499            }
1500          i++;          i++;
1501            if (i >= num_characters) {
1502              done = true;
1503            }
1504        }        }
1505        else {        Stream_write_char(output, '"');
         abort();  
       }  
1506      }      }
   
     char * line = js_DeflateString(context, base + line_start, line_end - line_start);  
     Stream_write_string(output, line);  
     Stream_write_char(output, '\n');  
     JS_free(context, line);  
1507    }    }
1508      Stream_write_string(output, "]");
   Stream_delete(instrumented);  
   
   JS_free(context, base);  
   
   file_id = NULL;  
1509  }  }
1510    
1511  void jscoverage_copy_resources(const char * destination_directory) {  void jscoverage_copy_resources(const char * destination_directory) {
# Line 1030  Line 1514 
1514    copy_resource("jscoverage.js", destination_directory);    copy_resource("jscoverage.js", destination_directory);
1515    copy_resource("jscoverage-ie.css", destination_directory);    copy_resource("jscoverage-ie.css", destination_directory);
1516    copy_resource("jscoverage-throbber.gif", destination_directory);    copy_resource("jscoverage-throbber.gif", destination_directory);
1517    copy_resource("jscoverage-sh_main.js", destination_directory);    copy_resource("jscoverage-highlight.css", destination_directory);
   copy_resource("jscoverage-sh_javascript.js", destination_directory);  
   copy_resource("jscoverage-sh_nedit.css", destination_directory);  
1518  }  }
1519    
1520  /*  /*
# Line 1067  Line 1549 
1549    JS_HashTableDestroy(coverage->coverage_table);    JS_HashTableDestroy(coverage->coverage_table);
1550    struct FileCoverageList * p = coverage->coverage_list;    struct FileCoverageList * p = coverage->coverage_list;
1551    while (p != NULL) {    while (p != NULL) {
1552      free(p->file_coverage->lines);      free(p->file_coverage->coverage_lines);
1553      free(p->file_coverage->source);      if (p->file_coverage->source_lines != NULL) {
1554          for (uint32 i = 0; i < p->file_coverage->num_source_lines; i++) {
1555            free(p->file_coverage->source_lines[i]);
1556          }
1557          free(p->file_coverage->source_lines);
1558        }
1559      free(p->file_coverage->id);      free(p->file_coverage->id);
1560      free(p->file_coverage);      free(p->file_coverage);
1561      struct FileCoverageList * q = p;      struct FileCoverageList * q = p;
# Line 1097  Line 1584 
1584  }  }
1585    
1586  int jscoverage_parse_json(Coverage * coverage, const uint8_t * json, size_t length) {  int jscoverage_parse_json(Coverage * coverage, const uint8_t * json, size_t length) {
1587      int result = 0;
1588    
1589    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1590    if (base == NULL) {    if (base == NULL) {
1591      fatal("out of memory");      fatal("out of memory");
# Line 1109  Line 1598 
1598    
1599    JS_free(context, base);    JS_free(context, base);
1600    
1601    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1602    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1603      fatal("cannot create token stream");      free(parenthesized_json);
1604        return -1;
1605    }    }
1606      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1607    free(parenthesized_json);    free(parenthesized_json);
1608    if (root == NULL) {    if (root == NULL) {
1609      return -1;      result = -1;
1610        goto done;
1611    }    }
1612    
1613    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1614    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1615      return -1;      result = -1;
1616        goto done;
1617    }    }
1618    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1619    
1620    /* the list must be TOK_SEMI and it must contain only one element */    /* the list must be TOK_SEMI and it must contain only one element */
1621    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1622      return -1;      result = -1;
1623        goto done;
1624    }    }
1625    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1626    
1627    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1628    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1629      return -1;      result = -1;
1630        goto done;
1631    }    }
1632    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1633    
1634    /* this must be an object literal */    /* this must be an object literal */
1635    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1636      return -1;      result = -1;
1637        goto done;
1638    }    }
1639    
1640    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1641      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1642      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1643        return -1;        result = -1;
1644          goto done;
1645      }      }
1646    
1647      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1648      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1649      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1650        return -1;        result = -1;
1651          goto done;
1652      }      }
1653      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1654    
1655      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1656      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1657      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1658        return -1;        result = -1;
1659          goto done;
1660      }      }
1661    
1662      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1171  Line 1668 
1668      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1669        /* an object literal */        /* an object literal */
1670        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1671          return -1;          result = -1;
1672            goto done;
1673        }        }
1674        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1675          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1676            return -1;            result = -1;
1677              goto done;
1678          }          }
1679          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1680          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1681            return -1;            result = -1;
1682              goto done;
1683          }          }
1684          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1685          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1686            array = element->pn_right;            array = element->pn_right;
1687            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1688              return -1;              result = -1;
1689                goto done;
1690            }            }
1691          }          }
1692          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1693            source = element->pn_right;            source = element->pn_right;
1694            if (source->pn_type != TOK_STRING || ! ATOM_IS_STRING(source->pn_atom)) {            if (source->pn_type != TOK_RB) {
1695              return -1;              result = -1;
1696                goto done;
1697            }            }
1698          }          }
1699          else {          else {
1700            return -1;            result = -1;
1701              goto done;
1702          }          }
1703        }        }
1704      }      }
1705      else {      else {
1706        return -1;        result = -1;
1707          goto done;
1708      }      }
1709    
1710      if (array == NULL) {      if (array == NULL) {
1711        return -1;        result = -1;
1712          goto done;
1713      }      }
1714    
1715      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1214  Line 1719 
1719        char * id = xstrdup(id_bytes);        char * id = xstrdup(id_bytes);
1720        file_coverage = xmalloc(sizeof(FileCoverage));        file_coverage = xmalloc(sizeof(FileCoverage));
1721        file_coverage->id = id;        file_coverage->id = id;
1722        file_coverage->num_lines = array->pn_count - 1;        file_coverage->num_coverage_lines = array->pn_count;
1723        file_coverage->lines = xnew(int, array->pn_count);        file_coverage->coverage_lines = xnew(int, array->pn_count);
1724        if (source == NULL) {        file_coverage->source_lines = NULL;
         file_coverage->source = NULL;  
       }  
       else {  
         file_coverage->source = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(source->pn_atom)));  
       }  
1725    
1726        /* set coverage for all lines */        /* set coverage for all lines */
1727        uint32 i = 0;        uint32 i = 0;
1728        for (JSParseNode * element = array->pn_head; element != NULL; element = element->pn_next, i++) {        for (JSParseNode * element = array->pn_head; element != NULL; element = element->pn_next, i++) {
1729          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1730            file_coverage->lines[i] = (int) element->pn_dval;            file_coverage->coverage_lines[i] = (int) element->pn_dval;
1731          }          }
1732          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1733            file_coverage->lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1734          }          }
1735          else {          else {
1736            return -1;            result = -1;
1737              goto done;
1738          }          }
1739        }        }
1740        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1248  Line 1749 
1749      else {      else {
1750        /* sanity check */        /* sanity check */
1751        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1752        if (file_coverage->num_lines != array->pn_count - 1) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1753          return -2;          result = -2;
1754            goto done;
1755        }        }
1756    
1757        /* merge the coverage */        /* merge the coverage */
1758        uint32 i = 0;        uint32 i = 0;
1759        for (JSParseNode * element = array->pn_head; element != NULL; element = element->pn_next, i++) {        for (JSParseNode * element = array->pn_head; element != NULL; element = element->pn_next, i++) {
1760          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1761            if (file_coverage->lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1762              return -2;              result = -2;
1763                goto done;
1764            }            }
1765            file_coverage->lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1766          }          }
1767          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1768            if (file_coverage->lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1769              return -2;              result = -2;
1770                goto done;
1771            }            }
1772          }          }
1773          else {          else {
1774            return -1;            result = -1;
1775              goto done;
1776          }          }
1777        }        }
1778        assert(i == array->pn_count);        assert(i == array->pn_count);
1779        }
1780    
1781        /* if this JSON file has source, use it */      /* if this JSON file has source, use it */
1782        if (file_coverage->source == NULL && source != NULL) {      if (file_coverage->source_lines == NULL && source != NULL) {
1783          file_coverage->source = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(source->pn_atom)));        file_coverage->num_source_lines = source->pn_count;
1784          file_coverage->source_lines = xnew(char *, source->pn_count);
1785          uint32 i = 0;
1786          for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {
1787            if (element->pn_type != TOK_STRING) {
1788              result = -1;
1789              goto done;
1790            }
1791            file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));
1792        }        }
1793          assert(i == source->pn_count);
1794      }      }
1795    }    }
1796    
1797    return 0;  done:
1798      js_FinishParseContext(context, &parse_context);
1799      return result;
1800  }  }

Legend:
Removed from v.174  
changed lines
  Added in v.370

  ViewVC Help
Powered by ViewVC 1.1.24