/[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 348 by siliconforks, Fri Oct 24 16:17:00 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 <jsexn.h>  #include <jsexn.h>
32  #include <jsfun.h>  #include <jsfun.h>
33  #include <jsinterp.h>  #include <jsinterp.h>
34    #include <jsiter.h>
35  #include <jsparse.h>  #include <jsparse.h>
36  #include <jsregexp.h>  #include <jsregexp.h>
37  #include <jsscope.h>  #include <jsscope.h>
# Line 54  Line 56 
56  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
57  static JSContext * context = NULL;  static JSContext * context = NULL;
58  static JSObject * global = NULL;  static JSObject * global = NULL;
59    static JSVersion js_version = JSVERSION_ECMA_3;
60    
61  /*  /*
62  JSParseNode objects store line numbers starting from 1.  JSParseNode objects store line numbers starting from 1.
# Line 63  Line 66 
66  static char * lines = NULL;  static char * lines = NULL;
67  static uint16_t num_lines = 0;  static uint16_t num_lines = 0;
68    
69    void jscoverage_set_js_version(const char * version) {
70      js_version = atoi(version);
71    }
72    
73  void jscoverage_init(void) {  void jscoverage_init(void) {
74    runtime = JS_NewRuntime(8L * 1024L * 1024L);    runtime = JS_NewRuntime(8L * 1024L * 1024L);
75    if (runtime == NULL) {    if (runtime == NULL) {
# Line 74  Line 81 
81      fatal("cannot create context");      fatal("cannot create context");
82    }    }
83    
84      JS_SetVersion(context, js_version);
85    
86    global = JS_NewObject(context, NULL, NULL, NULL);    global = JS_NewObject(context, NULL, NULL, NULL);
87    if (global == NULL) {    if (global == NULL) {
88      fatal("cannot create global object");      fatal("cannot create global object");
# Line 199  Line 208 
208    
209  static const char * get_op(uint8 op) {  static const char * get_op(uint8 op) {
210    switch(op) {    switch(op) {
211      case JSOP_OR:
212        return "||";
213      case JSOP_AND:
214        return "&&";
215    case JSOP_BITOR:    case JSOP_BITOR:
216      return "|";      return "|";
217    case JSOP_BITXOR:    case JSOP_BITXOR:
# Line 209  Line 222 
222      return "==";      return "==";
223    case JSOP_NE:    case JSOP_NE:
224      return "!=";      return "!=";
225    case JSOP_NEW_EQ:    case JSOP_STRICTEQ:
226      return "===";      return "===";
227    case JSOP_NEW_NE:    case JSOP_STRICTNE:
228      return "!==";      return "!==";
229    case JSOP_LT:    case JSOP_LT:
230      return "<";      return "<";
# Line 244  Line 257 
257    
258  static void instrument_expression(JSParseNode * node, Stream * f);  static void instrument_expression(JSParseNode * node, Stream * f);
259  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);
260    static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if);
261    
262  enum FunctionType {  enum FunctionType {
263    FUNCTION_NORMAL,    FUNCTION_NORMAL,
264    FUNCTION_GETTER_OR_SETTER    FUNCTION_GETTER_OR_SETTER
265  };  };
266    
267    static void output_for_in(JSParseNode * node, Stream * f) {
268      assert(node->pn_type == TOK_FOR);
269      assert(node->pn_arity == PN_BINARY);
270      Stream_write_string(f, "for ");
271      if (node->pn_iflags & JSITER_FOREACH) {
272        Stream_write_string(f, "each ");
273      }
274      Stream_write_char(f, '(');
275      instrument_expression(node->pn_left, f);
276      Stream_write_char(f, ')');
277    }
278    
279  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) {
280      assert(node->pn_type == TOK_FUNCTION);
281    assert(node->pn_arity == PN_FUNC);    assert(node->pn_arity == PN_FUNC);
282    assert(ATOM_IS_OBJECT(node->pn_funAtom));    JSObject * object = node->pn_funpob->object;
   JSObject * object = ATOM_TO_OBJECT(node->pn_funAtom);  
283    assert(JS_ObjectIsFunction(context, object));    assert(JS_ObjectIsFunction(context, object));
284    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
285    assert(function);    assert(function);
286    assert(object == function->object);    assert(object == &function->object);
287    Stream_printf(f, "%*s", indent, "");    Stream_printf(f, "%*s", indent, "");
288    if (type == FUNCTION_NORMAL) {    if (type == FUNCTION_NORMAL) {
289      Stream_write_string(f, "function");      Stream_write_string(f, "function");
# Line 269  Line 295 
295      print_string_atom(function->atom, f);      print_string_atom(function->atom, f);
296    }    }
297    
298    /* function parameters */    /*
299      function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
300      js_DecompileFunction in jsopcode.cpp
301      */
302    Stream_write_string(f, "(");    Stream_write_string(f, "(");
303    JSAtom ** params = xnew(JSAtom *, function->nargs);    JSArenaPool pool;
304    for (int i = 0; i < function->nargs; i++) {    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
305      /* initialize to NULL for sanity check */    jsuword * local_names = NULL;
306      params[i] = NULL;    if (JS_GET_LOCAL_NAME_COUNT(function)) {
307    }      local_names = js_GetLocalNameArray(context, function, &pool);
308    JSScope * scope = OBJ_SCOPE(object);      if (local_names == NULL) {
309    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;  
310      }      }
     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);  
