/[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 190 by siliconforks, Tue Sep 23 03:49:01 2008 UTC revision 375 by siliconforks, Tue Oct 28 05:30:01 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 50  Line 67 
67  */  */
68  static const char * file_id = NULL;  static const char * file_id = NULL;
69  static char * lines = NULL;  static char * lines = NULL;
70    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);
# Line 62  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 77  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 111  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 160  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 170  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 204  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 277  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 304  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 335  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 399  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 447  Line 655 
655      instrument_expression(node->pn_kid, f);      instrument_expression(node->pn_kid, f);
656      break;      break;
657    case TOK_DOT:    case TOK_DOT:
658        /* numeric literals must be parenthesized */
659        if (node->pn_expr->pn_type == TOK_NUMBER) {
660          Stream_write_char(f, '(');
661          instrument_expression(node->pn_expr, f);
662          Stream_write_char(f, ')');
663        }
664        else {
665          instrument_expression(node->pn_expr, f);
666        }
667      /*      /*
668      This may have originally been x['foo-bar'].  Because the string 'foo-bar'      This may have originally been x['foo-bar'].  Because the string 'foo-bar'
669      contains illegal characters, we have to use the subscript syntax instead of      contains illegal characters, we have to use the subscript syntax instead of
670      the dot syntax.      the dot syntax.
671      */      */
     instrument_expression(node->pn_expr, f);  
