/[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 317 by siliconforks, Tue Oct 14 01:28:46 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>  #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 49  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 63  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 74  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 199  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 209  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 244  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);
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 269  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, 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 316  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 374  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 438  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 495  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 535  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 552  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 576  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 639  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    
# Line 687  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 735  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 782  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 829  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 851  Line 990 
990      instrument_statement(node->pn_kid1, f, indent + 2, false);      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, false);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
# Line 902  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 937  Line 1084 
1084      */      */
1085      output_statement(node->pn_expr, f, indent, false);      output_statement(node->pn_expr, f, indent, false);
1086      break;      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;
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 948  Line 1149 
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, bool is_jscoverage_if) {  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      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 999  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) {
1207    file_id = id;    file_id = id;
1208    
   /* scan the javascript */  
   JSTokenStream * token_stream = js_NewTokenStream(context, characters, num_characters, NULL, 1, NULL);  
   if (token_stream == NULL) {  
     fatal("cannot create token stream from file: %s", file_id);  
   }  
   
1209    /* parse the javascript */    /* parse the javascript */
1210      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);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1215    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    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 1037  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 1100  Line 1299 
1299    
1300    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1301    instrument_statement(node, instrumented, 0, false);    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 1372  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 1384  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 1446  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_RB) {            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 1503  Line 1733 
1733            file_coverage->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 1519  Line 1750 
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_coverage_lines != array->pn_count) {        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 */
# Line 1527  Line 1759 
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->coverage_lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1762              return -2;              result = -2;
1763                goto done;
1764            }            }
1765            file_coverage->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->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);
# Line 1550  Line 1785 
1785        uint32 i = 0;        uint32 i = 0;
1786        for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {        for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {
1787          if (element->pn_type != TOK_STRING) {          if (element->pn_type != TOK_STRING) {
1788            return -1;            result = -1;
1789              goto done;
1790          }          }
1791          file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));          file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));
1792        }        }
# Line 1558  Line 1794 
1794      }      }
1795    }    }
1796    
1797    return 0;  done:
1798      js_FinishParseContext(context, &parse_context);
1799      return result;
1800  }  }

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

  ViewVC Help
Powered by ViewVC 1.1.24