/[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 214 by siliconforks, Fri Oct 3 02:26:04 2008 UTC revision 374 by siliconforks, Mon Oct 27 21:42:58 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>
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 40  Line 44 
44  #include "resource-manager.h"  #include "resource-manager.h"
45  #include "util.h"  #include "util.h"
46    
47    struct IfDirective {
48      const jschar * condition_start;
49      const jschar * condition_end;
50      uint16_t start_line;
51      uint16_t end_line;
52      struct IfDirective * next;
53    };
54    
55    bool jscoverage_mozilla = false;
56    
57    static bool * exclusive_directives = NULL;
58    
59  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
60  static JSContext * context = NULL;  static JSContext * context = NULL;
61  static JSObject * global = NULL;  static JSObject * global = NULL;
62    static JSVersion js_version = JSVERSION_ECMA_3;
63    
64  /*  /*
65  JSParseNode objects store line numbers starting from 1.  JSParseNode objects store line numbers starting from 1.
# Line 52  Line 69 
69  static char * lines = NULL;  static char * lines = NULL;
70  static uint16_t num_lines = 0;  static uint16_t num_lines = 0;
71    
72    void jscoverage_set_js_version(const char * version) {
73      js_version = JS_StringToVersion(version);
74      if (js_version != JSVERSION_UNKNOWN) {
75        return;
76      }
77    
78      char * end;
79      js_version = (JSVersion) strtol(version, &end, 10);
80      if ((size_t) (end - version) != strlen(version)) {
81        fatal("invalid version: %s", version);
82      }
83    }
84    
85  void jscoverage_init(void) {  void jscoverage_init(void) {
86    runtime = JS_NewRuntime(8L * 1024L * 1024L);    runtime = JS_NewRuntime(8L * 1024L * 1024L);
87    if (runtime == NULL) {    if (runtime == NULL) {
# Line 63  Line 93 
93      fatal("cannot create context");      fatal("cannot create context");
94    }    }
95    
96      JS_SetVersion(context, js_version);
97    
98    global = JS_NewObject(context, NULL, NULL, NULL);    global = JS_NewObject(context, NULL, NULL, NULL);
99    if (global == NULL) {    if (global == NULL) {
100      fatal("cannot create global object");      fatal("cannot create global object");
# Line 78  Line 110 
110    JS_DestroyRuntime(runtime);    JS_DestroyRuntime(runtime);
111  }  }
112    
113    static void print_javascript(const jschar * characters, size_t num_characters, Stream * f) {
114      for (size_t i = 0; i < num_characters; i++) {
115        jschar c = characters[i];
116        /*
117        XXX does not handle no-break space, other unicode "space separator"
118        */
119        switch (c) {
120        case 0x9:
121        case 0xB:
122        case 0xC:
123          Stream_write_char(f, c);
124          break;
125        default:
126          if (32 <= c && c <= 126) {
127            Stream_write_char(f, c);
128          }
129          else {
130            Stream_printf(f, "\\u%04x", c);
131          }
132          break;
133        }
134      }
135    }
136    
137  static void print_string(JSString * s, Stream * f) {  static void print_string(JSString * s, Stream * f) {
138    size_t length = JSSTRING_LENGTH(s);    size_t length = JSSTRING_LENGTH(s);
139    jschar * characters = JSSTRING_CHARS(s);    jschar * characters = JSSTRING_CHARS(s);
# Line 112  Line 168 
168        case 0xa:        case 0xa:
169          Stream_write_string(f, "\\n");          Stream_write_string(f, "\\n");
170          break;          break;
171          /* IE doesn't support this */
172          /*
173        case 0xb:        case 0xb:
174          Stream_write_string(f, "\\v");          Stream_write_string(f, "\\v");
175          break;          break;
176          */
177        case 0xc:        case 0xc:
178          Stream_write_string(f, "\\f");          Stream_write_string(f, "\\f");
179          break;          break;
# Line 161  Line 220 
220    
221  static const char * get_op(uint8 op) {  static const char * get_op(uint8 op) {
222    switch(op) {    switch(op) {
223      case JSOP_OR:
224        return "||";
225      case JSOP_AND:
226        return "&&";
227    case JSOP_BITOR:    case JSOP_BITOR:
228      return "|";      return "|";
229    case JSOP_BITXOR:    case JSOP_BITXOR:
# Line 171  Line 234 
234      return "==";      return "==";
235    case JSOP_NE:    case JSOP_NE:
236      return "!=";      return "!=";
237    case JSOP_NEW_EQ:    case JSOP_STRICTEQ:
238      return "===";      return "===";
239    case JSOP_NEW_NE:    case JSOP_STRICTNE:
240      return "!==";      return "!==";
241    case JSOP_LT:    case JSOP_LT:
242      return "<";      return "<";
# Line 205  Line 268 
268  }  }
269    
270  static void instrument_expression(JSParseNode * node, Stream * f);  static void instrument_expression(JSParseNode * node, Stream * f);
271  static void instrument_statement(JSParseNode * node, Stream * f, int indent);  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if);
272    static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if);
273    
274  enum FunctionType {  enum FunctionType {
275    FUNCTION_NORMAL,    FUNCTION_NORMAL,
276    FUNCTION_GETTER_OR_SETTER    FUNCTION_GETTER_OR_SETTER
277  };  };
278    
279    static void output_for_in(JSParseNode * node, Stream * f) {
280      assert(node->pn_type == TOK_FOR);
281      assert(node->pn_arity == PN_BINARY);
282      Stream_write_string(f, "for ");
283      if (node->pn_iflags & JSITER_FOREACH) {
284        Stream_write_string(f, "each ");
285      }
286      Stream_write_char(f, '(');
287      instrument_expression(node->pn_left, f);
288      Stream_write_char(f, ')');
289    }
290    
291    static void output_array_comprehension_or_generator_expression(JSParseNode * node, Stream * f) {
292      assert(node->pn_type == TOK_LEXICALSCOPE);
293      assert(node->pn_arity == PN_NAME);
294      JSParseNode * for_node = node->pn_expr;
295      assert(for_node->pn_type == TOK_FOR);
296      assert(for_node->pn_arity == PN_BINARY);
297      JSParseNode * p = for_node;
298      while (p->pn_type == TOK_FOR) {
299        p = p->pn_right;
300      }
301      JSParseNode * if_node = NULL;
302      if (p->pn_type == TOK_IF) {
303        if_node = p;
304        assert(if_node->pn_arity == PN_TERNARY);
305        p = if_node->pn_kid2;
306      }
307      assert(p->pn_arity == PN_UNARY);
308      p = p->pn_kid;
309      if (p->pn_type == TOK_YIELD) {
310        /* for generator expressions */
311        p = p->pn_kid;
312      }
313    
314      instrument_expression(p, f);
315      p = for_node;
316      while (p->pn_type == TOK_FOR) {
317        Stream_write_char(f, ' ');
318        output_for_in(p, f);
319        p = p->pn_right;
320      }
321      if (if_node) {
322        Stream_write_string(f, " if (");
323        instrument_expression(if_node->pn_kid1, f);
324        Stream_write_char(f, ')');
325      }
326    }
327    
328  static void instrument_function(JSParseNode * node, Stream * f, int indent, enum FunctionType type) {  static void instrument_function(JSParseNode * node, Stream * f, int indent, enum FunctionType type) {
329      assert(node->pn_type == TOK_FUNCTION);
330    assert(node->pn_arity == PN_FUNC);    assert(node->pn_arity == PN_FUNC);
331    assert(ATOM_IS_OBJECT(node->pn_funAtom));    JSObject * object = node->pn_funpob->object;
   JSObject * object = ATOM_TO_OBJECT(node->pn_funAtom);  
332    assert(JS_ObjectIsFunction(context, object));    assert(JS_ObjectIsFunction(context, object));
333    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
334    assert(function);    assert(function);
335    assert(object == function->object);    assert(object == &function->object);
336    Stream_printf(f, "%*s", indent, "");    Stream_printf(f, "%*s", indent, "");
337    if (type == FUNCTION_NORMAL) {    if (type == FUNCTION_NORMAL) {
338      Stream_write_string(f, "function");      Stream_write_string(f, "function ");
339    }    }
340    
341    /* function name */    /* function name */
342    if (function->atom) {    if (function->atom) {
     Stream_write_char(f, ' ');  
343      print_string_atom(function->atom, f);      print_string_atom(function->atom, f);
344    }    }
345    
346    /* function parameters */    /*
347    Stream_write_string(f, "(");    function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
348    JSAtom ** params = xnew(JSAtom *, function->nargs);    js_DecompileFunction in jsopcode.cpp
349    for (int i = 0; i < function->nargs; i++) {    */
350      /* initialize to NULL for sanity check */    Stream_write_char(f, '(');
351      params[i] = NULL;    JSArenaPool pool;
352    }    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
353    JSScope * scope = OBJ_SCOPE(object);    jsuword * local_names = NULL;
354    for (JSScopeProperty * scope_property = SCOPE_LAST_PROP(scope); scope_property != NULL; scope_property = scope_property->parent) {    if (JS_GET_LOCAL_NAME_COUNT(function)) {
355      if (scope_property->getter != js_GetArgument) {      local_names = js_GetLocalNameArray(context, function, &pool);
356        continue;      if (local_names == NULL) {
357          fatal("out of memory");
358      }      }
     assert(scope_property->flags & SPROP_HAS_SHORTID);  
     assert((uint16) scope_property->shortid < function->nargs);  
     assert(JSID_IS_ATOM(scope_property->id));  
     params[(uint16) scope_property->shortid] = JSID_TO_ATOM(scope_property->id);  
359    }    }
360      bool destructuring = false;
361    for (int i = 0; i < function->nargs; i++) {    for (int i = 0; i < function->nargs; i++) {
     assert(params[i] != NULL);  
362      if (i > 0) {      if (i > 0) {
363        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
364      }      }
365      if (ATOM_IS_STRING(params[i])) {      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
366        print_string_atom(params[i], f);      if (param == NULL) {
367          destructuring = true;
368          JSParseNode * expression = NULL;
369          assert(node->pn_body->pn_type == TOK_LC || node->pn_body->pn_type == TOK_BODY);
370          JSParseNode * semi = node->pn_body->pn_head;
371          assert(semi->pn_type == TOK_SEMI);
372          JSParseNode * comma = semi->pn_kid;
373          assert(comma->pn_type == TOK_COMMA);
374          for (JSParseNode * p = comma->pn_head; p != NULL; p = p->pn_next) {
375            assert(p->pn_type == TOK_ASSIGN);
376            JSParseNode * rhs = p->pn_right;
377            assert(JSSTRING_LENGTH(ATOM_TO_STRING(rhs->pn_atom)) == 0);
378            if (rhs->pn_slot == i) {
379              expression = p->pn_left;
380              break;
381            }
382          }
383          assert(expression != NULL);
384          instrument_expression(expression, f);
385        }
386        else {
387          print_string_atom(param, f);
388      }      }
389    }    }
390      JS_FinishArenaPool(&pool);
391    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
   free(params);  
392    
393    /* function body */    /* function body */
394    instrument_statement(node->pn_body, f, indent + 2);    if (function->flags & JSFUN_EXPR_CLOSURE) {
395        /* expression closure - use output_statement instead of instrument_statement */
396        if (node->pn_body->pn_type == TOK_BODY) {
397          assert(node->pn_body->pn_arity == PN_LIST);
398          assert(node->pn_body->pn_count == 2);
399          output_statement(node->pn_body->pn_head->pn_next, f, indent + 2, false);
400        }
401        else {
402          output_statement(node->pn_body, f, indent + 2, false);
403        }
404      }
405      else {
406        assert(node->pn_body->pn_type == TOK_LC);
407        assert(node->pn_body->pn_arity == PN_LIST);
408        JSParseNode * p = node->pn_body->pn_head;
409        if (destructuring) {
410          p = p->pn_next;
411        }
412        for (; p != NULL; p = p->pn_next) {
413          instrument_statement(p, f, indent + 2, false);
414        }
415      }
416    
417    Stream_write_string(f, "}\n");    Stream_write_string(f, "}\n");
418  }  }
419    
420  static void instrument_function_call(JSParseNode * node, Stream * f) {  static void instrument_function_call(JSParseNode * node, Stream * f) {
421    instrument_expression(node->pn_head, f);    JSParseNode * function_node = node->pn_head;
422      if (function_node->pn_type == TOK_FUNCTION) {
423        JSObject * object = function_node->pn_funpob->object;
424        assert(JS_ObjectIsFunction(context, object));
425        JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
426        assert(function);
427        assert(object == &function->object);
428    
429        if (function_node->pn_flags & TCF_GENEXP_LAMBDA) {
430          /* it's a generator expression */
431          Stream_write_char(f, '(');
432          output_array_comprehension_or_generator_expression(function_node->pn_body, f);
433          Stream_write_char(f, ')');
434          return;
435        }
436        else {
437          Stream_write_char(f, '(');
438          instrument_expression(function_node, f);
439          Stream_write_char(f, ')');
440        }
441      }
442      else {
443        instrument_expression(function_node, f);
444      }
445    Stream_write_char(f, '(');    Stream_write_char(f, '(');
446    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) {
447      if (p != node->pn_head->pn_next) {      if (p != node->pn_head->pn_next) {
448        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
449      }      }
# Line 278  Line 452 
452    Stream_write_char(f, ')');    Stream_write_char(f, ')');
453  }  }
454    
455    static void instrument_declarations(JSParseNode * list, Stream * f) {
456      assert(list->pn_arity == PN_LIST);
457      for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
458        switch (p->pn_type) {
459        case TOK_NAME:
460          assert(p->pn_arity == PN_NAME);
461          if (p != list->pn_head) {
462            Stream_write_string(f, ", ");
463          }
464          print_string_atom(p->pn_atom, f);
465          if (p->pn_expr != NULL) {
466            Stream_write_string(f, " = ");
467            instrument_expression(p->pn_expr, f);
468          }
469          break;
470        case TOK_ASSIGN:
471          /* destructuring */
472          instrument_expression(p->pn_left, f);
473          Stream_write_string(f, " = ");
474          instrument_expression(p->pn_right, f);
475          break;
476        case TOK_RB:
477        case TOK_RC:
478          /* destructuring */
479          instrument_expression(p, f);
480          break;
481        default:
482          abort();
483          break;
484        }
485      }
486    }
487    
488  /*  /*
489  See <Expressions> in jsparse.h.  See <Expressions> in jsparse.h.
490  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
# Line 305  Line 512 
512      }      }
513      break;      break;
514    case TOK_ASSIGN:    case TOK_ASSIGN:
515      instrument_expression(node->pn_left, f);      if (node->pn_left->pn_type == TOK_RC) {
516          /* destructuring assignment with object literal must be in parentheses */
517          Stream_write_char(f, '(');
518          instrument_expression(node->pn_left, f);
519          Stream_write_char(f, ')');
520        }
521        else {
522          instrument_expression(node->pn_left, f);
523        }
524      Stream_write_char(f, ' ');      Stream_write_char(f, ' ');
525      switch (node->pn_op) {      switch (node->pn_op) {
526      case JSOP_ADD:      case JSOP_ADD:
# Line 336  Line 551 
551      instrument_expression(node->pn_kid3, f);      instrument_expression(node->pn_kid3, f);
552      break;      break;
553    case TOK_OR:    case TOK_OR:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " || ");  
     instrument_expression(node->pn_right, f);  
     break;  
554    case TOK_AND:    case TOK_AND:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " && ");  
     instrument_expression(node->pn_right, f);  
     break;  
