/[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 293 by siliconforks, Sun Oct 12 16:41:57 2008 UTC revision 355 by siliconforks, Fri Oct 24 16:19:11 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 54  Line 57 
57  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
58  static JSContext * context = NULL;  static JSContext * context = NULL;
59  static JSObject * global = NULL;  static JSObject * global = NULL;
60    static JSVersion js_version = JSVERSION_ECMA_3;
61    
62  /*  /*
63  JSParseNode objects store line numbers starting from 1.  JSParseNode objects store line numbers starting from 1.
# Line 63  Line 67 
67  static char * lines = NULL;  static char * lines = NULL;
68  static uint16_t num_lines = 0;  static uint16_t num_lines = 0;
69    
70    void jscoverage_set_js_version(const char * version) {
71      js_version = atoi(version);
72    }
73    
74  void jscoverage_init(void) {  void jscoverage_init(void) {
75    runtime = JS_NewRuntime(8L * 1024L * 1024L);    runtime = JS_NewRuntime(8L * 1024L * 1024L);
76    if (runtime == NULL) {    if (runtime == NULL) {
# Line 74  Line 82 
82      fatal("cannot create context");      fatal("cannot create context");
83    }    }
84    
85      JS_SetVersion(context, js_version);
86    
87    global = JS_NewObject(context, NULL, NULL, NULL);    global = JS_NewObject(context, NULL, NULL, NULL);
88    if (global == NULL) {    if (global == NULL) {
89      fatal("cannot create global object");      fatal("cannot create global object");
# Line 147  Line 157 
157        case 0xa:        case 0xa:
158          Stream_write_string(f, "\\n");          Stream_write_string(f, "\\n");
159          break;          break;
160          /* IE doesn't support this */
161          /*
162        case 0xb:        case 0xb:
163          Stream_write_string(f, "\\v");          Stream_write_string(f, "\\v");
164          break;          break;
165          */
166        case 0xc:        case 0xc:
167          Stream_write_string(f, "\\f");          Stream_write_string(f, "\\f");
168          break;          break;
# Line 196  Line 209 
209    
210  static const char * get_op(uint8 op) {  static const char * get_op(uint8 op) {
211    switch(op) {    switch(op) {
212      case JSOP_OR:
213        return "||";
214      case JSOP_AND:
215        return "&&";
216    case JSOP_BITOR:    case JSOP_BITOR:
217      return "|";      return "|";
218    case JSOP_BITXOR:    case JSOP_BITXOR:
# Line 206  Line 223 
223      return "==";      return "==";
224    case JSOP_NE:    case JSOP_NE:
225      return "!=";      return "!=";
226    case JSOP_NEW_EQ:    case JSOP_STRICTEQ:
227      return "===";      return "===";
228    case JSOP_NEW_NE:    case JSOP_STRICTNE:
229      return "!==";      return "!==";
230    case JSOP_LT:    case JSOP_LT:
231      return "<";      return "<";
# Line 241  Line 258 
258    
259  static void instrument_expression(JSParseNode * node, Stream * f);  static void instrument_expression(JSParseNode * node, Stream * f);
260  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);
261    static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if);
262    
263  enum FunctionType {  enum FunctionType {
264    FUNCTION_NORMAL,    FUNCTION_NORMAL,
265    FUNCTION_GETTER_OR_SETTER    FUNCTION_GETTER_OR_SETTER
266  };  };
267    
268    static void output_for_in(JSParseNode * node, Stream * f) {
269      assert(node->pn_type == TOK_FOR);
270      assert(node->pn_arity == PN_BINARY);
271      Stream_write_string(f, "for ");
272      if (node->pn_iflags & JSITER_FOREACH) {
273        Stream_write_string(f, "each ");
274      }
275      Stream_write_char(f, '(');
276      instrument_expression(node->pn_left, f);
277      Stream_write_char(f, ')');
278    }
279    
280  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) {
281      assert(node->pn_type == TOK_FUNCTION);
282    assert(node->pn_arity == PN_FUNC);    assert(node->pn_arity == PN_FUNC);
283    assert(ATOM_IS_OBJECT(node->pn_funAtom));    JSObject * object = node->pn_funpob->object;
   JSObject * object = ATOM_TO_OBJECT(node->pn_funAtom);  
284    assert(JS_ObjectIsFunction(context, object));    assert(JS_ObjectIsFunction(context, object));
285    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
286    assert(function);    assert(function);
287    assert(object == function->object);    assert(object == &function->object);
288    Stream_printf(f, "%*s", indent, "");    Stream_printf(f, "%*s", indent, "");
289    if (type == FUNCTION_NORMAL) {    if (type == FUNCTION_NORMAL) {
290      Stream_write_string(f, "function");      Stream_write_string(f, "function");
# Line 266  Line 296 
296      print_string_atom(function->atom, f);      print_string_atom(function->atom, f);
297    }    }
298    
299    /* function parameters */    /*
300      function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
301      js_DecompileFunction in jsopcode.cpp
302      */
303    Stream_write_string(f, "(");    Stream_write_string(f, "(");
304    JSAtom ** params = xnew(JSAtom *, function->nargs);    JSArenaPool pool;
305    for (int i = 0; i < function->nargs; i++) {    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
306      /* initialize to NULL for sanity check */    jsuword * local_names = NULL;
307      params[i] = NULL;    if (JS_GET_LOCAL_NAME_COUNT(function)) {
308    }      local_names = js_GetLocalNameArray(context, function, &pool);
309    JSScope * scope = OBJ_SCOPE(object);      if (local_names == NULL) {
310    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;  
311      }      }
     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);  
312    }    }
313    for (int i = 0; i < function->nargs; i++) {    for (int i = 0; i < function->nargs; i++) {
     assert(params[i] != NULL);  
314      if (i > 0) {      if (i > 0) {
315        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
316      }      }
317      if (ATOM_IS_STRING(params[i])) {      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
318        print_string_atom(params[i], f);      if (param == NULL) {
319          fatal("unsupported parameter type for function: %s", file_id);
320      }      }
321        print_string_atom(param, f);
322    }    }
323      JS_FinishArenaPool(&pool);
324    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
   free(params);  
