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

Diff of /trunk/instrument-js.c

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

revision 336 by siliconforks, Thu Oct 23 20:08:29 2008 UTC revision 372 by siliconforks, Mon Oct 27 20:36:23 2008 UTC
# Line 28  Line 28 
28  #include <jsapi.h>  #include <jsapi.h>
29  #include <jsarena.h>  #include <jsarena.h>
30  #include <jsatom.h>  #include <jsatom.h>
31    #include <jsemit.h>
32  #include <jsexn.h>  #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>
# Line 50  Line 52 
52    struct IfDirective * next;    struct IfDirective * next;
53  };  };
54    
55    bool jscoverage_mozilla = false;
56    
57  static bool * exclusive_directives = NULL;  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 64  Line 69 
69  static char * lines = NULL;  static char * lines = NULL;
70  static uint16_t num_lines = 0;  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);
87    if (runtime == NULL) {    if (runtime == NULL) {
# Line 75  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 249  Line 269 
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, bool is_jscoverage_if);  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);    assert(node->pn_type == TOK_FUNCTION);
330    assert(node->pn_arity == PN_FUNC);    assert(node->pn_arity == PN_FUNC);
# Line 265  Line 335 
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 ");
339    }    }
340    
341    /* function name */    /* function name */
342    if (function->atom) {    if (function->atom) {
     Stream_write_char(f, ' ');  
343      print_string_atom(function->atom, f);      print_string_atom(function->atom, f);
344    }    }
345    
# Line 278  Line 347 
347    function parameters - see JS_DecompileFunction in jsapi.cpp, which calls    function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
348    js_DecompileFunction in jsopcode.cpp    js_DecompileFunction in jsopcode.cpp
349    */    */
350    Stream_write_string(f, "(");    Stream_write_char(f, '(');
351    JSArenaPool pool;    JSArenaPool pool;
352    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
353    jsuword * local_names = NULL;    jsuword * local_names = NULL;
# Line 293  Line 362 
362        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
363      }      }
364      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
365        if (param == NULL) {
366          fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported parameter type for function");
367        }
368      print_string_atom(param, f);      print_string_atom(param, f);
369    }    }
370    JS_FinishArenaPool(&pool);    JS_FinishArenaPool(&pool);
371    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
372    
373    /* function body */    /* function body */
374    instrument_statement(node->pn_body, f, indent + 2, false);    if (function->flags & JSFUN_EXPR_CLOSURE) {
375        /* expression closure */
376        output_statement(node->pn_body, f, indent + 2, false);
377      }
378      else {
379        instrument_statement(node->pn_body, f, indent + 2, false);
380      }
381    
382    Stream_write_string(f, "}\n");    Stream_write_string(f, "}\n");
383  }  }
384    
385  static void instrument_function_call(JSParseNode * node, Stream * f) {  static void instrument_function_call(JSParseNode * node, Stream * f) {
386    instrument_expression(node->pn_head, f);    JSParseNode * function_node = node->pn_head;
387      if (function_node->pn_type == TOK_FUNCTION) {
388        JSObject * object = function_node->pn_funpob->object;
389        assert(JS_ObjectIsFunction(context, object));
390        JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
391        assert(function);
392        assert(object == &function->object);
393    
394        if (function_node->pn_flags & TCF_GENEXP_LAMBDA) {
395          /* it's a generator expression */
396          Stream_write_char(f, '(');
397          output_array_comprehension_or_generator_expression(function_node->pn_body, f);
398          Stream_write_char(f, ')');
399          return;
400        }
401        else {
402          Stream_write_char(f, '(');
403          instrument_expression(function_node, f);
404          Stream_write_char(f, ')');
405        }
406      }
407      else {
408        instrument_expression(function_node, f);
409      }
410    Stream_write_char(f, '(');    Stream_write_char(f, '(');
411    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) {
412      if (p != node->pn_head->pn_next) {      if (p != node->pn_head->pn_next) {
413        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
414      }      }
# Line 316  Line 417 
417    Stream_write_char(f, ')');    Stream_write_char(f, ')');
418  }  }
419    
420    static void instrument_declarations(JSParseNode * list, Stream * f) {
421      assert(list->pn_arity == PN_LIST);
422      for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
423        switch (p->pn_type) {
424        case TOK_NAME:
425          assert(p->pn_arity == PN_NAME);
426          if (p != list->pn_head) {
427            Stream_write_string(f, ", ");
428          }
429          print_string_atom(p->pn_atom, f);
430          if (p->pn_expr != NULL) {
431            Stream_write_string(f, " = ");
432            instrument_expression(p->pn_expr, f);
433          }
434          break;
435        case TOK_ASSIGN:
436        case TOK_RB:
437        case TOK_RC:
438          /* destructuring */
439          instrument_expression(p, f);
440          break;
441        default:
442          abort();
443          break;
444        }
445      }
446    }
447    
448  /*  /*
449  See <Expressions> in jsparse.h.  See <Expressions> in jsparse.h.
450  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
# Line 430  Line 559 
559        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
560        break;        break;
561      default:      default:
562        abort();        fatal_source(file_id, node->pn_pos.begin.lineno, "unknown operator (%d)", node->pn_op);
563        break;        break;
564      }      }
565      break;      break;
# Line 487  Line 616 
616      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
617      {      {
618        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
619        bool is_keyword = (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF);        bool must_quote;
620        if (! is_keyword && js_IsIdentifier(s)) {        if (JSSTRING_LENGTH(s) == 0) {
621          Stream_write_char(f, '.');          must_quote = true;
622          print_string_atom(node->pn_atom, f);        }
623          else if (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF) {
624            must_quote = true;
625          }
626          else if (! js_IsIdentifier(s)) {
627            must_quote = true;
628        }        }
629        else {        else {
630            must_quote = false;
631          }
632          if (must_quote) {
633          Stream_write_char(f, '[');          Stream_write_char(f, '[');
634          print_quoted_string_atom(node->pn_atom, f);          print_quoted_string_atom(node->pn_atom, f);
635          Stream_write_char(f, ']');          Stream_write_char(f, ']');
636        }        }
637          else {
638            Stream_write_char(f, '.');
639            print_string_atom(node->pn_atom, f);
640          }
641      }      }
642      break;      break;
643    case TOK_LB:    case TOK_LB:
# Line 527  Line 668 
668    case TOK_RC:    case TOK_RC:
669      Stream_write_char(f, '{');      Stream_write_char(f, '{');
670      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) {
671        assert(p->pn_type == TOK_COLON);        if (p->pn_type != TOK_COLON) {
672            fatal_source(file_id, p->pn_pos.begin.lineno, "unsupported node type (%d)", p->pn_type);
673          }
674        if (p != node->pn_head) {        if (p != node->pn_head) {
675          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
676        }        }
# Line 544  Line 687 
687          }          }
688          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
689          if (p->pn_right->pn_type != TOK_FUNCTION) {          if (p->pn_right->pn_type != TOK_FUNCTION) {
690            fatal("parse error: expected function");            fatal_source(file_id, p->pn_pos.begin.lineno, "expected function");
691          }          }
692          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);
693          break;          break;
# Line 620  Line 763 
763      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
764      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
765      break;      break;
766    default:    case TOK_LEXICALSCOPE:
767      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      assert(node->pn_arity == PN_NAME);
768    }      assert(node->pn_expr->pn_type == TOK_LET);
769  }      assert(node->pn_expr->pn_arity == PN_BINARY);
770        Stream_write_string(f, "let(");
771  static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {      assert(node->pn_expr->pn_left->pn_type == TOK_LP);
772    assert(node->pn_arity == PN_LIST);      assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
773    Stream_printf(f, "%*s", indent, "");      instrument_declarations(node->pn_expr->pn_left, f);
774    Stream_write_string(f, "var ");      Stream_write_string(f, ") ");
775    for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      instrument_expression(node->pn_expr->pn_right, f);
776      assert(p->pn_type == TOK_NAME);      break;
777      assert(p->pn_arity == PN_NAME);    case TOK_YIELD:
778      if (p != node->pn_head) {      assert(node->pn_arity == PN_UNARY);
779        Stream_write_string(f, ", ");      Stream_write_string(f, "yield");
780        if (node->pn_kid != NULL) {
781          Stream_write_char(f, ' ');
782          instrument_expression(node->pn_kid, f);
783      }      }
784      print_string_atom(p->pn_atom, f);      break;
785      if (p->pn_expr != NULL) {    case TOK_ARRAYCOMP:
786        Stream_write_string(f, " = ");      assert(node->pn_arity == PN_LIST);
787        instrument_expression(p->pn_expr, f);      {
788          JSParseNode * block_node;
789          switch (node->pn_count) {
790          case 1:
791            block_node = node->pn_head;
792            break;
793          case 2:
794            block_node = node->pn_head->pn_next;
795            break;
796          default:
797            abort();
798            break;
799          }
800          Stream_write_char(f, '[');
801          output_array_comprehension_or_generator_expression(block_node, f);
802          Stream_write_char(f, ']');
803      }      }
804        break;
805      case TOK_VAR:
806        assert(node->pn_arity == PN_LIST);
807        Stream_write_string(f, "var ");
808        instrument_declarations(node, f);
809        break;
810      case TOK_LET:
811        assert(node->pn_arity == PN_LIST);
812        Stream_write_string(f, "let ");
813        instrument_declarations(node, f);
814        break;
815      default:
816        fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
817    }    }
818  }  }
819    
# Line 668  Line 842 
842      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
843      if (! is_jscoverage_if) {      if (! is_jscoverage_if) {
844        if (line > num_lines) {        if (line > num_lines) {
845          fatal("%s: script contains more than 65,535 lines", file_id);          fatal("file %s contains more than 65,535 lines", file_id);
846        }        }
847        if (line >= 2 && exclusive_directives[line - 2]) {        if (line >= 2 && exclusive_directives[line - 2]) {
848          is_jscoverage_if = true;          is_jscoverage_if = true;
# Line 716  Line 890 
890      Stream_write_string(f, "switch (");      Stream_write_string(f, "switch (");
891      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
892      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
893      for (struct JSParseNode * p = node->pn_right->pn_head; p != NULL; p = p->pn_next) {      {
894        Stream_printf(f, "%*s", indent, "");        JSParseNode * list = node->pn_right;
895        switch (p->pn_type) {        if (list->pn_type == TOK_LEXICALSCOPE) {
896        case TOK_CASE:          list = list->pn_expr;
897          Stream_write_string(f, "case ");        }
898          instrument_expression(p->pn_left, f);        for (struct JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
899          Stream_write_string(f, ":\n");          Stream_printf(f, "%*s", indent, "");
900          break;          switch (p->pn_type) {
901        case TOK_DEFAULT:          case TOK_CASE:
902          Stream_write_string(f, "default:\n");            Stream_write_string(f, "case ");
903          break;            instrument_expression(p->pn_left, f);
904        default:            Stream_write_string(f, ":\n");
905          abort();            break;
906          break;          case TOK_DEFAULT:
907              Stream_write_string(f, "default:\n");
908              break;
909            default:
910              abort();
911              break;
912            }
913            instrument_statement(p->pn_right, f, indent + 2, false);
914        }        }
       instrument_statement(p->pn_right, f, indent + 2, false);  
915      }      }
916      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
917      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 763  Line 943 
943    case TOK_FOR:    case TOK_FOR:
944      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
945      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
946      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
947      case TOK_IN:      case TOK_IN:
948        /* for/in */        /* for/in */
949        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
950        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);  
951        break;        break;
952      case TOK_RESERVED:      case TOK_RESERVED:
953        /* for (;;) */        /* for (;;) */
954        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
955          Stream_write_string(f, "for (");
956        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
957          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);  
         }  