555    case TOK_BITOR:    case TOK_BITOR:
556    case TOK_BITXOR:    case TOK_BITXOR:
557    case TOK_BITAND:    case TOK_BITAND:
# Line 400  Line 607 
607        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
608        break;        break;
609      default:      default:
610        abort();        fatal_source(file_id, node->pn_pos.begin.lineno, "unknown operator (%d)", node->pn_op);
611        break;        break;
612      }      }
613      break;      break;
# Line 457  Line 664 
664      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
665      {      {
666        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
667        /* XXX - semantics changed in 1.7 */        bool must_quote;
668        if (! ATOM_KEYWORD(node->pn_atom) && js_IsIdentifier(s)) {        if (JSSTRING_LENGTH(s) == 0) {
669          Stream_write_char(f, '.');          must_quote = true;
670          print_string_atom(node->pn_atom, f);        }
671          else if (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF) {
672            must_quote = true;
673          }
674          else if (! js_IsIdentifier(s)) {
675            must_quote = true;
676        }        }
677        else {        else {
678            must_quote = false;
679          }
680          if (must_quote) {
681          Stream_write_char(f, '[');          Stream_write_char(f, '[');
682          print_quoted_string_atom(node->pn_atom, f);          print_quoted_string_atom(node->pn_atom, f);
683          Stream_write_char(f, ']');          Stream_write_char(f, ']');
684        }        }
685          else {
686            Stream_write_char(f, '.');
687            print_string_atom(node->pn_atom, f);
688          }
689      }      }
690      break;      break;
691    case TOK_LB:    case TOK_LB:
# Line 497  Line 716 
716    case TOK_RC:    case TOK_RC:
717      Stream_write_char(f, '{');      Stream_write_char(f, '{');
718      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) {
719        assert(p->pn_type == TOK_COLON);        if (p->pn_type != TOK_COLON) {
720            fatal_source(file_id, p->pn_pos.begin.lineno, "unsupported node type (%d)", p->pn_type);
721          }
722        if (p != node->pn_head) {        if (p != node->pn_head) {
723          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
724        }        }
# Line 505  Line 726 
726        /* check whether this is a getter or setter */        /* check whether this is a getter or setter */
727        switch (p->pn_op) {        switch (p->pn_op) {
728        case JSOP_GETTER:        case JSOP_GETTER:
         Stream_write_string(f, "get ");  
         instrument_expression(p->pn_left, f);  
         instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);  
         break;  
729        case JSOP_SETTER:        case JSOP_SETTER:
730          Stream_write_string(f, "set ");          if (p->pn_op == JSOP_GETTER) {
731              Stream_write_string(f, "get ");
732            }
733            else {
734              Stream_write_string(f, "set ");
735            }
736          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
737            if (p->pn_right->pn_type != TOK_FUNCTION) {
738              fatal_source(file_id, p->pn_pos.begin.lineno, "expected function");
739            }
740          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);
741          break;          break;
742        default:        default:
# Line 534  Line 759 
759    case TOK_STRING:    case TOK_STRING:
760      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
761      break;      break;
762    case TOK_OBJECT:    case TOK_REGEXP:
763      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
764      case JSOP_OBJECT:      {
765        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
766        abort();        jsval result;
767        break;        js_regexp_toString(context, object, &result);
768      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;  
769      }      }
770      break;      break;
771    case TOK_NUMBER:    case TOK_NUMBER:
# Line 597  Line 811 
811      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
812      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
813      break;      break;
814    default:    case TOK_LEXICALSCOPE:
815      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      assert(node->pn_arity == PN_NAME);
816    }      assert(node->pn_expr->pn_type == TOK_LET);
817  }      assert(node->pn_expr->pn_arity == PN_BINARY);
818        Stream_write_string(f, "let(");
819  static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {      assert(node->pn_expr->pn_left->pn_type == TOK_LP);
820    assert(node->pn_arity == PN_LIST);      assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
821    Stream_printf(f, "%*s", indent, "");      instrument_declarations(node->pn_expr->pn_left, f);
822    Stream_write_string(f, "var ");      Stream_write_string(f, ") ");
823    for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      instrument_expression(node->pn_expr->pn_right, f);
824      assert(p->pn_type == TOK_NAME);      break;
825      assert(p->pn_arity == PN_NAME);    case TOK_YIELD:
826      if (p != node->pn_head) {      assert(node->pn_arity == PN_UNARY);
827        Stream_write_string(f, ", ");      Stream_write_string(f, "yield");
828        if (node->pn_kid != NULL) {
829          Stream_write_char(f, ' ');
830          instrument_expression(node->pn_kid, f);
831      }      }
832      print_string_atom(p->pn_atom, f);      break;
833      if (p->pn_expr != NULL) {    case TOK_ARRAYCOMP:
834        Stream_write_string(f, " = ");      assert(node->pn_arity == PN_LIST);
835        instrument_expression(p->pn_expr, f);      {
836          JSParseNode * block_node;
837          switch (node->pn_count) {
838          case 1:
839            block_node = node->pn_head;
840            break;
841          case 2:
842            block_node = node->pn_head->pn_next;
843            break;
844          default:
845            abort();
846            break;
847          }
848          Stream_write_char(f, '[');
849          output_array_comprehension_or_generator_expression(block_node, f);
850          Stream_write_char(f, ']');
851      }      }
852        break;
853      case TOK_VAR:
854        assert(node->pn_arity == PN_LIST);
855        Stream_write_string(f, "var ");
856        instrument_declarations(node, f);
857        break;
858      case TOK_LET:
859        assert(node->pn_arity == PN_LIST);
860        Stream_write_string(f, "let ");
861        instrument_declarations(node, f);
862        break;
863      default:
864        fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
865    }    }
866  }  }
867    
868  static void output_statement(JSParseNode * node, Stream * f, int indent) {  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
869    switch (node->pn_type) {    switch (node->pn_type) {
870    case TOK_FUNCTION:    case TOK_FUNCTION:
871      instrument_function(node, f, indent, FUNCTION_NORMAL);      instrument_function(node, f, indent, FUNCTION_NORMAL);
# Line 631  Line 876 
876      Stream_write_string(f, "{\n");      Stream_write_string(f, "{\n");
877  */  */
878      for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {
879        instrument_statement(p, f, indent);        instrument_statement(p, f, indent, false);
880      }      }
881  /*  /*
882      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
# Line 639  Line 884 
884  */  */
885      break;      break;
886    case TOK_IF:    case TOK_IF:
887      {
888      assert(node->pn_arity == PN_TERNARY);      assert(node->pn_arity == PN_TERNARY);
889    
890        uint16_t line = node->pn_pos.begin.lineno;
891        if (! is_jscoverage_if) {
892          if (line > num_lines) {
893            fatal("file %s contains more than 65,535 lines", file_id);
894          }
895          if (line >= 2 && exclusive_directives[line - 2]) {
896            is_jscoverage_if = true;
897          }
898        }
899    
900      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
901      Stream_write_string(f, "if (");      Stream_write_string(f, "if (");
902      instrument_expression(node->pn_kid1, f);      instrument_expression(node->pn_kid1, f);
903      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
904      instrument_statement(node->pn_kid2, f, indent + 2);      if (is_jscoverage_if && node->pn_kid3) {
905          uint16_t else_start = node->pn_kid3->pn_pos.begin.lineno;
906          uint16_t else_end = node->pn_kid3->pn_pos.end.lineno + 1;
907          Stream_printf(f, "%*s", indent + 2, "");
908          Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, else_start, else_end);
909        }
910        instrument_statement(node->pn_kid2, f, indent + 2, false);
911      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
912      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
913      if (node->pn_kid3) {  
914        if (node->pn_kid3 || is_jscoverage_if) {
915        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
916        Stream_write_string(f, "else {\n");        Stream_write_string(f, "else {\n");
917        instrument_statement(node->pn_kid3, f, indent + 2);  
918          if (is_jscoverage_if) {
919            uint16_t if_start = node->pn_kid2->pn_pos.begin.lineno + 1;
920            uint16_t if_end = node->pn_kid2->pn_pos.end.lineno + 1;
921            Stream_printf(f, "%*s", indent + 2, "");
922            Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_start, if_end);
923          }
924    
925          if (node->pn_kid3) {
926            instrument_statement(node->pn_kid3, f, indent + 2, is_jscoverage_if);
927          }
928    
929        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
930        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
931      }      }
932    
933      break;      break;
934      }
935    case TOK_SWITCH:    case TOK_SWITCH:
936      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
937      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
938      Stream_write_string(f, "switch (");      Stream_write_string(f, "switch (");
939      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
940      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
941      for (struct JSParseNode * p = node->pn_right->pn_head; p != NULL; p = p->pn_next) {      {
942        Stream_printf(f, "%*s", indent, "");        JSParseNode * list = node->pn_right;
943        switch (p->pn_type) {        if (list->pn_type == TOK_LEXICALSCOPE) {
944        case TOK_CASE:          list = list->pn_expr;
945          Stream_write_string(f, "case ");        }
946          instrument_expression(p->pn_left, f);        for (struct JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
947          Stream_write_string(f, ":\n");          Stream_printf(f, "%*s", indent, "");
948          break;          switch (p->pn_type) {
949        case TOK_DEFAULT:          case TOK_CASE:
950          Stream_write_string(f, "default:\n");            Stream_write_string(f, "case ");
951          break;            instrument_expression(p->pn_left, f);
952        default:            Stream_write_string(f, ":\n");
953          abort();            break;
954          break;          case TOK_DEFAULT:
955              Stream_write_string(f, "default:\n");
956              break;
957            default:
958              abort();
959              break;
960            }
961            instrument_statement(p->pn_right, f, indent + 2, false);
962        }        }
       instrument_statement(p->pn_right, f, indent + 2);  
963      }      }
964      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
965      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 691  Line 974 
974      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
975      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
976      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
977      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
978      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
979      break;      break;
980    case TOK_DO:    case TOK_DO:
981      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
982      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
983      Stream_write_string(f, "do {\n");      Stream_write_string(f, "do {\n");
984      instrument_statement(node->pn_left, f, indent + 2);      instrument_statement(node->pn_left, f, indent + 2, false);
985      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
986      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
987      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
# Line 708  Line 991 
991    case TOK_FOR:    case TOK_FOR:
992      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
993      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
994      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
995      case TOK_IN:      case TOK_IN:
996        /* for/in */        /* for/in */
997        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
998        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);  
999        break;        break;
1000      case TOK_RESERVED:      case TOK_RESERVED:
1001        /* for (;;) */        /* for (;;) */
1002        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
1003          Stream_write_string(f, "for (");
1004        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
1005          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);  
         }  