325    
326    /* function body */    /* function body */
327    instrument_statement(node->pn_body, f, indent + 2, false);    if (function->flags & JSFUN_EXPR_CLOSURE) {
328        /* expression closure */
329        output_statement(node->pn_body, f, indent + 2, false);
330      }
331      else {
332        instrument_statement(node->pn_body, f, indent + 2, false);
333      }
334    
335    Stream_write_string(f, "}\n");    Stream_write_string(f, "}\n");
336  }  }
337    
338  static void instrument_function_call(JSParseNode * node, Stream * f) {  static void instrument_function_call(JSParseNode * node, Stream * f) {
339    instrument_expression(node->pn_head, f);    JSParseNode * function_node = node->pn_head;
340      if (function_node->pn_type == TOK_FUNCTION) {
341        JSObject * object = function_node->pn_funpob->object;
342        assert(JS_ObjectIsFunction(context, object));
343        JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
344        assert(function);
345        assert(object == &function->object);
346    
347        if (function_node->pn_flags & TCF_GENEXP_LAMBDA) {
348          /* it's a generator expression */
349          JSParseNode * lexical_scope_node = function_node->pn_body;
350          assert(lexical_scope_node->pn_type == TOK_LEXICALSCOPE);
351          assert(lexical_scope_node->pn_arity == PN_NAME);
352          JSParseNode * for_node = lexical_scope_node->pn_body;
353          assert(for_node->pn_type == TOK_FOR);
354          assert(for_node->pn_arity == PN_BINARY);
355          JSParseNode * if_node = NULL;
356          JSParseNode * semi_node;
357          switch (for_node->pn_right->pn_type) {
358          case TOK_SEMI:
359            semi_node = for_node->pn_right;
360            break;
361          case TOK_IF:
362            if_node = for_node->pn_right;
363            assert(if_node->pn_arity == PN_TERNARY);
364            semi_node = if_node->pn_kid2;
365            assert(semi_node->pn_type == TOK_SEMI);
366            break;
367          default:
368            abort();
369            break;
370          }
371          assert(semi_node->pn_arity == PN_UNARY);
372          JSParseNode * yield_node = semi_node->pn_kid;
373          assert(yield_node->pn_type == TOK_YIELD);
374          Stream_write_char(f, '(');
375          instrument_expression(yield_node->pn_kid, f);
376          Stream_write_char(f, ' ');
377          output_for_in(for_node, f);
378          if (if_node) {
379            Stream_write_string(f, " if (");
380            instrument_expression(if_node->pn_kid1, f);
381            Stream_write_char(f, ')');
382          }
383          Stream_write_char(f, ')');
384          return;
385        }
386        else {
387          Stream_write_char(f, '(');
388          instrument_expression(function_node, f);
389          Stream_write_char(f, ')');
390        }
391      }
392      else {
393        instrument_expression(function_node, f);
394      }
395    Stream_write_char(f, '(');    Stream_write_char(f, '(');
396    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) {
397      if (p != node->pn_head->pn_next) {      if (p != node->pn_head->pn_next) {
398        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
399      }      }
# Line 313  Line 402 
402    Stream_write_char(f, ')');    Stream_write_char(f, ')');
403  }  }
404    
405    static void instrument_declarations(JSParseNode * list, Stream * f) {
406      assert(list->pn_arity == PN_LIST);
407      for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
408        switch (p->pn_type) {
409        case TOK_NAME:
410          assert(p->pn_arity == PN_NAME);
411          if (p != list->pn_head) {
412            Stream_write_string(f, ", ");
413          }
414          print_string_atom(p->pn_atom, f);
415          if (p->pn_expr != NULL) {
416            Stream_write_string(f, " = ");
417            instrument_expression(p->pn_expr, f);
418          }
419          break;
420        case TOK_ASSIGN:
421        case TOK_RB:
422        case TOK_RC:
423          /* destructuring */
424          instrument_expression(p, f);
425          break;
426        default:
427          abort();
428          break;
429        }
430      }
431    }
432    
433  /*  /*
434  See <Expressions> in jsparse.h.  See <Expressions> in jsparse.h.
435  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
# Line 371  Line 488 
488      instrument_expression(node->pn_kid3, f);      instrument_expression(node->pn_kid3, f);
489      break;      break;
490    case TOK_OR:    case TOK_OR:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " || ");  
     instrument_expression(node->pn_right, f);  
     break;  
491    case TOK_AND:    case TOK_AND:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " && ");  
     instrument_expression(node->pn_right, f);  
     break;  
492    case TOK_BITOR:    case TOK_BITOR:
493    case TOK_BITXOR:    case TOK_BITXOR:
494    case TOK_BITAND:    case TOK_BITAND:
# Line 435  Line 544 
544        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
545        break;        break;
546      default:      default:
547        abort();        fatal("%s: unknown operator (%d) in file", file_id, node->pn_op);
548        break;        break;
549      }      }
550      break;      break;
# Line 492  Line 601 
601      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
602      {      {
603        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
604        /* XXX - semantics changed in 1.7 */        bool must_quote;
605        if (! ATOM_KEYWORD(node->pn_atom) && js_IsIdentifier(s)) {        if (JSSTRING_LENGTH(s) == 0) {
606          Stream_write_char(f, '.');          must_quote = true;
607          print_string_atom(node->pn_atom, f);        }
608          else if (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF) {
609            must_quote = true;
610          }
611          else if (! js_IsIdentifier(s)) {
612            must_quote = true;
613        }        }
614        else {        else {
615            must_quote = false;
616          }
617          if (must_quote) {
618          Stream_write_char(f, '[');          Stream_write_char(f, '[');
619          print_quoted_string_atom(node->pn_atom, f);          print_quoted_string_atom(node->pn_atom, f);
620          Stream_write_char(f, ']');          Stream_write_char(f, ']');
621        }        }
622          else {
623            Stream_write_char(f, '.');
624            print_string_atom(node->pn_atom, f);
625          }
626      }      }
627      break;      break;
628    case TOK_LB:    case TOK_LB:
# Line 532  Line 653 
653    case TOK_RC:    case TOK_RC:
654      Stream_write_char(f, '{');      Stream_write_char(f, '{');
655      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) {
656        assert(p->pn_type == TOK_COLON);        if (p->pn_type != TOK_COLON) {
657            fatal("unsupported node type in file %s: %d", file_id, p->pn_type);
658          }
659        if (p != node->pn_head) {        if (p != node->pn_head) {
660          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
661        }        }
# Line 573  Line 696 
696    case TOK_STRING:    case TOK_STRING:
697      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
698      break;      break;
699    case TOK_OBJECT:    case TOK_REGEXP:
700      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
701      case JSOP_OBJECT:      {
702        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
703        abort();        jsval result;
704        break;        js_regexp_toString(context, object, &result);
705      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;  
706      }      }
707      break;      break;
708    case TOK_NUMBER:    case TOK_NUMBER:
# Line 636  Line 748 
748      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
749      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
750      break;      break;
751    default:    case TOK_LEXICALSCOPE:
752      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      assert(node->pn_arity == PN_NAME);
753    }      assert(node->pn_expr->pn_type == TOK_LET);
754  }      assert(node->pn_expr->pn_arity == PN_BINARY);
755        Stream_write_string(f, "let(");
756  static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {      assert(node->pn_expr->pn_left->pn_type == TOK_LP);
757    assert(node->pn_arity == PN_LIST);      assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
758    Stream_printf(f, "%*s", indent, "");      instrument_declarations(node->pn_expr->pn_left, f);
759    Stream_write_string(f, "var ");      Stream_write_string(f, ") ");
760    for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      instrument_expression(node->pn_expr->pn_right, f);
761      assert(p->pn_type == TOK_NAME);      break;
762      assert(p->pn_arity == PN_NAME);    case TOK_YIELD:
763      if (p != node->pn_head) {      assert(node->pn_arity == PN_UNARY);
764        Stream_write_string(f, ", ");      Stream_write_string(f, "yield");
765        if (node->pn_kid != NULL) {
766          Stream_write_char(f, ' ');
767          instrument_expression(node->pn_kid, f);
768      }      }
769      print_string_atom(p->pn_atom, f);      break;
770      if (p->pn_expr != NULL) {    case TOK_ARRAYCOMP:
771        Stream_write_string(f, " = ");      assert(node->pn_arity == PN_LIST);
772        instrument_expression(p->pn_expr, f);      {
773          JSParseNode * block_node;
774          switch (node->pn_count) {
775          case 1:
776            block_node = node->pn_head;
777            break;
778          case 2:
779            block_node = node->pn_head->pn_next;
780            break;
781          default:
782            abort();
783            break;
784          }
785          assert(block_node->pn_type == TOK_LEXICALSCOPE);
786          assert(block_node->pn_arity == PN_NAME);
787          JSParseNode * for_node = block_node->pn_expr;
788          assert(for_node->pn_type == TOK_FOR);
789          assert(for_node->pn_arity == PN_BINARY);
790          JSParseNode * if_node = NULL;
791          JSParseNode * push_node;
792          switch (for_node->pn_right->pn_type) {
793          case TOK_ARRAYPUSH:
794            push_node = for_node->pn_right;
795            assert(push_node->pn_arity == PN_UNARY);
796            break;
797          case TOK_IF:
798            if_node = for_node->pn_right;
799            assert(if_node->pn_arity == PN_TERNARY);
800            push_node = if_node->pn_kid2;
801            break;
802          default:
803            abort();
804            break;
805          }
806          Stream_write_char(f, '[');
807          instrument_expression(push_node->pn_kid, f);
808          Stream_write_char(f, ' ');
809          output_for_in(for_node, f);
810          if (if_node) {
811            Stream_write_string(f, " if (");
812            instrument_expression(if_node->pn_kid1, f);
813            Stream_write_char(f, ')');
814          }
815          Stream_write_char(f, ']');
816      }      }
817        break;
818      case TOK_VAR:
819        assert(node->pn_arity == PN_LIST);
820        Stream_write_string(f, "var ");
821        instrument_declarations(node, f);
822        break;
823      case TOK_LET:
824        assert(node->pn_arity == PN_LIST);
825        Stream_write_string(f, "let ");
826        instrument_declarations(node, f);
827        break;
828      default:
829        fatal("unsupported node type in file %s: %d", file_id, node->pn_type);
830    }    }
831  }  }
832    
# Line 732  Line 903 
903      Stream_write_string(f, "switch (");      Stream_write_string(f, "switch (");
904      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
905      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
906      for (struct JSParseNode * p = node->pn_right->pn_head; p != NULL; p = p->pn_next) {      {
907        Stream_printf(f, "%*s", indent, "");        JSParseNode * list = node->pn_right;
908        switch (p->pn_type) {        if (list->pn_type == TOK_LEXICALSCOPE) {
909        case TOK_CASE:          list = list->pn_expr;
910          Stream_write_string(f, "case ");        }
911          instrument_expression(p->pn_left, f);        for (struct JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
912          Stream_write_string(f, ":\n");          Stream_printf(f, "%*s", indent, "");
913          break;          switch (p->pn_type) {
914        case TOK_DEFAULT:          case TOK_CASE:
915          Stream_write_string(f, "default:\n");            Stream_write_string(f, "case ");
916          break;            instrument_expression(p->pn_left, f);
917        default:            Stream_write_string(f, ":\n");
918          abort();            break;
919          break;          case TOK_DEFAULT:
920              Stream_write_string(f, "default:\n");
921              break;
922            default:
923              abort();
924              break;
925            }
926            instrument_statement(p->pn_right, f, indent + 2, false);
927        }        }
       instrument_statement(p->pn_right, f, indent + 2, false);  
928      }      }
929      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
930      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 779  Line 956 
956    case TOK_FOR:    case TOK_FOR:
957      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
958      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
959      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
960      case TOK_IN:      case TOK_IN:
961        /* for/in */        /* for/in */
962        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
963        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);  
964        break;        break;
965      case TOK_RESERVED:      case TOK_RESERVED:
966        /* for (;;) */        /* for (;;) */
967        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
968          Stream_write_string(f, "for (");
969        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
970          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);  
         }  