311    }    }
312    for (int i = 0; i < function->nargs; i++) {    for (int i = 0; i < function->nargs; i++) {
     assert(params[i] != NULL);  
313      if (i > 0) {      if (i > 0) {
314        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
315      }      }
316      if (ATOM_IS_STRING(params[i])) {      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
317        print_string_atom(params[i], f);      print_string_atom(param, f);
     }  
318    }    }
319      JS_FinishArenaPool(&pool);
320    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
   free(params);  
321    
322    /* function body */    /* function body */
323    instrument_statement(node->pn_body, f, indent + 2, false);    if (function->flags & JSFUN_EXPR_CLOSURE) {
324        /* expression closure */
325        output_statement(node->pn_body, f, indent + 2, false);
326      }
327      else {
328        instrument_statement(node->pn_body, f, indent + 2, false);
329      }
330    
331    Stream_write_string(f, "}\n");    Stream_write_string(f, "}\n");
332  }  }
333    
334  static void instrument_function_call(JSParseNode * node, Stream * f) {  static void instrument_function_call(JSParseNode * node, Stream * f) {
335    instrument_expression(node->pn_head, f);    if (node->pn_head->pn_type == TOK_FUNCTION) {
336    Stream_write_char(f, '(');      /* it's a generator expression */
337    for (struct JSParseNode * p = node->pn_head->pn_next; p != NULL; p = p->pn_next) {      JSParseNode * function_node = node->pn_head;
338      if (p != node->pn_head->pn_next) {      JSParseNode * lexical_scope_node = function_node->pn_body;
339        Stream_write_string(f, ", ");      assert(lexical_scope_node->pn_type == TOK_LEXICALSCOPE);
340        assert(lexical_scope_node->pn_arity == PN_NAME);
341        JSParseNode * for_node = lexical_scope_node->pn_body;
342        assert(for_node->pn_type == TOK_FOR);
343        assert(for_node->pn_arity == PN_BINARY);
344        JSParseNode * if_node = NULL;
345        JSParseNode * semi_node;
346        switch (for_node->pn_right->pn_type) {
347        case TOK_SEMI:
348          semi_node = for_node->pn_right;
349          break;
350        case TOK_IF:
351          if_node = for_node->pn_right;
352          assert(if_node->pn_arity == PN_TERNARY);
353          semi_node = if_node->pn_kid2;
354          assert(semi_node->pn_type == TOK_SEMI);
355          break;
356        default:
357          abort();
358          break;
359        }
360        assert(semi_node->pn_arity == PN_UNARY);
361        JSParseNode * yield_node = semi_node->pn_kid;
362        assert(yield_node->pn_type == TOK_YIELD);
363        Stream_write_char(f, '(');
364        instrument_expression(yield_node->pn_kid, f);
365        Stream_write_char(f, ' ');
366        output_for_in(for_node, f);
367        if (if_node) {
368          Stream_write_string(f, " if (");
369          instrument_expression(if_node->pn_kid1, f);
370          Stream_write_char(f, ')');
371        }
372        Stream_write_char(f, ')');
373      }
374      else {
375        instrument_expression(node->pn_head, f);
376        Stream_write_char(f, '(');
377        for (struct JSParseNode * p = node->pn_head->pn_next; p != NULL; p = p->pn_next) {
378          if (p != node->pn_head->pn_next) {
379            Stream_write_string(f, ", ");
380          }
381          instrument_expression(p, f);
382        }
383        Stream_write_char(f, ')');
384      }
385    }
386    
387    static void instrument_declarations(JSParseNode * list, Stream * f) {
388      assert(list->pn_arity == PN_LIST);
389      for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
390        switch (p->pn_type) {
391        case TOK_NAME:
392          assert(p->pn_arity == PN_NAME);
393          if (p != list->pn_head) {
394            Stream_write_string(f, ", ");
395          }
396          print_string_atom(p->pn_atom, f);
397          if (p->pn_expr != NULL) {
398            Stream_write_string(f, " = ");
399            instrument_expression(p->pn_expr, f);
400          }
401          break;
402        case TOK_ASSIGN:
403        case TOK_RB:
404        case TOK_RC:
405          /* destructuring */
406          instrument_expression(p, f);
407          break;
408        default:
409          abort();
410          break;
411      }      }
     instrument_expression(p, f);  
412    }    }
   Stream_write_char(f, ')');  
413  }  }
414    
415  /*  /*
# Line 374  Line 470 
470      instrument_expression(node->pn_kid3, f);      instrument_expression(node->pn_kid3, f);
471      break;      break;
472    case TOK_OR:    case TOK_OR:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " || ");  
     instrument_expression(node->pn_right, f);  
     break;  
473    case TOK_AND:    case TOK_AND:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " && ");  
     instrument_expression(node->pn_right, f);  
     break;  
474    case TOK_BITOR:    case TOK_BITOR:
475    case TOK_BITXOR:    case TOK_BITXOR:
476    case TOK_BITAND:    case TOK_BITAND:
# Line 495  Line 583 
583      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
584      {      {
585        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
586        /* XXX - semantics changed in 1.7 */        bool is_keyword = (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF);
587        if (! ATOM_KEYWORD(node->pn_atom) && js_IsIdentifier(s)) {        if (! is_keyword && js_IsIdentifier(s)) {
588          Stream_write_char(f, '.');          Stream_write_char(f, '.');
589          print_string_atom(node->pn_atom, f);          print_string_atom(node->pn_atom, f);
590        }        }
# Line 576  Line 664 
664    case TOK_STRING:    case TOK_STRING:
665      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
666      break;      break;
667    case TOK_OBJECT:    case TOK_REGEXP:
668      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
669      case JSOP_OBJECT:      {
670        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
671        abort();        jsval result;
672        break;        js_regexp_toString(context, object, &result);
673      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;  
674      }      }
675      break;      break;
676    case TOK_NUMBER:    case TOK_NUMBER:
# Line 639  Line 716 
716      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
717      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
718      break;      break;
719      case TOK_LEXICALSCOPE:
720        assert(node->pn_arity == PN_NAME);
721        assert(node->pn_expr->pn_type == TOK_LET);
722        assert(node->pn_expr->pn_arity == PN_BINARY);
723        Stream_write_string(f, "let(");
724        assert(node->pn_expr->pn_left->pn_type == TOK_LP);
725        assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
726        instrument_declarations(node->pn_expr->pn_left, f);
727        Stream_write_string(f, ") ");
728        instrument_expression(node->pn_expr->pn_right, f);
729        break;
730      case TOK_YIELD:
731        assert(node->pn_arity == PN_UNARY);
732        Stream_write_string(f, "yield ");
733        instrument_expression(node->pn_kid, f);
734        break;
735      case TOK_ARRAYCOMP:
736        assert(node->pn_arity == PN_LIST);
737        {
738          JSParseNode * block_node;
739          switch (node->pn_count) {
740          case 1:
741            block_node = node->pn_head;
742            break;
743          case 2:
744            block_node = node->pn_head->pn_next;
745            break;
746          default:
747            abort();
748            break;
749          }
750          assert(block_node->pn_type == TOK_LEXICALSCOPE);
751          assert(block_node->pn_arity == PN_NAME);
752          JSParseNode * for_node = block_node->pn_expr;
753          assert(for_node->pn_type == TOK_FOR);
754          assert(for_node->pn_arity == PN_BINARY);
755          JSParseNode * if_node = NULL;
756          JSParseNode * push_node;
757          switch (for_node->pn_right->pn_type) {
758          case TOK_ARRAYPUSH:
759            push_node = for_node->pn_right;
760            assert(push_node->pn_arity == PN_UNARY);
761            break;
762          case TOK_IF:
763            if_node = for_node->pn_right;
764            assert(if_node->pn_arity == PN_TERNARY);
765            push_node = if_node->pn_kid2;
766            break;
767          default:
768            abort();
769            break;
770          }
771          Stream_write_char(f, '[');
772          instrument_expression(push_node->pn_kid, f);
773          Stream_write_char(f, ' ');
774          output_for_in(for_node, f);
775          if (if_node) {
776            Stream_write_string(f, " if (");
777            instrument_expression(if_node->pn_kid1, f);
778            Stream_write_char(f, ')');
779          }
780          Stream_write_char(f, ']');
781        }
782        break;
783      case TOK_VAR:
784        assert(node->pn_arity == PN_LIST);
785        Stream_write_string(f, "var ");
786        instrument_declarations(node, f);
787        break;
788      case TOK_LET:
789        assert(node->pn_arity == PN_LIST);
790        Stream_write_string(f, "let ");
791        instrument_declarations(node, f);
792        break;
793    default:    default:
794      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);
795    }    }
796  }  }
797    
 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);  
     }  
   }  
 }  
   