1006        }        }
1007        Stream_write_string(f, ";");        Stream_write_string(f, ";");
1008        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 755  Line 1014 
1014          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
1015          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
1016        }        }
1017          Stream_write_char(f, ')');
1018        break;        break;
1019      default:      default:
1020        abort();        abort();
1021        break;        break;
1022      }      }
1023      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
1024      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
1025      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1026      break;      break;
1027    case TOK_THROW:    case TOK_THROW:
# Line 774  Line 1034 
1034    case TOK_TRY:    case TOK_TRY:
1035      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1036      Stream_write_string(f, "try {\n");      Stream_write_string(f, "try {\n");
1037      instrument_statement(node->pn_kid1, f, indent + 2);      instrument_statement(node->pn_kid1, f, indent + 2, false);
1038      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1039      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1040      {      if (node->pn_kid2) {
1041        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
1042          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
1043            assert(scope->pn_type == TOK_LEXICALSCOPE);
1044            JSParseNode * catch = scope->pn_expr;
1045          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
1046          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1047          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
1048            /* this may not be a name - destructuring assignment */
1049            /*
1050          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
1051          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
1052          if (catch->pn_kid1->pn_expr) {          */
1053            instrument_expression(catch->pn_kid1, f);
1054            if (catch->pn_kid2) {
1055            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1056            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
1057          }          }
1058          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
1059          instrument_statement(catch->pn_kid3, f, indent + 2);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
1060          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1061          Stream_write_string(f, "}\n");          Stream_write_string(f, "}\n");
1062        }        }
# Line 797  Line 1064 
1064      if (node->pn_kid3) {      if (node->pn_kid3) {
1065        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1066        Stream_write_string(f, "finally {\n");        Stream_write_string(f, "finally {\n");
1067        instrument_statement(node->pn_kid3, f, indent + 2);        instrument_statement(node->pn_kid3, f, indent + 2, false);
1068        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1069        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
1070      }      }
# Line 823  Line 1090 
1090      Stream_write_string(f, "with (");      Stream_write_string(f, "with (");
1091      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
1092      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
1093      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
1094      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1095      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1096      break;      break;
1097    case TOK_VAR:    case TOK_VAR:
1098      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1099        instrument_expression(node, f);
1100      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1101      break;      break;
1102    case TOK_RETURN:    case TOK_RETURN:
# Line 861  Line 1129 
1129      /*      /*
1130      ... use output_statement instead of instrument_statement.      ... use output_statement instead of instrument_statement.
1131      */      */
1132      output_statement(node->pn_expr, f, indent);      output_statement(node->pn_expr, f, indent, false);
1133        break;
1134      case TOK_LEXICALSCOPE:
1135        /* let statement */
1136        assert(node->pn_arity == PN_NAME);
1137        switch (node->pn_expr->pn_type) {
1138        case TOK_LET:
1139          /* let statement */
1140          assert(node->pn_expr->pn_arity == PN_BINARY);
1141          instrument_statement(node->pn_expr, f, indent, false);
1142          break;
1143        case TOK_LC:
1144          /* block */
1145          Stream_printf(f, "%*s", indent, "");
1146          Stream_write_string(f, "{\n");
1147          instrument_statement(node->pn_expr, f, indent + 2, false);
1148          Stream_printf(f, "%*s", indent, "");
1149          Stream_write_string(f, "}\n");
1150          break;
1151        case TOK_FOR:
1152          instrument_statement(node->pn_expr, f, indent, false);
1153          break;
1154        default:
1155          abort();
1156          break;
1157        }
1158        break;
1159      case TOK_LET:
1160        switch (node->pn_arity) {
1161        case PN_BINARY:
1162          /* let statement */
1163          Stream_printf(f, "%*s", indent, "");
1164          Stream_write_string(f, "let (");
1165          assert(node->pn_left->pn_type == TOK_LP);
1166          assert(node->pn_left->pn_arity == PN_LIST);
1167          instrument_declarations(node->pn_left, f);
1168          Stream_write_string(f, ") {\n");
1169          instrument_statement(node->pn_right, f, indent + 2, false);
1170          Stream_printf(f, "%*s", indent, "");
1171          Stream_write_string(f, "}\n");
1172          break;
1173        case PN_LIST:
1174          /* let definition */
1175          Stream_printf(f, "%*s", indent, "");
1176          instrument_expression(node, f);
1177          Stream_write_string(f, ";\n");
1178          break;
1179        default:
1180          abort();
1181          break;
1182        }
1183        break;
1184      case TOK_DEBUGGER:
1185        Stream_printf(f, "%*s", indent, "");
1186        Stream_write_string(f, "debugger;\n");
1187      break;      break;
1188    default:    default:
1189      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
1190    }    }
1191  }  }
1192    
# Line 873  Line 1195 
1195  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
1196  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1197  */  */
1198  static void instrument_statement(JSParseNode * node, Stream * f, int indent) {  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
1199    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1200      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1201      if (line > num_lines) {      if (line > num_lines) {
1202        fatal("%s: script contains more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1203      }      }
1204    
1205      /* the root node has line number 0 */      /* the root node has line number 0 */
# Line 887  Line 1209 
1209        lines[line - 1] = 1;        lines[line - 1] = 1;
1210      }      }
1211    }    }
1212    output_statement(node, f, indent);    output_statement(node, f, indent, is_jscoverage_if);
1213  }  }
1214    
1215  static bool characters_start_with(const jschar * characters, size_t line_start, size_t line_end, const char * prefix) {  static bool characters_start_with(const jschar * characters, size_t line_start, size_t line_end, const char * prefix) {
# Line 909  Line 1231 
1231    }    }
1232  }  }
1233    
1234    static bool characters_are_white_space(const jschar * characters, size_t line_start, size_t line_end) {
1235      /* XXX - other Unicode space */
1236      const jschar * end = characters + line_end;
1237      for (const jschar * p = characters + line_start; p < end; p++) {
1238        jschar c = *p;
1239        if (c == 0x9 || c == 0xB || c == 0xC || c == 0x20 || c == 0xA0) {
1240          continue;
1241        }
1242        else {
1243          return false;
1244        }
1245      }
1246      return true;
1247    }
1248    
1249    static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1250      warn_source(file_id, report->lineno, "%s", message);
1251    }
1252    
1253  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) {
1254    file_id = id;    file_id = id;
1255    
   /* scan the javascript */  
   JSTokenStream * token_stream = js_NewTokenStream(context, characters, num_characters, NULL, 1, NULL);  
   if (token_stream == NULL) {  
     fatal("cannot create token stream from file: %s", file_id);  
   }  
   
1256    /* parse the javascript */    /* parse the javascript */
1257    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseContext parse_context;
1258      if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1259        fatal("cannot create token stream from file %s", file_id);
1260      }
1261      JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1262      JSParseNode * node = js_ParseScript(context, global, &parse_context);
1263    if (node == NULL) {    if (node == NULL) {
1264      fatal("parse error in file: %s", file_id);      js_ReportUncaughtException(context);
1265        fatal("parse error in file %s", file_id);
1266    }    }
1267      JS_SetErrorReporter(context, old_error_reporter);
1268    num_lines = node->pn_pos.end.lineno;    num_lines = node->pn_pos.end.lineno;
1269    lines = xmalloc(num_lines);    lines = xmalloc(num_lines);
1270    for (int i = 0; i < num_lines; i++) {    for (unsigned int i = 0; i < num_lines; i++) {
1271      lines[i] = 0;      lines[i] = 0;
1272    }    }
1273    
1274    /*    /* search code for conditionals */
1275    An instrumented JavaScript file has 3 sections:    exclusive_directives = xnew(bool, num_lines);
1276    1. initialization    for (unsigned int i = 0; i < num_lines; i++) {
1277    2. instrumented source code      exclusive_directives[i] = false;
   3. original source code  
   */  
   
   Stream * instrumented = Stream_new(0);  
   instrument_statement(node, instrumented, 0);  
   
   /* write line number info to the output */  
   Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");  
   Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");  
   Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");  
   Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);  
   Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);  
   for (int i = 0; i < num_lines; i++) {  
     if (lines[i]) {  
       Stream_printf(output, "  _$jscoverage['%s'][%d] = 0;\n", file_id, i + 1);  
     }  
1278    }    }
   Stream_write_string(output, "}\n");  
   free(lines);  
   lines = NULL;  
