/[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 353 by siliconforks, Fri Oct 24 16:18:36 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 199  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 209  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 244  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 269  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 316  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 374  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 495  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 535  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 576  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 639  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      case TOK_LEXICALSCOPE:
752        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        assert(node->pn_expr->pn_left->pn_type == TOK_LP);
757        assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
758        instrument_declarations(node->pn_expr->pn_left, f);
759        Stream_write_string(f, ") ");
760        instrument_expression(node->pn_expr->pn_right, f);
761        break;
762      case TOK_YIELD:
763        assert(node->pn_arity == PN_UNARY);
764        Stream_write_string(f, "yield ");
765        instrument_expression(node->pn_kid, f);
766        break;
767      case TOK_ARRAYCOMP:
768        assert(node->pn_arity == PN_LIST);
769        {
770          JSParseNode * block_node;
771          switch (node->pn_count) {
772          case 1:
773            block_node = node->pn_head;
774            break;
775          case 2:
776            block_node = node->pn_head->pn_next;
777            break;
778          default:
779            abort();
780            break;
781          }
782          assert(block_node->pn_type == TOK_LEXICALSCOPE);
783          assert(block_node->pn_arity == PN_NAME);
784          JSParseNode * for_node = block_node->pn_expr;
785          assert(for_node->pn_type == TOK_FOR);
786          assert(for_node->pn_arity == PN_BINARY);
787          JSParseNode * if_node = NULL;
788          JSParseNode * push_node;
789          switch (for_node->pn_right->pn_type) {
790          case TOK_ARRAYPUSH:
791            push_node = for_node->pn_right;
792            assert(push_node->pn_arity == PN_UNARY);
793            break;
794          case TOK_IF:
795            if_node = for_node->pn_right;
796            assert(if_node->pn_arity == PN_TERNARY);
797            push_node = if_node->pn_kid2;
798            break;
799          default:
800            abort();
801            break;
802          }
803          Stream_write_char(f, '[');
804          instrument_expression(push_node->pn_kid, f);
805          Stream_write_char(f, ' ');
806          output_for_in(for_node, f);
807          if (if_node) {
808            Stream_write_string(f, " if (");
809            instrument_expression(if_node->pn_kid1, f);
810            Stream_write_char(f, ')');
811          }
812          Stream_write_char(f, ']');
813        }
814        break;
815      case TOK_VAR:
816        assert(node->pn_arity == PN_LIST);
817        Stream_write_string(f, "var ");
818        instrument_declarations(node, f);
819        break;
820      case TOK_LET:
821        assert(node->pn_arity == PN_LIST);
822        Stream_write_string(f, "let ");
823        instrument_declarations(node, f);
824        break;
825    default:    default:
826      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);
827    }    }
828  }  }
829    
 static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {  
   assert(node->pn_arity == PN_LIST);  
   Stream_printf(f, "%*s", indent, "");  
   Stream_write_string(f, "var ");  
   for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {  
     assert(p->pn_type == TOK_NAME);  
     assert(p->pn_arity == PN_NAME);  
     if (p != node->pn_head) {  
       Stream_write_string(f, ", ");  
     }  
     print_string_atom(p->pn_atom, f);  
     if (p->pn_expr != NULL) {  
       Stream_write_string(f, " = ");  
       instrument_expression(p->pn_expr, f);  
     }  
   }  
 }  
   
830  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
831    switch (node->pn_type) {    switch (node->pn_type) {
832    case TOK_FUNCTION:    case TOK_FUNCTION:
# Line 735  Line 900 
900      Stream_write_string(f, "switch (");      Stream_write_string(f, "switch (");
901      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
902      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
903      for (struct JSParseNode * p = node->pn_right->pn_head; p != NULL; p = p->pn_next) {      {
904        Stream_printf(f, "%*s", indent, "");        JSParseNode * list = node->pn_right;
905        switch (p->pn_type) {        if (list->pn_type == TOK_LEXICALSCOPE) {
906        case TOK_CASE:          list = list->pn_expr;
907          Stream_write_string(f, "case ");        }
908          instrument_expression(p->pn_left, f);        for (struct JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
909          Stream_write_string(f, ":\n");          Stream_printf(f, "%*s", indent, "");
910          break;          switch (p->pn_type) {
911        case TOK_DEFAULT:          case TOK_CASE:
912          Stream_write_string(f, "default:\n");            Stream_write_string(f, "case ");
913          break;            instrument_expression(p->pn_left, f);
914        default:            Stream_write_string(f, ":\n");
915          abort();            break;
916          break;          case TOK_DEFAULT:
917              Stream_write_string(f, "default:\n");
918              break;
919            default:
920              abort();
921              break;
922            }
923            instrument_statement(p->pn_right, f, indent + 2, false);
924        }        }
       instrument_statement(p->pn_right, f, indent + 2, false);  
925      }      }
926      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
927      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 782  Line 953 
953    case TOK_FOR:    case TOK_FOR:
954      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
955      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
956      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
957      case TOK_IN:      case TOK_IN:
958        /* for/in */        /* for/in */
959        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
960        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);  
961        break;        break;
962      case TOK_RESERVED:      case TOK_RESERVED:
963        /* for (;;) */        /* for (;;) */
964        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
965          Stream_write_string(f, "for (");
966        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
967          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);  
         }  
