/[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 317 by siliconforks, Tue Oct 14 01:28:46 2008 UTC revision 372 by siliconforks, Mon Oct 27 20:36:23 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 ");
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    
346    /* function parameters */    /*
347    Stream_write_string(f, "(");    function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
348    JSAtom ** params = xnew(JSAtom *, function->nargs);    js_DecompileFunction in jsopcode.cpp
349    for (int i = 0; i < function->nargs; i++) {    */
350      /* initialize to NULL for sanity check */    Stream_write_char(f, '(');
351      params[i] = NULL;    JSArenaPool pool;
352    }    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
353    JSScope * scope = OBJ_SCOPE(object);    jsuword * local_names = NULL;
354    for (JSScopeProperty * scope_property = SCOPE_LAST_PROP(scope); scope_property != NULL; scope_property = scope_property->parent) {    if (JS_GET_LOCAL_NAME_COUNT(function)) {
355      if (scope_property->getter != js_GetArgument) {      local_names = js_GetLocalNameArray(context, function, &pool);
356        continue;      if (local_names == NULL) {
357          fatal("out of memory");
358      }      }
     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);  
359    }    }
360    for (int i = 0; i < function->nargs; i++) {    for (int i = 0; i < function->nargs; i++) {
     assert(params[i] != NULL);  
361      if (i > 0) {      if (i > 0) {
362        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
363      }      }
364      if (ATOM_IS_STRING(params[i])) {      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
365        print_string_atom(params[i], f);      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);
369    }    }
370      JS_FinishArenaPool(&pool);
371    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
   free(params);  
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 374  Line 503 
503      instrument_expression(node->pn_kid3, f);      instrument_expression(node->pn_kid3, f);
504      break;      break;
505    case TOK_OR:    case TOK_OR:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " || ");  
     instrument_expression(node->pn_right, f);  
     break;  
506    case TOK_AND:    case TOK_AND:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " && ");  
     instrument_expression(node->pn_right, f);  
     break;  