1279    
   /* copy the instrumented source code to the output */  
   Stream_write(output, instrumented->data, instrumented->length);  
   
   /* conditionals */  
1280    bool has_conditionals = false;    bool has_conditionals = false;
1281      struct IfDirective * if_directives = NULL;
1282    size_t line_number = 0;    size_t line_number = 0;
1283    size_t i = 0;    size_t i = 0;
1284    while (i < num_characters) {    while (i < num_characters) {
1285        if (line_number == UINT16_MAX) {
1286          fatal("file %s contains more than 65,535 lines", file_id);
1287        }
1288      line_number++;      line_number++;
1289      size_t line_start = i;      size_t line_start = i;
1290      jschar c;      jschar c;
# Line 977  Line 1300 
1300          break;          break;
1301        default:        default:
1302          i++;          i++;
         break;  
1303        }        }
1304      }      }
1305      size_t line_end = i;      size_t line_end = i;
# Line 987  Line 1309 
1309          i++;          i++;
1310        }        }
1311      }      }
1312    
1313      if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_IF")) {      if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_IF")) {
1314        if (! has_conditionals) {        has_conditionals = true;
1315          has_conditionals = true;  
1316          Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);        if (characters_are_white_space(characters, line_start + 16, line_end)) {
1317        }          exclusive_directives[line_number - 1] = true;
1318        Stream_write_string(output, "if (!(");        }
1319        for (size_t j = line_start + 16; j < line_end; j++) {        else {
1320          jschar c = characters[j];          struct IfDirective * if_directive = xnew(struct IfDirective, 1);
1321          if (c == '\t' || (32 <= c && c <= 126)) {          if_directive->condition_start = characters + line_start + 16;
1322            Stream_write_char(output, c);          if_directive->condition_end = characters + line_end;
1323          }          if_directive->start_line = line_number;
1324          else {          if_directive->end_line = 0;
1325            Stream_printf(output, "\\u%04x", c);          if_directive->next = if_directives;
1326          }          if_directives = if_directive;
1327        }        }
       Stream_write_string(output, ")) {\n");  
       Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = ", file_id, line_number);  
