/[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 340 by siliconforks, Fri Oct 24 16:14:20 2008 UTC revision 370 by siliconforks, Mon Oct 27 20:34:27 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>
# Line 51  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;
# Line 67  Line 70 
70  static uint16_t num_lines = 0;  static uint16_t num_lines = 0;
71    
72  void jscoverage_set_js_version(const char * version) {  void jscoverage_set_js_version(const char * version) {
73    js_version = atoi(version);    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) {
# Line 257  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 301  Line 363 
363        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
364      }      }
365      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
366        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);      print_string_atom(param, f);
370    }    }
371    JS_FinishArenaPool(&pool);    JS_FinishArenaPool(&pool);
372    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
373    
374    /* function body */    /* function body */
375    instrument_statement(node->pn_body, f, indent + 2, false);    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 327  Line 421 
421  static void instrument_declarations(JSParseNode * list, Stream * f) {  static void instrument_declarations(JSParseNode * list, Stream * f) {
422    assert(list->pn_arity == PN_LIST);    assert(list->pn_arity == PN_LIST);
423    for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
424      assert(p->pn_type == TOK_NAME);      switch (p->pn_type) {
425      assert(p->pn_arity == PN_NAME);      case TOK_NAME:
426      if (p != list->pn_head) {        assert(p->pn_arity == PN_NAME);
427        Stream_write_string(f, ", ");        if (p != list->pn_head) {
428      }          Stream_write_string(f, ", ");
429      print_string_atom(p->pn_atom, f);        }
430      if (p->pn_expr != NULL) {        print_string_atom(p->pn_atom, f);
431        Stream_write_string(f, " = ");        if (p->pn_expr != NULL) {
432        instrument_expression(p->pn_expr, f);          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  }  }
# Line 454  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 511  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        bool is_keyword = (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF);        bool must_quote;
621        if (! is_keyword && 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 551  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 568  Line 688 
688          }          }
689          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
690          if (p->pn_right->pn_type != TOK_FUNCTION) {          if (p->pn_right->pn_type != TOK_FUNCTION) {
691            fatal("parse error: expected function");            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;
# Line 655  Line 775 
775      Stream_write_string(f, ") ");      Stream_write_string(f, ") ");
776      instrument_expression(node->pn_expr->pn_right, f);      instrument_expression(node->pn_expr->pn_right, f);
777      break;      break;
778      case TOK_YIELD:
779        assert(node->pn_arity == PN_UNARY);
780        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        break;
786      case TOK_ARRAYCOMP:
787        assert(node->pn_arity == PN_LIST);
788        {
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:    default:
817      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);
818    }    }
819  }  }
820    
 static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {  
   assert(node->pn_arity == PN_LIST);  
   Stream_printf(f, "%*s", indent, "");  
   Stream_write_string(f, "var ");  
   instrument_declarations(node, f);  
 }  
   
 static void instrument_let_definition(JSParseNode * node, Stream * f, int indent) {  
   assert(node->pn_arity == PN_LIST);  
   Stream_printf(f, "%*s", indent, "");  
   Stream_write_string(f, "let ");  
   instrument_declarations(node, f);  
 }  
   
821  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {  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:
# Line 699  Line 843 
843      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
844      if (! is_jscoverage_if) {      if (! is_jscoverage_if) {
845        if (line > num_lines) {        if (line > num_lines) {
846          fatal("%s: script contains more than 65,535 lines", file_id);          fatal("file %s contains more than 65,535 lines", file_id);
847        }        }
848        if (line >= 2 && exclusive_directives[line - 2]) {        if (line >= 2 && exclusive_directives[line - 2]) {
849          is_jscoverage_if = true;          is_jscoverage_if = true;
# Line 747  Line 891 
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, false);  
916      }      }
917      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
918      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 794  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 ");  
     if (node->pn_iflags & JSITER_FOREACH) {  
       Stream_write_string(f, "each ");  
     }  
     Stream_write_char(f, '(');  
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_LET:  
         instrument_let_definition(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          switch (node->pn_left->pn_kid1->pn_type) {          instrument_expression(node->pn_left->pn_kid1, f);
         case TOK_VAR:  
           instrument_var_statement(node->pn_left->pn_kid1, f, 0);  
           break;  
         case TOK_LET:  
           instrument_let_definition(node->pn_left->pn_kid1, f, 0);  
           break;  
         default:  
           instrument_expression(node->pn_left->pn_kid1, f);  
           break;  
         }  
959        }        }
960        Stream_write_string(f, ";");        Stream_write_string(f, ";");
961        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 853  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, false);      instrument_statement(node->pn_right, f, indent + 2, false);
978      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
979      break;      break;
# Line 883  Line 998 
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            */
1006            instrument_expression(catch->pn_kid1, f);
1007          if (catch->pn_kid2) {          if (catch->pn_kid2) {
1008            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1009            instrument_expression(catch->pn_kid2, f);            instrument_expression(catch->pn_kid2, f);
# Line 929  Line 1048 
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 1005  Line 1125 
1125        break;        break;
1126      case PN_LIST:      case PN_LIST:
1127        /* let definition */        /* let definition */
1128        instrument_let_definition(node, f, indent);        Stream_printf(f, "%*s", indent, "");
1129          instrument_expression(node, f);
1130        Stream_write_string(f, ";\n");        Stream_write_string(f, ";\n");
1131        break;        break;
1132      default:      default:
# Line 1013  Line 1134 
1134        break;        break;
1135      }      }
1136      break;      break;
1137      case TOK_DEBUGGER:
1138        Stream_printf(f, "%*s", indent, "");
1139        Stream_write_string(f, "debugger;\n");
1140        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 1027  Line 1152 
1152    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1153      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1154      if (line > num_lines) {      if (line > num_lines) {
1155        fatal("%s: script contains more than 65,535 lines", file_id);        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 */
# Line 1075  Line 1200 
1200  }  }
1201    
1202  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1203    fprintf(stderr, "jscoverage: parse error: line %u: %s\n", report->lineno, message);    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) {  void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {
# Line 1084  Line 1209 
1209    /* parse the javascript */    /* parse the javascript */
1210    JSParseContext parse_context;    JSParseContext parse_context;
1211    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)) {
1212      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file %s", file_id);
1213    }    }
1214    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1215    JSParseNode * node = js_ParseScript(context, global, &parse_context);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1216    if (node == NULL) {    if (node == NULL) {
1217      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1218      fatal("parse error in file: %s", file_id);      fatal("parse error in file %s", file_id);
1219    }    }
1220    JS_SetErrorReporter(context, old_error_reporter);    JS_SetErrorReporter(context, old_error_reporter);
1221    num_lines = node->pn_pos.end.lineno;    num_lines = node->pn_pos.end.lineno;
# Line 1111  Line 1236 
1236    size_t i = 0;    size_t i = 0;
1237    while (i < num_characters) {    while (i < num_characters) {
1238      if (line_number == UINT16_MAX) {      if (line_number == UINT16_MAX) {
1239        fatal("%s: script has more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1240      }      }
1241      line_number++;      line_number++;
1242      size_t line_start = i;      size_t line_start = i;
# Line 1178  Line 1303 
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++) {

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

  ViewVC Help
Powered by ViewVC 1.1.24