507    case TOK_BITOR:    case TOK_BITOR:
508    case TOK_BITXOR:    case TOK_BITXOR:
509    case TOK_BITAND:    case TOK_BITAND:
# Line 438  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 495  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        /* XXX - semantics changed in 1.7 */        bool must_quote;
620        if (! ATOM_KEYWORD(node->pn_atom) && 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 535  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 552  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 576  Line 711 
711    case TOK_STRING:    case TOK_STRING:
712      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
713      break;      break;
714    case TOK_OBJECT:    case TOK_REGEXP:
715      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
716      case JSOP_OBJECT:      {
717        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
718        abort();        jsval result;
719        break;        js_regexp_toString(context, object, &result);
720      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;  
721      }      }
722      break;      break;
723    case TOK_NUMBER:    case TOK_NUMBER:
# Line 639  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 687  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 735  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 782  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 829  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 851  Line 989 
989      instrument_statement(node->pn_kid1, f, indent + 2, false);      instrument_statement(node->pn_kid1, f, indent + 2, false);
990      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
991      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
992      {      if (node->pn_kid2) {
993        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
994          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
995            assert(scope->pn_type == TOK_LEXICALSCOPE);
996            JSParseNode * catch = scope->pn_expr;
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          if (catch->pn_kid1->pn_expr) {          */
1005            instrument_expression(catch->pn_kid1, f);
1006            if (catch->pn_kid2) {
1007            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1008            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
1009          }          }
1010          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
1011          instrument_statement(catch->pn_kid3, f, indent + 2, false);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
# Line 902  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 937  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 948  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 999  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) {
1206    file_id = id;    file_id = id;
1207    
   /* 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);  
   }  
   
1208    /* parse the javascript */    /* parse the javascript */
1209      JSParseContext parse_context;
1210      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);
1212      }
1213    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1214    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    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 1037  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 1100  Line 1298 
1298    
1299    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1300    instrument_statement(node, instrumented, 0, false);    instrument_statement(node, instrumented, 0, false);
1301      js_FinishParseContext(context, &parse_context);
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++) {
# Line 1372  Line 1583 
1583  }  }
1584    
1585  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) {
1586      int result = 0;
1587    
1588    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1589    if (base == NULL) {    if (base == NULL) {
1590      fatal("out of memory");      fatal("out of memory");
# Line 1384  Line 1597 
1597    
1598    JS_free(context, base);    JS_free(context, base);
1599    
1600    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1601    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1602      fatal("cannot create token stream");      free(parenthesized_json);
1603        return -1;
1604    }    }
1605      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1606    free(parenthesized_json);    free(parenthesized_json);
1607    if (root == NULL) {    if (root == NULL) {
1608      return -1;      result = -1;
1609        goto done;
1610    }    }
1611    
1612    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1613    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1614      return -1;      result = -1;
1615        goto done;
1616    }    }
1617    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1618    
1619    /* 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 */
1620    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1621      return -1;      result = -1;
1622        goto done;
1623    }    }
1624    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1625    
1626    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1627    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1628      return -1;      result = -1;
1629        goto done;
1630    }    }
1631    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1632    
1633    /* this must be an object literal */    /* this must be an object literal */
1634    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1635      return -1;      result = -1;
1636        goto done;
1637    }    }
1638    
1639    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1640      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1641      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1642        return -1;        result = -1;
1643          goto done;
1644      }      }
1645    
1646      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1647      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1648      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1649        return -1;        result = -1;
1650          goto done;
1651      }      }
1652      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1653    
1654      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1655      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1656      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1657        return -1;        result = -1;
1658          goto done;
1659      }      }
1660    
1661      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1446  Line 1667 
1667      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1668        /* an object literal */        /* an object literal */
1669        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1670          return -1;          result = -1;
1671            goto done;
1672        }        }
1673        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1674          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1675            return -1;            result = -1;
1676              goto done;
1677          }          }
1678          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1679          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1680            return -1;            result = -1;
1681              goto done;
1682          }          }
1683          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1684          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1685            array = element->pn_right;            array = element->pn_right;
1686            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1687              return -1;              result = -1;
1688                goto done;
1689            }            }
1690          }          }
1691          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1692            source = element->pn_right;            source = element->pn_right;
1693            if (source->pn_type != TOK_RB) {            if (source->pn_type != TOK_RB) {
1694              return -1;              result = -1;
1695                goto done;
1696            }            }
1697          }          }
1698          else {          else {
1699            return -1;            result = -1;
1700              goto done;
1701          }          }
1702        }        }
1703      }      }
1704      else {      else {
1705        return -1;        result = -1;
1706          goto done;
1707      }      }
1708    
1709      if (array == NULL) {      if (array == NULL) {
1710        return -1;        result = -1;
1711          goto done;
1712      }      }
1713    
1714      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1503  Line 1732 
1732            file_coverage->coverage_lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1733          }          }
1734          else {          else {
1735            return -1;            result = -1;
1736              goto done;
1737          }          }
1738        }        }
1739        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1519  Line 1749 
1749        /* sanity check */        /* sanity check */
1750        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1751        if (file_coverage->num_coverage_lines != array->pn_count) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1752          return -2;          result = -2;
1753            goto done;
1754        }        }
1755    
1756        /* merge the coverage */        /* merge the coverage */
# Line 1527  Line 1758 
1758        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++) {
1759          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1760            if (file_coverage->coverage_lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1761              return -2;              result = -2;
1762                goto done;
1763            }            }
1764            file_coverage->coverage_lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1765          }          }
1766          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1767            if (file_coverage->coverage_lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1768              return -2;              result = -2;
1769                goto done;
1770            }            }
1771          }          }
1772          else {          else {
1773            return -1;            result = -1;
1774              goto done;
1775          }          }
1776        }        }
1777        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1550  Line 1784 
1784        uint32 i = 0;        uint32 i = 0;
1785        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++) {
1786          if (element->pn_type != TOK_STRING) {          if (element->pn_type != TOK_STRING) {
1787            return -1;            result = -1;
1788              goto done;
1789          }          }
1790          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)));
1791        }        }
# Line 1558  Line 1793 
1793      }      }
1794    }    }
1795    
1796    return 0;  done:
1797      js_FinishParseContext(context, &parse_context);
1798      return result;
1799  }  }

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

  ViewVC Help
Powered by ViewVC 1.1.24