1328      }      }
1329      else if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_ENDIF")) {      else if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_ENDIF")) {
1330        Stream_printf(output, "%d;\n", line_number);        for (struct IfDirective * p = if_directives; p != NULL; p = p->next) {
1331        Stream_printf(output, "}\n");          if (p->end_line == 0) {
1332              p->end_line = line_number;
1333              break;
1334            }
1335          }
1336        }
1337      }
1338    
1339      /*
1340      An instrumented JavaScript file has 4 sections:
1341      1. initialization
1342      2. instrumented source code
1343      3. conditionals
1344      4. original source code
1345      */
1346    
1347      Stream * instrumented = Stream_new(0);
1348      instrument_statement(node, instrumented, 0, false);
1349      js_FinishParseContext(context, &parse_context);
1350    
1351      /* write line number info to the output */
1352      Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
1353      if (jscoverage_mozilla) {
1354        Stream_write_string(output, "try {\n");
1355        Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
1356        Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
1357        Stream_write_string(output, "}\n");
1358        Stream_write_string(output, "catch (e) {\n");
1359        Stream_write_string(output, "  _$jscoverage = {};\n");
1360        Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
1361        Stream_write_string(output, "}\n");
1362      }
1363      else {
1364        Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
1365        Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
1366      }
1367      Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
1368      Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
1369      for (int i = 0; i < num_lines; i++) {
1370        if (lines[i]) {
1371          Stream_printf(output, "  _$jscoverage['%s'][%d] = 0;\n", file_id, i + 1);
1372      }      }
1373    }    }
1374      Stream_write_string(output, "}\n");
1375      free(lines);
1376      lines = NULL;
1377      free(exclusive_directives);
1378      exclusive_directives = NULL;
1379    
1380      /* conditionals */
1381      if (has_conditionals) {
1382        Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);
1383      }
1384    
1385      /* copy the instrumented source code to the output */
1386      Stream_write(output, instrumented->data, instrumented->length);
1387    
1388      /* conditionals */
1389      for (struct IfDirective * if_directive = if_directives; if_directive != NULL; if_directive = if_directive->next) {
1390        Stream_write_string(output, "if (!(");
1391        print_javascript(if_directive->condition_start, if_directive->condition_end - if_directive->condition_start, output);
1392        Stream_write_string(output, ")) {\n");
1393        Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_directive->start_line, if_directive->end_line);
1394        Stream_write_string(output, "}\n");
1395      }
1396    
1397      /* free */
1398      while (if_directives != NULL) {
1399        struct IfDirective * if_directive = if_directives;
1400        if_directives = if_directives->next;
1401        free(if_directive);
1402      }
1403    
1404    /* copy the original source to the output */    /* copy the original source to the output */
1405    Stream_printf(output, "_$jscoverage['%s'].source = ", file_id);    Stream_printf(output, "_$jscoverage['%s'].source = ", file_id);
# Line 1049  Line 1439 
1439            /* line feed (new line) */            /* line feed (new line) */
1440            done = true;            done = true;
1441            break;            break;
1442            /* IE doesn't support this */
1443            /*
1444          case 0xb:          case 0xb:
           /* vertical tab */  