672      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
673      {      {
674        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
675        /* XXX - semantics changed in 1.7 */        bool must_quote;
676        if (! ATOM_KEYWORD(node->pn_atom) && js_IsIdentifier(s)) {        if (JSSTRING_LENGTH(s) == 0) {
677          Stream_write_char(f, '.');          must_quote = true;
678          print_string_atom(node->pn_atom, f);        }
679          else if (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF) {
680            must_quote = true;
681          }
682          else if (! js_IsIdentifier(s)) {
683            must_quote = true;
684        }        }
685        else {        else {
686            must_quote = false;
687          }
688          if (must_quote) {
689          Stream_write_char(f, '[');          Stream_write_char(f, '[');
690          print_quoted_string_atom(node->pn_atom, f);          print_quoted_string_atom(node->pn_atom, f);
691          Stream_write_char(f, ']');          Stream_write_char(f, ']');
692        }        }
693          else {
694            Stream_write_char(f, '.');
695            print_string_atom(node->pn_atom, f);
696          }
697      }      }
698      break;      break;
699    case TOK_LB:    case TOK_LB:
# Line 496  Line 724 
724    case TOK_RC:    case TOK_RC:
725      Stream_write_char(f, '{');      Stream_write_char(f, '{');
726      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) {
727        assert(p->pn_type == TOK_COLON);        if (p->pn_type != TOK_COLON) {
728            fatal_source(file_id, p->pn_pos.begin.lineno, "unsupported node type (%d)", p->pn_type);
729          }
730        if (p != node->pn_head) {        if (p != node->pn_head) {
731          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
732        }        }
# Line 504  Line 734 
734        /* check whether this is a getter or setter */        /* check whether this is a getter or setter */
735        switch (p->pn_op) {        switch (p->pn_op) {
736        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;  
737        case JSOP_SETTER:        case JSOP_SETTER:
738          Stream_write_string(f, "set ");          if (p->pn_op == JSOP_GETTER) {
739              Stream_write_string(f, "get ");
740            }
741            else {
742              Stream_write_string(f, "set ");
743            }
744          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
745            if (p->pn_right->pn_type != TOK_FUNCTION) {
746              fatal_source(file_id, p->pn_pos.begin.lineno, "expected function");
747            }
748          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);
749          break;          break;
750        default:        default:
# Line 533  Line 767 
767    case TOK_STRING:    case TOK_STRING:
768      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
769      break;      break;
770    case TOK_OBJECT:    case TOK_REGEXP:
771      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
772      case JSOP_OBJECT:      {
773        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
774        abort();        jsval result;
775        break;        js_regexp_toString(context, object, &result);
776      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;  
777      }      }
778      break;      break;
779    case TOK_NUMBER:    case TOK_NUMBER:
# Line 596  Line 819 
819      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
820      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
821      break;      break;
822    default:    case TOK_LEXICALSCOPE:
823      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      assert(node->pn_arity == PN_NAME);
824    }      assert(node->pn_expr->pn_type == TOK_LET);
825  }      assert(node->pn_expr->pn_arity == PN_BINARY);
826        Stream_write_string(f, "let(");
827  static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {      assert(node->pn_expr->pn_left->pn_type == TOK_LP);
828    assert(node->pn_arity == PN_LIST);      assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
829    Stream_printf(f, "%*s", indent, "");      instrument_declarations(node->pn_expr->pn_left, f);
830    Stream_write_string(f, "var ");      Stream_write_string(f, ") ");
831    for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      instrument_expression(node->pn_expr->pn_right, f);
832      assert(p->pn_type == TOK_NAME);      break;
833      assert(p->pn_arity == PN_NAME);    case TOK_YIELD:
834      if (p != node->pn_head) {      assert(node->pn_arity == PN_UNARY);
835        Stream_write_string(f, ", ");      Stream_write_string(f, "yield");
836        if (node->pn_kid != NULL) {
837          Stream_write_char(f, ' ');
838          instrument_expression(node->pn_kid, f);
839      }      }
840      print_string_atom(p->pn_atom, f);      break;
841      if (p->pn_expr != NULL) {    case TOK_ARRAYCOMP:
842        Stream_write_string(f, " = ");      assert(node->pn_arity == PN_LIST);
843        instrument_expression(p->pn_expr, f);      {
844          JSParseNode * block_node;
845          switch (node->pn_count) {
846          case 1:
847            block_node = node->pn_head;
848            break;
849          case 2:
850            block_node = node->pn_head->pn_next;
851            break;
852          default:
853            abort();
854            break;
855          }
856          Stream_write_char(f, '[');
857          output_array_comprehension_or_generator_expression(block_node, f);
858          Stream_write_char(f, ']');
859      }      }
860        break;
861      case TOK_VAR:
862        assert(node->pn_arity == PN_LIST);
863        Stream_write_string(f, "var ");
864        instrument_declarations(node, f);
865        break;
866      case TOK_LET:
867        assert(node->pn_arity == PN_LIST);
868        Stream_write_string(f, "let ");
869        instrument_declarations(node, f);
870        break;
871      default:
872        fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
873    }    }
874  }  }
875    
876  static void output_statement(JSParseNode * node, Stream * f, int indent) {  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
877    switch (node->pn_type) {    switch (node->pn_type) {
878    case TOK_FUNCTION:    case TOK_FUNCTION:
879      instrument_function(node, f, indent, FUNCTION_NORMAL);      instrument_function(node, f, indent, FUNCTION_NORMAL);
# Line 630  Line 884 
884      Stream_write_string(f, "{\n");      Stream_write_string(f, "{\n");
885  */  */
886      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) {
887        instrument_statement(p, f, indent);        instrument_statement(p, f, indent, false);
888      }      }
889  /*  /*
890      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
# Line 638  Line 892 
892  */  */
893      break;      break;
894    case TOK_IF:    case TOK_IF:
895      {
896      assert(node->pn_arity == PN_TERNARY);      assert(node->pn_arity == PN_TERNARY);
897    
898        uint16_t line = node->pn_pos.begin.lineno;
899        if (! is_jscoverage_if) {
900          if (line > num_lines) {
901            fatal("file %s contains more than 65,535 lines", file_id);
902          }
903          if (line >= 2 && exclusive_directives[line - 2]) {
904            is_jscoverage_if = true;
905          }
906        }
907    
908      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
909      Stream_write_string(f, "if (");      Stream_write_string(f, "if (");
910      instrument_expression(node->pn_kid1, f);      instrument_expression(node->pn_kid1, f);
911      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
912      instrument_statement(node->pn_kid2, f, indent + 2);      if (is_jscoverage_if && node->pn_kid3) {
913          uint16_t else_start = node->pn_kid3->pn_pos.begin.lineno;
914          uint16_t else_end = node->pn_kid3->pn_pos.end.lineno + 1;
915          Stream_printf(f, "%*s", indent + 2, "");
916          Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, else_start, else_end);
917        }
918        instrument_statement(node->pn_kid2, f, indent + 2, false);
919      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
920      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
921      if (node->pn_kid3) {  
922        if (node->pn_kid3 || is_jscoverage_if) {
923        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
924        Stream_write_string(f, "else {\n");        Stream_write_string(f, "else {\n");
925        instrument_statement(node->pn_kid3, f, indent + 2);  
926          if (is_jscoverage_if) {
927            uint16_t if_start = node->pn_kid2->pn_pos.begin.lineno + 1;
928            uint16_t if_end = node->pn_kid2->pn_pos.end.lineno + 1;
929            Stream_printf(f, "%*s", indent + 2, "");
930            Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_start, if_end);
931          }
932    
933          if (node->pn_kid3) {
934            instrument_statement(node->pn_kid3, f, indent + 2, is_jscoverage_if);
935          }
936    
937        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
938        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
939      }      }
940    
941      break;      break;
942      }
943    case TOK_SWITCH:    case TOK_SWITCH:
944      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
945      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
946      Stream_write_string(f, "switch (");      Stream_write_string(f, "switch (");
947      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
948      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
949      for (struct JSParseNode * p = node->pn_right->pn_head; p != NULL; p = p->pn_next) {      {
950        Stream_printf(f, "%*s", indent, "");        JSParseNode * list = node->pn_right;
951        switch (p->pn_type) {        if (list->pn_type == TOK_LEXICALSCOPE) {
952        case TOK_CASE:          list = list->pn_expr;
953          Stream_write_string(f, "case ");        }
954          instrument_expression(p->pn_left, f);        for (struct JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
955          Stream_write_string(f, ":\n");          Stream_printf(f, "%*s", indent, "");
956          break;          switch (p->pn_type) {
957        case TOK_DEFAULT:          case TOK_CASE:
958          Stream_write_string(f, "default:\n");            Stream_write_string(f, "case ");
959          break;            instrument_expression(p->pn_left, f);
960        default:            Stream_write_string(f, ":\n");
961          abort();            break;
962          break;          case TOK_DEFAULT:
963              Stream_write_string(f, "default:\n");
964              break;
965            default:
966              abort();
967              break;
968            }
969            instrument_statement(p->pn_right, f, indent + 2, false);
970        }        }
       instrument_statement(p->pn_right, f, indent + 2);  
971      }      }
972      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
973      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 690  Line 982 
982      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
983      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
984      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
985      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
986      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
987      break;      break;
988    case TOK_DO:    case TOK_DO:
989      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
990      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
991      Stream_write_string(f, "do {\n");      Stream_write_string(f, "do {\n");
992      instrument_statement(node->pn_left, f, indent + 2);      instrument_statement(node->pn_left, f, indent + 2, false);
993      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
994      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
995      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
# Line 707  Line 999 
999    case TOK_FOR:    case TOK_FOR:
1000      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
1001      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
1002      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
1003      case TOK_IN:      case TOK_IN:
1004        /* for/in */        /* for/in */
1005        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
1006        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);  
1007        break;        break;
1008      case TOK_RESERVED:      case TOK_RESERVED:
1009        /* for (;;) */        /* for (;;) */
1010        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
1011          Stream_write_string(f, "for (");
1012        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
1013          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);  
         }  