968        }        }
969        Stream_write_string(f, ";");        Stream_write_string(f, ";");
970        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 829  Line 976 
976          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
977          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
978        }        }
979          Stream_write_char(f, ')');
980        break;        break;
981      default:      default:
982        abort();        abort();
983        break;        break;
984      }      }
985      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
986      instrument_statement(node->pn_right, f, indent + 2, false);      instrument_statement(node->pn_right, f, indent + 2, false);
987      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
988      break;      break;
# Line 851  Line 999 
999      instrument_statement(node->pn_kid1, f, indent + 2, false);      instrument_statement(node->pn_kid1, f, indent + 2, false);
1000      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1001      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1002      {      if (node->pn_kid2) {
1003        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
1004          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
1005            assert(scope->pn_type == TOK_LEXICALSCOPE);
1006            JSParseNode * catch = scope->pn_expr;
1007          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
1008          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1009          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
1010            /* this may not be a name - destructuring assignment */
1011            /*
1012          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
1013          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
1014          if (catch->pn_kid1->pn_expr) {          */
1015            instrument_expression(catch->pn_kid1, f);
1016            if (catch->pn_kid2) {
1017            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1018            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
1019          }          }
1020          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
1021          instrument_statement(catch->pn_kid3, f, indent + 2, false);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
# Line 902  Line 1057 
1057      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1058      break;      break;
1059    case TOK_VAR:    case TOK_VAR:
1060      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1061        instrument_expression(node, f);
1062      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1063      break;      break;
1064    case TOK_RETURN:    case TOK_RETURN:
# Line 937  Line 1093 
1093      */      */
1094      output_statement(node->pn_expr, f, indent, false);      output_statement(node->pn_expr, f, indent, false);
1095      break;      break;
1096      case TOK_LEXICALSCOPE:
1097        /* let statement */
1098        assert(node->pn_arity == PN_NAME);
1099        switch (node->pn_expr->pn_type) {
1100        case TOK_LET:
1101          /* let statement */
1102          assert(node->pn_expr->pn_arity == PN_BINARY);
1103          instrument_statement(node->pn_expr, f, indent, false);
1104          break;
1105        case TOK_LC:
1106          /* block */
1107          Stream_printf(f, "%*s", indent, "");
1108          Stream_write_string(f, "{\n");
1109          instrument_statement(node->pn_expr, f, indent + 2, false);
1110          Stream_printf(f, "%*s", indent, "");
1111          Stream_write_string(f, "}\n");
1112          break;
1113        case TOK_FOR:
1114          instrument_statement(node->pn_expr, f, indent, false);
1115          break;
1116        default:
1117          abort();
1118          break;
1119        }
1120        break;
1121      case TOK_LET:
1122        switch (node->pn_arity) {
1123        case PN_BINARY:
1124          /* let statement */
1125          Stream_printf(f, "%*s", indent, "");
1126          Stream_write_string(f, "let (");
1127          assert(node->pn_left->pn_type == TOK_LP);
1128          assert(node->pn_left->pn_arity == PN_LIST);
1129          instrument_declarations(node->pn_left, f);
1130          Stream_write_string(f, ") {\n");
1131          instrument_statement(node->pn_right, f, indent + 2, false);
1132          Stream_printf(f, "%*s", indent, "");
1133          Stream_write_string(f, "}\n");
1134          break;
1135        case PN_LIST:
1136          /* let definition */
1137          Stream_printf(f, "%*s", indent, "");
1138          instrument_expression(node, f);
1139          Stream_write_string(f, ";\n");
1140          break;
1141        default:
1142          abort();
1143          break;
1144        }
1145        break;
1146      case TOK_DEBUGGER:
1147        Stream_printf(f, "%*s", indent, "");
1148        Stream_write_string(f, "debugger;\n");
1149        break;
1150    default:    default:
1151      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);
1152    }    }
# Line 948  Line 1158 
1158  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1159  */  */
1160  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) {
1161    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1162      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1163      if (line > num_lines) {      if (line > num_lines) {
1164        fatal("%s: script contains more than 65,535 lines", file_id);        fatal("%s: script contains more than 65,535 lines", file_id);
# Line 1005  Line 1215 
1215  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) {
1216    file_id = id;    file_id = id;
1217    
1218    /* scan the javascript */    /* parse the javascript */
1219    JSTokenStream * token_stream = js_NewTokenStream(context, characters, num_characters, NULL, 1, NULL);    JSParseContext parse_context;
1220    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1221      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file: %s", file_id);
1222    }    }
   
   /* parse the javascript */  
1223    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1224    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1225    if (node == NULL) {    if (node == NULL) {
1226      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1227      fatal("parse error in file: %s", file_id);      fatal("parse error in file: %s", file_id);
# Line 1100  Line 1308 
1308    
1309    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1310    instrument_statement(node, instrumented, 0, false);    instrument_statement(node, instrumented, 0, false);
1311      js_FinishParseContext(context, &parse_context);
1312    
1313    /* write line number info to the output */    /* write line number info to the output */
1314    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 1372  Line 1581 
1581  }  }
1582    
1583  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) {
1584      int result = 0;
1585    
1586    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1587    if (base == NULL) {    if (base == NULL) {
1588      fatal("out of memory");      fatal("out of memory");
# Line 1384  Line 1595 
1595    
1596    JS_free(context, base);    JS_free(context, base);
1597    
1598    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1599    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1600      fatal("cannot create token stream");      free(parenthesized_json);
1601        return -1;
1602    }    }
1603      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1604    free(parenthesized_json);    free(parenthesized_json);
1605    if (root == NULL) {    if (root == NULL) {
1606      return -1;      result = -1;
1607        goto done;
1608    }    }
1609    
1610    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1611    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1612      return -1;      result = -1;
1613        goto done;
1614    }    }
1615    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1616    
1617    /* 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 */
1618    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1619      return -1;      result = -1;
1620        goto done;
1621    }    }
1622    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1623    
1624    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1625    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1626      return -1;      result = -1;
1627        goto done;
1628    }    }
1629    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1630    
1631    /* this must be an object literal */    /* this must be an object literal */
1632    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1633      return -1;      result = -1;
1634        goto done;
1635    }    }
1636    
1637    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1638      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1639      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1640        return -1;        result = -1;
1641          goto done;
1642      }      }
1643    
1644      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1645      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1646      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1647        return -1;        result = -1;
1648          goto done;
1649      }      }
1650      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1651    
1652      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1653      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1654      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1655        return -1;        result = -1;
1656          goto done;
1657      }      }
1658    
1659      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1446  Line 1665 
1665      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1666        /* an object literal */        /* an object literal */
1667        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1668          return -1;          result = -1;
1669            goto done;
1670        }        }
1671        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1672          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1673            return -1;            result = -1;
1674              goto done;
1675          }          }
1676          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1677          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1678            return -1;            result = -1;
1679              goto done;
1680          }          }
1681          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1682          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1683            array = element->pn_right;            array = element->pn_right;
1684            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1685              return -1;              result = -1;
1686                goto done;
1687            }            }
1688          }          }
1689          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1690            source = element->pn_right;            source = element->pn_right;
1691            if (source->pn_type != TOK_RB) {            if (source->pn_type != TOK_RB) {
1692              return -1;              result = -1;
1693                goto done;
1694            }            }
1695          }          }
1696          else {          else {
1697            return -1;            result = -1;
1698              goto done;
1699          }          }
1700        }        }
1701      }      }
1702      else {      else {
1703        return -1;        result = -1;
1704          goto done;
1705      }      }
1706    
1707      if (array == NULL) {      if (array == NULL) {
1708        return -1;        result = -1;
1709          goto done;
1710      }      }
1711    
1712      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1503  Line 1730 
1730            file_coverage->coverage_lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1731          }          }
1732          else {          else {
1733            return -1;            result = -1;
1734              goto done;
1735          }          }
1736        }        }
1737        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1519  Line 1747 
1747        /* sanity check */        /* sanity check */
1748        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1749        if (file_coverage->num_coverage_lines != array->pn_count) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1750          return -2;          result = -2;
1751            goto done;
1752        }        }
1753    
1754        /* merge the coverage */        /* merge the coverage */
# Line 1527  Line 1756 
1756        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++) {
1757          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1758            if (file_coverage->coverage_lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1759              return -2;              result = -2;
1760                goto done;
1761            }            }
1762            file_coverage->coverage_lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1763          }          }
1764          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1765            if (file_coverage->coverage_lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1766              return -2;              result = -2;
1767                goto done;
1768            }            }
1769          }          }
1770          else {          else {
1771            return -1;            result = -1;
1772              goto done;
1773          }          }
1774        }        }
1775        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1550  Line 1782 
1782        uint32 i = 0;        uint32 i = 0;
1783        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++) {
1784          if (element->pn_type != TOK_STRING) {          if (element->pn_type != TOK_STRING) {
1785            return -1;            result = -1;
1786              goto done;
1787          }          }
1788          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)));
1789        }        }
# Line 1558  Line 1791 
1791      }      }
1792    }    }
1793    
1794    return 0;  done:
1795      js_FinishParseContext(context, &parse_context);
1796      return result;
1797  }  }

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

  ViewVC Help
Powered by ViewVC 1.1.24