1445            Stream_write_string(output, "\\v");            Stream_write_string(output, "\\v");
1446            break;            break;
1447            */
1448          case 0xc:          case 0xc:
1449            /* form feed */            /* form feed */
1450            Stream_write_string(output, "\\f");            Stream_write_string(output, "\\f");
# Line 1107  Line 1499 
1499            /* line feed (new line) */            /* line feed (new line) */
1500            done = true;            done = true;
1501            break;            break;
1502            /* IE doesn't support this */
1503            /*
1504          case 0xb:          case 0xb:
           /* vertical tab */  
1505            Stream_write_string(output, "\\v");            Stream_write_string(output, "\\v");
1506            break;            break;
1507            */
1508          case 0xc:          case 0xc:
1509            /* form feed */            /* form feed */
1510            Stream_write_string(output, "\\f");            Stream_write_string(output, "\\f");
# Line 1237  Line 1631 
1631  }  }
1632    
1633  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) {
1634      int result = 0;
1635    
1636    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1637    if (base == NULL) {    if (base == NULL) {
1638      fatal("out of memory");      fatal("out of memory");
# Line 1249  Line 1645 
1645    
1646    JS_free(context, base);    JS_free(context, base);
1647    
1648    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1649    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1650      fatal("cannot create token stream");      free(parenthesized_json);
1651        return -1;
1652    }    }
1653      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1654    free(parenthesized_json);    free(parenthesized_json);
1655    if (root == NULL) {    if (root == NULL) {
1656      return -1;      result = -1;
1657        goto done;
1658    }    }
1659    
1660    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1661    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1662      return -1;      result = -1;
1663        goto done;
1664    }    }
1665    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1666    
1667    /* 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 */
1668    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1669      return -1;      result = -1;
1670        goto done;
1671    }    }
1672    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1673    
1674    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1675    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1676      return -1;      result = -1;
1677        goto done;
1678    }    }
1679    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1680    
1681    /* this must be an object literal */    /* this must be an object literal */
1682    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1683      return -1;      result = -1;
1684        goto done;
1685    }    }
1686    
1687    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1688      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1689      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1690        return -1;        result = -1;
1691          goto done;
1692      }      }
1693    
1694      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1695      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1696      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1697        return -1;        result = -1;
1698          goto done;
1699      }      }
1700      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1701    
1702      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1703      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1704      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1705        return -1;        result = -1;
1706          goto done;
1707      }      }
1708    
1709      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1311  Line 1715 
1715      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1716        /* an object literal */        /* an object literal */
1717        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1718          return -1;          result = -1;
1719            goto done;
1720        }        }
1721        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1722          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1723            return -1;            result = -1;
1724              goto done;
1725          }          }
1726          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1727          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1728            return -1;            result = -1;
1729              goto done;
1730          }          }
1731          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1732          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1733            array = element->pn_right;            array = element->pn_right;
1734            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1735              return -1;              result = -1;
1736                goto done;
1737            }            }
1738          }          }
1739          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1740            source = element->pn_right;            source = element->pn_right;
1741            if (source->pn_type != TOK_RB) {            if (source->pn_type != TOK_RB) {
1742              return -1;              result = -1;
1743                goto done;
1744            }            }
1745          }          }
1746          else {          else {
1747            return -1;            result = -1;
1748              goto done;
1749          }          }
1750        }        }
1751      }      }
1752      else {      else {
1753        return -1;        result = -1;
1754          goto done;
1755      }      }
1756    
1757      if (array == NULL) {      if (array == NULL) {
1758        return -1;        result = -1;
1759          goto done;
1760      }      }
1761    
1762      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1356  Line 1768 
1768        file_coverage->id = id;        file_coverage->id = id;
1769        file_coverage->num_coverage_lines = array->pn_count;        file_coverage->num_coverage_lines = array->pn_count;
1770        file_coverage->coverage_lines = xnew(int, array->pn_count);        file_coverage->coverage_lines = xnew(int, array->pn_count);
1771        if (source == NULL) {        file_coverage->source_lines = NULL;
         file_coverage->source_lines = NULL;  
       }  
       else {  
         file_coverage->num_source_lines = source->pn_count;  
         file_coverage->source_lines = xnew(char *, source->pn_count);  
         uint32 i = 0;  
         for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {  
           if (element->pn_type != TOK_STRING) {  
             return -1;  
           }  
           file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));  
         }  
         assert(i == source->pn_count);  
       }  