1014        }        }
1015        Stream_write_string(f, ";");        Stream_write_string(f, ";");
1016        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 754  Line 1022 
1022          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
1023          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
1024        }        }
1025          Stream_write_char(f, ')');
1026        break;        break;
1027      default:      default:
1028        abort();        abort();
1029        break;        break;
1030      }      }
1031      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
1032      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
1033      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1034      break;      break;
1035    case TOK_THROW:    case TOK_THROW:
# Line 773  Line 1042 
1042    case TOK_TRY:    case TOK_TRY:
1043      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1044      Stream_write_string(f, "try {\n");      Stream_write_string(f, "try {\n");
1045      instrument_statement(node->pn_kid1, f, indent + 2);      instrument_statement(node->pn_kid1, f, indent + 2, false);
1046      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1047      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1048      {      if (node->pn_kid2) {
1049        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
1050          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
1051            assert(scope->pn_type == TOK_LEXICALSCOPE);
1052            JSParseNode * catch = scope->pn_expr;
1053          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
1054          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1055          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
1056            /* this may not be a name - destructuring assignment */
1057            /*
1058          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
1059          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
1060          if (catch->pn_kid1->pn_expr) {          */
1061            instrument_expression(catch->pn_kid1, f);
1062            if (catch->pn_kid2) {
1063            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1064            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
1065          }          }
1066          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
1067          instrument_statement(catch->pn_kid3, f, indent + 2);          instrument_statement(catch->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 796  Line 1072 
1072      if (node->pn_kid3) {      if (node->pn_kid3) {
1073        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1074        Stream_write_string(f, "finally {\n");        Stream_write_string(f, "finally {\n");
1075        instrument_statement(node->pn_kid3, f, indent + 2);        instrument_statement(node->pn_kid3, f, indent + 2, false);
1076        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1077        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
1078      }      }
# Line 822  Line 1098 
1098      Stream_write_string(f, "with (");      Stream_write_string(f, "with (");
1099      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
1100      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
1101      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
1102      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1103      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1104      break;      break;
1105    case TOK_VAR:    case TOK_VAR:
1106      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1107        instrument_expression(node, f);
1108      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1109      break;      break;
1110    case TOK_RETURN:    case TOK_RETURN:
# Line 860  Line 1137 
1137      /*      /*
1138      ... use output_statement instead of instrument_statement.      ... use output_statement instead of instrument_statement.
1139      */      */
1140      output_statement(node->pn_expr, f, indent);      output_statement(node->pn_expr, f, indent, false);
1141        break;
1142      case TOK_LEXICALSCOPE:
1143        /* let statement */
1144        assert(node->pn_arity == PN_NAME);
1145        switch (node->pn_expr->pn_type) {
1146        case TOK_LET:
1147          /* let statement */
1148          assert(node->pn_expr->pn_arity == PN_BINARY);
1149          instrument_statement(node->pn_expr, f, indent, false);
1150          break;
1151        case TOK_LC:
1152          /* block */
1153          Stream_printf(f, "%*s", indent, "");
1154          Stream_write_string(f, "{\n");
1155          instrument_statement(node->pn_expr, f, indent + 2, false);
1156          Stream_printf(f, "%*s", indent, "");
1157          Stream_write_string(f, "}\n");
1158          break;
1159        case TOK_FOR:
1160          instrument_statement(node->pn_expr, f, indent, false);
1161          break;
1162        default:
1163          abort();
1164          break;
1165        }
1166        break;
1167      case TOK_LET:
1168        switch (node->pn_arity) {
1169        case PN_BINARY:
1170          /* let statement */
1171          Stream_printf(f, "%*s", indent, "");
1172          Stream_write_string(f, "let (");
1173          assert(node->pn_left->pn_type == TOK_LP);
1174          assert(node->pn_left->pn_arity == PN_LIST);
1175          instrument_declarations(node->pn_left, f);
1176          Stream_write_string(f, ") {\n");
1177          instrument_statement(node->pn_right, f, indent + 2, false);
1178          Stream_printf(f, "%*s", indent, "");
1179          Stream_write_string(f, "}\n");
1180          break;
1181        case PN_LIST:
1182          /* let definition */
1183          Stream_printf(f, "%*s", indent, "");
1184          instrument_expression(node, f);
1185          Stream_write_string(f, ";\n");
1186          break;
1187        default:
1188          abort();
1189          break;
1190        }
1191        break;
1192      case TOK_DEBUGGER:
1193        Stream_printf(f, "%*s", indent, "");
1194        Stream_write_string(f, "debugger;\n");
1195      break;      break;
1196    default:    default:
1197      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);
1198    }    }
1199  }  }
1200    
# Line 872  Line 1203 
1203  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
1204  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1205  */  */
1206  static void instrument_statement(JSParseNode * node, Stream * f, int indent) {  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
1207    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1208      int line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1209        if (line > num_lines) {
1210          fatal("file %s contains more than 65,535 lines", file_id);
1211        }
1212    
1213      /* the root node has line number 0 */      /* the root node has line number 0 */
1214      if (line != 0) {      if (line != 0) {
1215        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
# Line 882  Line 1217 
1217        lines[line - 1] = 1;        lines[line - 1] = 1;
1218      }      }
1219    }    }
1220    output_statement(node, f, indent);    output_statement(node, f, indent, is_jscoverage_if);
1221  }  }
1222    
1223  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 904  Line 1239 
1239    }    }
1240  }  }
1241    
1242    static bool characters_are_white_space(const jschar * characters, size_t line_start, size_t line_end) {
1243      /* XXX - other Unicode space */
1244      const jschar * end = characters + line_end;
1245      for (const jschar * p = characters + line_start; p < end; p++) {
1246        jschar c = *p;
1247        if (c == 0x9 || c == 0xB || c == 0xC || c == 0x20 || c == 0xA0) {
1248          continue;
1249        }
1250        else {
1251          return false;
1252        }
1253      }
1254      return true;
1255    }
1256    
1257    static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1258      warn_source(file_id, report->lineno, "%s", message);
1259    }
1260    
1261  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) {
1262    file_id = id;    file_id = id;
1263    
   /* 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);  
   }  
   
1264    /* parse the javascript */    /* parse the javascript */
1265    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseContext parse_context;
1266      if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1267        fatal("cannot create token stream from file %s", file_id);
1268      }
1269      JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1270      JSParseNode * node = js_ParseScript(context, global, &parse_context);
1271    if (node == NULL) {    if (node == NULL) {
1272      fatal("parse error in file: %s", file_id);      js_ReportUncaughtException(context);
1273        fatal("parse error in file %s", file_id);
1274    }    }
1275    int num_lines = node->pn_pos.end.lineno;    JS_SetErrorReporter(context, old_error_reporter);
1276      num_lines = node->pn_pos.end.lineno;
1277    lines = xmalloc(num_lines);    lines = xmalloc(num_lines);
1278    for (int i = 0; i < num_lines; i++) {    for (unsigned int i = 0; i < num_lines; i++) {
1279      lines[i] = 0;      lines[i] = 0;
1280    }    }
1281    
1282    /*    /* search code for conditionals */
1283    An instrumented JavaScript file has 3 sections:    exclusive_directives = xnew(bool, num_lines);
1284    1. initialization    for (unsigned int i = 0; i < num_lines; i++) {
1285    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);  
     }  