798  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) {
799    switch (node->pn_type) {    switch (node->pn_type) {
800    case TOK_FUNCTION:    case TOK_FUNCTION:
# Line 782  Line 915 
915    case TOK_FOR:    case TOK_FOR:
916      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
917      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
918      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
919      case TOK_IN:      case TOK_IN:
920        /* for/in */        /* for/in */
921        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
922        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);  
923        break;        break;
924      case TOK_RESERVED:      case TOK_RESERVED:
925        /* for (;;) */        /* for (;;) */
926        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
927          Stream_write_string(f, "for (");
928        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
929          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);  
         }  
930        }        }
931        Stream_write_string(f, ";");        Stream_write_string(f, ";");
932        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 829  Line 938 
938          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
939          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
940        }        }
941          Stream_write_char(f, ')');
942        break;        break;
943      default:      default:
944        abort();        abort();
945        break;        break;
946      }      }
947      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
948      instrument_statement(node->pn_right, f, indent + 2, false);      instrument_statement(node->pn_right, f, indent + 2, false);
949      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
950      break;      break;
# Line 851  Line 961 
961      instrument_statement(node->pn_kid1, f, indent + 2, false);      instrument_statement(node->pn_kid1, f, indent + 2, false);
962      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
963      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
964      {      if (node->pn_kid2) {
965        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
966          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
967            assert(scope->pn_type == TOK_LEXICALSCOPE);
968            JSParseNode * catch = scope->pn_expr;
969          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
970          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
971          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
972            /* this may not be a name - destructuring assignment */
973            /*
974          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
975          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
976          if (catch->pn_kid1->pn_expr) {          */
977            instrument_expression(catch->pn_kid1, f);
978            if (catch->pn_kid2) {
979            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
980            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
981          }          }
982          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
983          instrument_statement(catch->pn_kid3, f, indent + 2, false);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
# Line 902  Line 1019 
1019      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1020      break;      break;
1021    case TOK_VAR:    case TOK_VAR:
1022      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1023        instrument_expression(node, f);
1024      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1025      break;      break;
1026    case TOK_RETURN:    case TOK_RETURN:
# Line 937  Line 1055 
1055      */      */
1056      output_statement(node->pn_expr, f, indent, false);      output_statement(node->pn_expr, f, indent, false);
1057      break;      break;
1058      case TOK_LEXICALSCOPE:
1059        /* let statement */
1060        assert(node->pn_arity == PN_NAME);
1061        switch (node->pn_expr->pn_type) {
1062        case TOK_LET:
1063          /* let statement */
1064          assert(node->pn_expr->pn_arity == PN_BINARY);
1065          instrument_statement(node->pn_expr, f, indent, false);
1066          break;
1067        case TOK_LC:
1068          /* block */
1069          Stream_printf(f, "%*s", indent, "");
1070          Stream_write_string(f, "{\n");
1071          instrument_statement(node->pn_expr, f, indent + 2, false);
1072          Stream_printf(f, "%*s", indent, "");
1073          Stream_write_string(f, "}\n");
1074          break;
1075        case TOK_FOR:
1076          instrument_statement(node->pn_expr, f, indent, false);
1077          break;
1078        default:
1079          abort();
1080          break;
1081        }
1082        break;
1083      case TOK_LET:
1084        switch (node->pn_arity) {
1085        case PN_BINARY:
1086          /* let statement */
1087          Stream_printf(f, "%*s", indent, "");
1088          Stream_write_string(f, "let (");
1089          assert(node->pn_left->pn_type == TOK_LP);
1090          assert(node->pn_left->pn_arity == PN_LIST);
1091          instrument_declarations(node->pn_left, f);
1092          Stream_write_string(f, ") {\n");
1093          instrument_statement(node->pn_right, f, indent + 2, false);
1094          Stream_printf(f, "%*s", indent, "");
1095          Stream_write_string(f, "}\n");
1096          break;
1097        case PN_LIST:
1098          /* let definition */
1099          Stream_printf(f, "%*s", indent, "");
1100          instrument_expression(node, f);
1101          Stream_write_string(f, ";\n");
1102          break;
1103        default:
1104          abort();
1105          break;
1106        }
1107        break;
1108      case TOK_DEBUGGER:
1109        Stream_printf(f, "%*s", indent, "");
1110        Stream_write_string(f, "debugger;\n");
1111        break;
1112    default:    default:
1113      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);
1114    }    }
# Line 948  Line 1120 
1120  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1121  */  */
1122  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) {
1123    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1124      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1125      if (line > num_lines) {      if (line > num_lines) {
1126        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 1177 
1177  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) {
1178    file_id = id;    file_id = id;
1179    
1180    /* scan the javascript */    /* parse the javascript */
1181    JSTokenStream * token_stream = js_NewTokenStream(context, characters, num_characters, NULL, 1, NULL);    JSParseContext parse_context;
1182    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1183      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file: %s", file_id);
1184    }    }
   
   /* parse the javascript */  
1185    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1186    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1187    if (node == NULL) {    if (node == NULL) {
1188      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1189      fatal("parse error in file: %s", file_id);      fatal("parse error in file: %s", file_id);
# Line 1100  Line 1270 
1270    
1271    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1272    instrument_statement(node, instrumented, 0, false);    instrument_statement(node, instrumented, 0, false);
1273      js_FinishParseContext(context, &parse_context);
1274    
1275    /* write line number info to the output */    /* write line number info to the output */
1276    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 1543 
1543  }  }
1544    
1545  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) {
1546      int result = 0;
1547    
1548    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1549    if (base == NULL) {    if (base == NULL) {
1550      fatal("out of memory");      fatal("out of memory");
# Line 1384  Line 1557 
1557    
1558    JS_free(context, base);    JS_free(context, base);
1559    
1560    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1561    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1562      fatal("cannot create token stream");      free(parenthesized_json);
1563        return -1;
1564    }    }
1565      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1566    free(parenthesized_json);    free(parenthesized_json);
1567    if (root == NULL) {    if (root == NULL) {
1568      return -1;      result = -1;
1569        goto done;
1570    }    }
1571    
1572    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1573    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1574      return -1;      result = -1;
1575        goto done;
1576    }    }
1577    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1578    
1579    /* 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 */
1580    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1581      return -1;      result = -1;
1582        goto done;
1583    }    }
1584    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1585    
1586    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1587    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1588      return -1;      result = -1;
1589        goto done;
1590    }    }
1591    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1592    
1593    /* this must be an object literal */    /* this must be an object literal */
1594    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1595      return -1;      result = -1;
1596        goto done;
1597    }    }
1598    
1599    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1600      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1601      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1602        return -1;        result = -1;
1603          goto done;
1604      }      }
1605    
1606      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1607      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1608      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1609        return -1;        result = -1;
1610          goto done;
1611      }      }
1612      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1613    
1614      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1615      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1616      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1617        return -1;        result = -1;
1618          goto done;
1619      }      }
1620    
1621      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1446  Line 1627 
1627      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1628        /* an object literal */        /* an object literal */
1629        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1630          return -1;          result = -1;
1631            goto done;
1632        }        }
1633        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1634          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1635            return -1;            result = -1;
1636              goto done;
1637          }          }
1638          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1639          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1640            return -1;            result = -1;
1641              goto done;
1642          }          }
1643          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1644          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1645            array = element->pn_right;            array = element->pn_right;
1646            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1647              return -1;              result = -1;
1648                goto done;
1649            }            }
1650          }          }
1651          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1652            source = element->pn_right;            source = element->pn_right;
1653            if (source->pn_type != TOK_RB) {            if (source->pn_type != TOK_RB) {
1654              return -1;              result = -1;
1655                goto done;
1656            }            }
1657          }          }
1658          else {          else {
1659            return -1;            result = -1;
1660              goto done;
1661          }          }
1662        }        }
1663      }      }
1664      else {      else {
1665        return -1;        result = -1;
1666          goto done;
1667      }      }
1668    
1669      if (array == NULL) {      if (array == NULL) {
1670        return -1;        result = -1;
1671          goto done;
1672      }      }
1673    
1674      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1503  Line 1692 
1692            file_coverage->coverage_lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1693          }          }
1694          else {          else {
1695            return -1;            result = -1;
1696              goto done;
1697          }          }
1698        }        }
1699        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1519  Line 1709 
1709        /* sanity check */        /* sanity check */
1710        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1711        if (file_coverage->num_coverage_lines != array->pn_count) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1712          return -2;          result = -2;
1713            goto done;
1714        }        }
1715    
1716        /* merge the coverage */        /* merge the coverage */
# Line 1527  Line 1718 
1718        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++) {
1719          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1720            if (file_coverage->coverage_lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1721              return -2;              result = -2;
1722                goto done;
1723            }            }
1724            file_coverage->coverage_lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1725          }          }
1726          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1727            if (file_coverage->coverage_lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1728              return -2;              result = -2;
1729                goto done;
1730            }            }
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 1550  Line 1744 
1744        uint32 i = 0;        uint32 i = 0;
1745        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++) {
1746          if (element->pn_type != TOK_STRING) {          if (element->pn_type != TOK_STRING) {
1747            return -1;            result = -1;
1748              goto done;
1749          }          }
1750          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)));
1751        }        }
# Line 1558  Line 1753 
1753      }      }
1754    }    }
1755    
1756    return 0;  done:
1757      js_FinishParseContext(context, &parse_context);
1758      return result;
1759  }  }

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

  ViewVC Help
Powered by ViewVC 1.1.24