958        }        }
959        Stream_write_string(f, ";");        Stream_write_string(f, ";");
960        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 810  Line 966 
966          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
967          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
968        }        }
969          Stream_write_char(f, ')');
970        break;        break;
971      default:      default:
972        abort();        abort();
973        break;        break;
974      }      }
975      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
976      instrument_statement(node->pn_right, f, indent + 2, false);      instrument_statement(node->pn_right, f, indent + 2, false);
977      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
978      break;      break;
# Line 840  Line 997 
997          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
998          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
999          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
1000            /* this may not be a name - destructuring assignment */
1001            /*
1002          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
1003          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
1004            */
1005            instrument_expression(catch->pn_kid1, f);
1006          if (catch->pn_kid2) {          if (catch->pn_kid2) {
1007            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1008            instrument_expression(catch->pn_kid2, f);            instrument_expression(catch->pn_kid2, f);
# Line 886  Line 1047 
1047      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1048      break;      break;
1049    case TOK_VAR:    case TOK_VAR:
1050      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1051        instrument_expression(node, f);
1052      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1053      break;      break;
1054    case TOK_RETURN:    case TOK_RETURN:
# Line 921  Line 1083 
1083      */      */
1084      output_statement(node->pn_expr, f, indent, false);      output_statement(node->pn_expr, f, indent, false);
1085      break;      break;
1086      case TOK_LEXICALSCOPE:
1087        /* let statement */
1088        assert(node->pn_arity == PN_NAME);
1089        switch (node->pn_expr->pn_type) {
1090        case TOK_LET:
1091          /* let statement */
1092          assert(node->pn_expr->pn_arity == PN_BINARY);
1093          instrument_statement(node->pn_expr, f, indent, false);
1094          break;
1095        case TOK_LC:
1096          /* block */
1097          Stream_printf(f, "%*s", indent, "");
1098          Stream_write_string(f, "{\n");
1099          instrument_statement(node->pn_expr, f, indent + 2, false);
1100          Stream_printf(f, "%*s", indent, "");
1101          Stream_write_string(f, "}\n");
1102          break;
1103        case TOK_FOR:
1104          instrument_statement(node->pn_expr, f, indent, false);
1105          break;
1106        default:
1107          abort();
1108          break;
1109        }
1110        break;
1111      case TOK_LET:
1112        switch (node->pn_arity) {
1113        case PN_BINARY:
1114          /* let statement */
1115          Stream_printf(f, "%*s", indent, "");
1116          Stream_write_string(f, "let (");
1117          assert(node->pn_left->pn_type == TOK_LP);
1118          assert(node->pn_left->pn_arity == PN_LIST);
1119          instrument_declarations(node->pn_left, f);
1120          Stream_write_string(f, ") {\n");
1121          instrument_statement(node->pn_right, f, indent + 2, false);
1122          Stream_printf(f, "%*s", indent, "");
1123          Stream_write_string(f, "}\n");
1124          break;
1125        case PN_LIST:
1126          /* let definition */
1127          Stream_printf(f, "%*s", indent, "");
1128          instrument_expression(node, f);
1129          Stream_write_string(f, ";\n");
1130          break;
1131        default:
1132          abort();
1133          break;
1134        }
1135        break;
1136      case TOK_DEBUGGER:
1137        Stream_printf(f, "%*s", indent, "");
1138        Stream_write_string(f, "debugger;\n");
1139        break;
1140    default:    default:
1141      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);
1142    }    }
1143  }  }
1144    
# Line 932  Line 1148 
1148  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1149  */  */
1150  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
1151    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1152      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1153      if (line > num_lines) {      if (line > num_lines) {
1154        fatal("%s: script contains more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1155      }      }
1156    
1157      /* the root node has line number 0 */      /* the root node has line number 0 */
# Line 983  Line 1199 
1199  }  }
1200    
1201  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1202    fprintf(stderr, "jscoverage: parse error: line %u: %s\n", report->lineno, message);    warn_source(file_id, report->lineno, "%s", message);
1203  }  }
1204    
1205  void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {  void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {
# Line 992  Line 1208 
1208    /* parse the javascript */    /* parse the javascript */
1209    JSParseContext parse_context;    JSParseContext parse_context;
1210    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1211      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file %s", file_id);
1212    }    }
1213    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1214    JSParseNode * node = js_ParseScript(context, global, &parse_context);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1215    if (node == NULL) {    if (node == NULL) {
1216      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1217      fatal("parse error in file: %s", file_id);      fatal("parse error in file %s", file_id);
1218    }    }
1219    JS_SetErrorReporter(context, old_error_reporter);    JS_SetErrorReporter(context, old_error_reporter);
1220    num_lines = node->pn_pos.end.lineno;    num_lines = node->pn_pos.end.lineno;
# Line 1019  Line 1235 
1235    size_t i = 0;    size_t i = 0;
1236    while (i < num_characters) {    while (i < num_characters) {
1237      if (line_number == UINT16_MAX) {      if (line_number == UINT16_MAX) {
1238        fatal("%s: script has more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1239      }      }
1240      line_number++;      line_number++;
1241      size_t line_start = i;      size_t line_start = i;
# Line 1086  Line 1302 
1302    
1303    /* write line number info to the output */    /* write line number info to the output */
1304    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
1305    Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");    if (jscoverage_mozilla) {
1306    Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");      Stream_write_string(output, "try {\n");
1307        Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
1308        Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
1309        Stream_write_string(output, "}\n");
1310        Stream_write_string(output, "catch (e) {\n");
1311        Stream_write_string(output, "  _$jscoverage = {};\n");
1312        Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
1313        Stream_write_string(output, "}\n");
1314      }
1315      else {
1316        Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
1317        Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
1318      }
1319    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
1320    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
1321    for (int i = 0; i < num_lines; i++) {    for (int i = 0; i < num_lines; i++) {

Legend:
Removed from v.336  
changed lines
  Added in v.372

  ViewVC Help
Powered by ViewVC 1.1.24