1286    }    }
   Stream_write_string(output, "}\n");  
   free(lines);  
   lines = NULL;  
1287    
   /* copy the instrumented source code to the output */  
   Stream_write(output, instrumented->data, instrumented->length);  
   
   /* conditionals */  
1288    bool has_conditionals = false;    bool has_conditionals = false;
1289      struct IfDirective * if_directives = NULL;
1290    size_t line_number = 0;    size_t line_number = 0;
1291    size_t i = 0;    size_t i = 0;
1292    while (i < num_characters) {    while (i < num_characters) {
1293        if (line_number == UINT16_MAX) {
1294          fatal("file %s contains more than 65,535 lines", file_id);
1295        }
1296      line_number++;      line_number++;
1297      size_t line_start = i;      size_t line_start = i;
1298      jschar c;      jschar c;
# Line 972  Line 1308 
1308          break;          break;
1309        default:        default:
1310          i++;          i++;
         break;  
1311        }        }
1312      }      }
1313      size_t line_end = i;      size_t line_end = i;
# Line 982  Line 1317 
1317          i++;          i++;
1318        }        }
1319      }      }
1320    
1321      if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_IF")) {      if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_IF")) {
1322        if (! has_conditionals) {        has_conditionals = true;
1323          has_conditionals = true;  
1324          Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);        if (characters_are_white_space(characters, line_start + 16, line_end)) {
1325        }          exclusive_directives[line_number - 1] = true;
1326        Stream_write_string(output, "if (!(");        }
1327        for (size_t j = line_start + 16; j < line_end; j++) {        else {
1328          jschar c = characters[j];          struct IfDirective * if_directive = xnew(struct IfDirective, 1);
1329          if (c == '\t' || (32 <= c && c <= 126)) {          if_directive->condition_start = characters + line_start + 16;
1330            Stream_write_char(output, c);          if_directive->condition_end = characters + line_end;
1331          }          if_directive->start_line = line_number;
1332          else {          if_directive->end_line = 0;
1333            Stream_printf(output, "\\u%04x", c);          if_directive->next = if_directives;
1334          }          if_directives = if_directive;
1335        }        }
       Stream_write_string(output, ")) {\n");  
       Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = ", file_id, line_number);  