1772    
1773        /* set coverage for all lines */        /* set coverage for all lines */
1774        uint32 i = 0;        uint32 i = 0;
# Line 1382  Line 1780 
1780            file_coverage->coverage_lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1781          }          }
1782          else {          else {
1783            return -1;            result = -1;
1784              goto done;
1785          }          }
1786        }        }
1787        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1398  Line 1797 
1797        /* sanity check */        /* sanity check */
1798        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1799        if (file_coverage->num_coverage_lines != array->pn_count) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1800          return -2;          result = -2;
1801            goto done;
1802        }        }
1803    
1804        /* merge the coverage */        /* merge the coverage */
# Line 1406  Line 1806 
1806        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++) {
1807          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1808            if (file_coverage->coverage_lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1809              return -2;              result = -2;
1810                goto done;
1811            }            }
1812            file_coverage->coverage_lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1813          }          }
1814          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1815            if (file_coverage->coverage_lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1816              return -2;              result = -2;
1817                goto done;
1818            }            }
1819          }          }
1820          else {          else {
1821            return -1;            result = -1;
1822              goto done;
1823          }          }
1824        }        }
1825        assert(i == array->pn_count);        assert(i == array->pn_count);
1826        }
1827    
1828        /* if this JSON file has source, use it */      /* if this JSON file has source, use it */
1829        if (file_coverage->source_lines == NULL && source != NULL) {      if (file_coverage->source_lines == NULL && source != NULL) {
1830          file_coverage->num_source_lines = source->pn_count;        file_coverage->num_source_lines = source->pn_count;
1831          file_coverage->source_lines = xnew(char *, source->pn_count);        file_coverage->source_lines = xnew(char *, source->pn_count);
1832          uint32 i = 0;        uint32 i = 0;
1833          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++) {
1834            if (element->pn_type != TOK_STRING) {          if (element->pn_type != TOK_STRING) {
1835              return -1;            result = -1;
1836            }            goto done;
           file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));  
1837          }          }
1838          assert(i == source->pn_count);          file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));
1839        }        }
1840          assert(i == source->pn_count);
1841      }      }
1842    }    }
1843    
1844    return 0;  done:
1845      js_FinishParseContext(context, &parse_context);
1846      return result;
1847  }  }

Legend:
Removed from v.214  
changed lines
  Added in v.374

  ViewVC Help
Powered by ViewVC 1.1.24