971        }        }
972        Stream_write_string(f, ";");        Stream_write_string(f, ";");
973        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 826  Line 979 
979          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
980          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
981        }        }
982          Stream_write_char(f, ')');
983        break;        break;
984      default:      default:
985        abort();        abort();
986        break;        break;
987      }      }
988      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
989      instrument_statement(node->pn_right, f, indent + 2, false);      instrument_statement(node->pn_right, f, indent + 2, false);
990      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
991      break;      break;
# Line 848  Line 1002 
1002      instrument_statement(node->pn_kid1, f, indent + 2, false);      instrument_statement(node->pn_kid1, f, indent + 2, false);
1003      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1004      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1005      {      if (node->pn_kid2) {
1006        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
1007          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
1008            assert(scope->pn_type == TOK_LEXICALSCOPE);
1009            JSParseNode * catch = scope->pn_expr;
1010          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
1011          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1012          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
1013            /* this may not be a name - destructuring assignment */
1014            /*
1015          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
1016          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
1017          if (catch->pn_kid1->pn_expr) {          */
1018            instrument_expression(catch->pn_kid1, f);
1019            if (catch->pn_kid2) {
1020            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1021            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
1022          }          }
1023          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
1024          instrument_statement(catch->pn_kid3, f, indent + 2, false);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
# Line 899  Line 1060 
1060      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1061      break;      break;
1062    case TOK_VAR:    case TOK_VAR:
1063      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1064        instrument_expression(node, f);
1065      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1066      break;      break;
1067    case TOK_RETURN:    case TOK_RETURN:
# Line 934  Line 1096 
1096      */      */
1097      output_statement(node->pn_expr, f, indent, false);      output_statement(node->pn_expr, f, indent, false);
1098      break;      break;
1099      case TOK_LEXICALSCOPE:
1100        /* let statement */
1101        assert(node->pn_arity == PN_NAME);
1102        switch (node->pn_expr->pn_type) {
1103        case TOK_LET:
1104          /* let statement */
1105          assert(node->pn_expr->pn_arity == PN_BINARY);
1106          instrument_statement(node->pn_expr, f, indent, false);
1107          break;
1108        case TOK_LC:
1109          /* block */
1110          Stream_printf(f, "%*s", indent, "");
1111          Stream_write_string(f, "{\n");
1112          instrument_statement(node->pn_expr, f, indent + 2, false);
1113          Stream_printf(f, "%*s", indent, "");
1114          Stream_write_string(f, "}\n");
1115          break;
1116        case TOK_FOR:
1117          instrument_statement(node->pn_expr, f, indent, false);
1118          break;
1119        default:
1120          abort();
1121          break;
1122        }
1123        break;
1124      case TOK_LET:
1125        switch (node->pn_arity) {
1126        case PN_BINARY:
1127          /* let statement */
1128          Stream_printf(f, "%*s", indent, "");
1129          Stream_write_string(f, "let (");
1130          assert(node->pn_left->pn_type == TOK_LP);
1131          assert(node->pn_left->pn_arity == PN_LIST);
1132          instrument_declarations(node->pn_left, f);
1133          Stream_write_string(f, ") {\n");
1134          instrument_statement(node->pn_right, f, indent + 2, false);
1135          Stream_printf(f, "%*s", indent, "");
1136          Stream_write_string(f, "}\n");
1137          break;
1138        case PN_LIST:
1139          /* let definition */
1140          Stream_printf(f, "%*s", indent, "");
1141          instrument_expression(node, f);
1142          Stream_write_string(f, ";\n");
1143          break;
1144        default:
1145          abort();
1146          break;
1147        }
1148        break;
1149      case TOK_DEBUGGER:
1150        Stream_printf(f, "%*s", indent, "");
1151        Stream_write_string(f, "debugger;\n");
1152        break;
1153    default:    default:
1154      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);
1155    }    }
# Line 945  Line 1161 
1161  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1162  */  */
1163  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) {
1164    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1165      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1166      if (line > num_lines) {      if (line > num_lines) {
1167        fatal("%s: script contains more than 65,535 lines", file_id);        fatal("%s: script contains more than 65,535 lines", file_id);
# Line 1002  Line 1218 
1218  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) {
1219    file_id = id;    file_id = id;
1220    
1221    /* scan the javascript */    /* parse the javascript */
1222    JSTokenStream * token_stream = js_NewTokenStream(context, characters, num_characters, NULL, 1, NULL);    JSParseContext parse_context;
1223    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1224      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file: %s", file_id);
1225    }    }
   
   /* parse the javascript */  
1226    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1227    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1228    if (node == NULL) {    if (node == NULL) {
1229      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1230      fatal("parse error in file: %s", file_id);      fatal("parse error in file: %s", file_id);
# Line 1097  Line 1311 
1311    
1312    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1313    instrument_statement(node, instrumented, 0, false);    instrument_statement(node, instrumented, 0, false);
1314      js_FinishParseContext(context, &parse_context);
1315    
1316    /* write line number info to the output */    /* write line number info to the output */
1317    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
# Line 1177  Line 1392 
1392            /* line feed (new line) */            /* line feed (new line) */
1393            done = true;            done = true;
1394            break;            break;
1395            /* IE doesn't support this */
1396            /*
1397          case 0xb:          case 0xb:
           /* vertical tab */  
1398            Stream_write_string(output, "\\v");            Stream_write_string(output, "\\v");
1399            break;            break;
1400            */
1401          case 0xc:          case 0xc:
1402            /* form feed */            /* form feed */
1403            Stream_write_string(output, "\\f");            Stream_write_string(output, "\\f");
# Line 1235  Line 1452 
1452            /* line feed (new line) */            /* line feed (new line) */
1453            done = true;            done = true;
1454            break;            break;
1455            /* IE doesn't support this */
1456            /*
1457          case 0xb:          case 0xb:
           /* vertical tab */  
1458            Stream_write_string(output, "\\v");            Stream_write_string(output, "\\v");
1459            break;            break;
1460            */
1461          case 0xc:          case 0xc:
1462            /* form feed */            /* form feed */
1463            Stream_write_string(output, "\\f");            Stream_write_string(output, "\\f");
# Line 1365  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 1377  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 1439  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 1496  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 1512  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 1520  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 1543  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 1551  Line 1794 
1794      }      }
1795    }    }
1796    
1797    return 0;  done:
1798      js_FinishParseContext(context, &parse_context);
1799      return result;
1800  }  }

Legend:
Removed from v.293  
changed lines
  Added in v.355

  ViewVC Help
Powered by ViewVC 1.1.24