1336      }      }
1337      else if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_ENDIF")) {      else if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_ENDIF")) {
1338        Stream_printf(output, "%d;\n", line_number);        for (struct IfDirective * p = if_directives; p != NULL; p = p->next) {
1339        Stream_printf(output, "}\n");          if (p->end_line == 0) {
1340              p->end_line = line_number;
1341              break;
1342            }
1343          }
1344      }      }
1345    }    }
1346    
1347      /*
1348      An instrumented JavaScript file has 4 sections:
1349      1. initialization
1350      2. instrumented source code
1351      3. conditionals
1352      4. original source code
1353      */
1354    
1355      Stream * instrumented = Stream_new(0);
1356      instrument_statement(node, instrumented, 0, false);
1357      js_FinishParseContext(context, &parse_context);
1358    
1359      /* write line number info to the output */
1360      Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
1361      if (jscoverage_mozilla) {
1362        Stream_write_string(output, "try {\n");
1363        Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
1364        Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
1365        Stream_write_string(output, "}\n");
1366        Stream_write_string(output, "catch (e) {\n");
1367        Stream_write_string(output, "  _$jscoverage = {};\n");
1368        Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
1369        Stream_write_string(output, "}\n");
1370      }
1371      else {
1372        Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
1373        Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
1374      }
1375      Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
1376      Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
1377      for (int i = 0; i < num_lines; i++) {
1378        if (lines[i]) {
1379          Stream_printf(output, "  _$jscoverage['%s'][%d] = 0;\n", file_id, i + 1);
1380        }
1381      }
1382      Stream_write_string(output, "}\n");
1383      free(lines);
1384      lines = NULL;
1385      free(exclusive_directives);
1386      exclusive_directives = NULL;
1387    
1388      /* conditionals */
1389      if (has_conditionals) {
1390        Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);
1391      }
1392    
1393      /* copy the instrumented source code to the output */
1394      Stream_write(output, instrumented->data, instrumented->length);
1395    
1396      /* conditionals */
1397      for (struct IfDirective * if_directive = if_directives; if_directive != NULL; if_directive = if_directive->next) {
1398        Stream_write_string(output, "if (!(");
1399        print_javascript(if_directive->condition_start, if_directive->condition_end - if_directive->condition_start, output);
1400        Stream_write_string(output, ")) {\n");
1401        Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_directive->start_line, if_directive->end_line);
1402        Stream_write_string(output, "}\n");
1403      }
1404    
1405      /* free */
1406      while (if_directives != NULL) {
1407        struct IfDirective * if_directive = if_directives;
1408        if_directives = if_directives->next;
1409        free(if_directive);
1410      }
1411    
1412    /* copy the original source to the output */    /* copy the original source to the output */
1413    Stream_printf(output, "_$jscoverage['%s'].source = ", file_id);    Stream_printf(output, "_$jscoverage['%s'].source = ", file_id);
1414    jscoverage_write_source(id, characters, num_characters, output);    jscoverage_write_source(id, characters, num_characters, output);
# Line 1044  Line 1447 
1447            /* line feed (new line) */            /* line feed (new line) */
1448            done = true;            done = true;
1449            break;            break;
1450            /* IE doesn't support this */
1451            /*
1452          case 0xb:          case 0xb:
           /* vertical tab */  
1453            Stream_write_string(output, "\\v");            Stream_write_string(output, "\\v");
1454            break;            break;
1455            */
1456          case 0xc:          case 0xc:
1457            /* form feed */            /* form feed */
1458            Stream_write_string(output, "\\f");            Stream_write_string(output, "\\f");
# Line 1102  Line 1507 
1507            /* line feed (new line) */            /* line feed (new line) */
1508            done = true;            done = true;
1509            break;            break;
1510            /* IE doesn't support this */
1511            /*
1512          case 0xb:          case 0xb:
           /* vertical tab */  
1513            Stream_write_string(output, "\\v");            Stream_write_string(output, "\\v");
1514            break;            break;
1515            */
1516          case 0xc:          case 0xc:
1517            /* form feed */            /* form feed */
1518            Stream_write_string(output, "\\f");            Stream_write_string(output, "\\f");
# Line 1232  Line 1639 
1639  }  }
1640    
1641  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) {
1642      int result = 0;
1643    
1644    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1645    if (base == NULL) {    if (base == NULL) {
1646      fatal("out of memory");      fatal("out of memory");
# Line 1244  Line 1653 
1653    
1654    JS_free(context, base);    JS_free(context, base);
1655    
1656    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1657    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1658      fatal("cannot create token stream");      free(parenthesized_json);
1659        return -1;
1660    }    }
1661      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1662    free(parenthesized_json);    free(parenthesized_json);
1663    if (root == NULL) {    if (root == NULL) {
1664      return -1;      result = -1;
1665        goto done;
1666    }    }
1667    
1668    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1669    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1670      return -1;      result = -1;
1671        goto done;
1672    }    }
1673    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1674    
1675    /* 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 */
1676    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1677      return -1;      result = -1;
1678        goto done;
1679    }    }
1680    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1681    
1682    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1683    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1684      return -1;      result = -1;
1685        goto done;
1686    }    }
1687    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1688    
1689    /* this must be an object literal */    /* this must be an object literal */
1690    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1691      return -1;      result = -1;
1692        goto done;
1693    }    }
1694    
1695    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1696      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1697      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1698        return -1;        result = -1;
1699          goto done;
1700      }      }
1701    
1702      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1703      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1704      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1705        return -1;        result = -1;
1706          goto done;
1707      }      }
1708      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1709    
1710      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1711      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1712      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1713        return -1;        result = -1;
1714          goto done;
1715      }      }
1716    
1717      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1306  Line 1723 
1723      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1724        /* an object literal */        /* an object literal */
1725        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1726          return -1;          result = -1;
1727            goto done;
1728        }        }
1729        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1730          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1731            return -1;            result = -1;
1732              goto done;
1733          }          }
1734          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1735          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1736            return -1;            result = -1;
1737              goto done;
1738          }          }
1739          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1740          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1741            array = element->pn_right;            array = element->pn_right;
1742            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1743              return -1;              result = -1;
1744                goto done;
1745            }            }
1746          }          }
1747          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1748            source = element->pn_right;            source = element->pn_right;
1749            if (source->pn_type != TOK_RB) {            if (source->pn_type != TOK_RB) {
1750              return -1;              result = -1;
1751                goto done;
1752            }            }
1753          }          }
1754          else {          else {
1755            return -1;            result = -1;
1756              goto done;
1757          }          }
1758        }        }
1759      }      }
1760      else {      else {
1761        return -1;        result = -1;
1762          goto done;
1763      }      }
1764    
1765      if (array == NULL) {      if (array == NULL) {
1766        return -1;        result = -1;
1767          goto done;
1768      }      }
1769    
1770      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1351  Line 1776 
1776        file_coverage->id = id;        file_coverage->id = id;
1777        file_coverage->num_coverage_lines = array->pn_count;        file_coverage->num_coverage_lines = array->pn_count;
1778        file_coverage->coverage_lines = xnew(int, array->pn_count);        file_coverage->coverage_lines = xnew(int, array->pn_count);
1779        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);  
       }  
1780    
1781        /* set coverage for all lines */        /* set coverage for all lines */
1782        uint32 i = 0;        uint32 i = 0;
# Line 1377  Line 1788 
1788            file_coverage->coverage_lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1789          }          }
1790          else {          else {
1791            return -1;            result = -1;
1792              goto done;
1793          }          }
1794        }        }
1795        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1393  Line 1805 
1805        /* sanity check */        /* sanity check */
1806        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1807        if (file_coverage->num_coverage_lines != array->pn_count) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1808          return -2;          result = -2;
1809            goto done;
1810        }        }
1811    
1812        /* merge the coverage */        /* merge the coverage */
# Line 1401  Line 1814 
1814        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++) {
1815          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1816            if (file_coverage->coverage_lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1817              return -2;              result = -2;
1818                goto done;
1819            }            }
1820            file_coverage->coverage_lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1821          }          }
1822          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1823            if (file_coverage->coverage_lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1824              return -2;              result = -2;
1825                goto done;
1826            }            }
1827          }          }
1828          else {          else {
1829            return -1;            result = -1;
1830              goto done;
1831          }          }
1832        }        }
1833        assert(i == array->pn_count);        assert(i == array->pn_count);
1834        }
1835    
1836        /* if this JSON file has source, use it */      /* if this JSON file has source, use it */
1837        if (file_coverage->source_lines == NULL && source != NULL) {      if (file_coverage->source_lines == NULL && source != NULL) {
1838          file_coverage->num_source_lines = source->pn_count;        file_coverage->num_source_lines = source->pn_count;
1839          file_coverage->source_lines = xnew(char *, source->pn_count);        file_coverage->source_lines = xnew(char *, source->pn_count);
1840          uint32 i = 0;        uint32 i = 0;
1841          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++) {
1842            if (element->pn_type != TOK_STRING) {          if (element->pn_type != TOK_STRING) {
1843              return -1;            result = -1;
1844            }            goto done;
           file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));  
1845          }          }
1846          assert(i == source->pn_count);          file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));
1847        }        }
1848          assert(i == source->pn_count);
1849      }      }
1850    }    }
1851    
1852    return 0;  done:
1853      js_FinishParseContext(context, &parse_context);
1854      return result;
1855  }  }

Legend:
Removed from v.190  
changed lines
  Added in v.375

  ViewVC Help
Powered by ViewVC 1.1.24