/[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 169 by siliconforks, Mon Sep 15 16:22:41 2008 UTC revision 373 by siliconforks, Mon Oct 27 20:36:44 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>
39  #include <jsstr.h>  #include <jsstr.h>
40    
41    #include "encoding.h"
42    #include "global.h"
43    #include "highlight.h"
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 47  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 59  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 74  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    for (size_t i = 0; i < s->length; i++) {    size_t length = JSSTRING_LENGTH(s);
139      char c = s->chars[i];    jschar * characters = JSSTRING_CHARS(s);
140      Stream_write_char(f, c);    for (size_t i = 0; i < length; i++) {
141        jschar c = characters[i];
142        if (32 <= c && c <= 126) {
143          switch (c) {
144          case '"':
145            Stream_write_string(f, "\\\"");
146            break;
147    /*
148          case '\'':
149            Stream_write_string(f, "\\'");
150            break;
151    */
152          case '\\':
153            Stream_write_string(f, "\\\\");
154            break;
155          default:
156            Stream_write_char(f, c);
157            break;
158          }
159        }
160        else {
161          switch (c) {
162          case 0x8:
163            Stream_write_string(f, "\\b");
164            break;
165          case 0x9:
166            Stream_write_string(f, "\\t");
167            break;
168          case 0xa:
169            Stream_write_string(f, "\\n");
170            break;
171          /* IE doesn't support this */
172          /*
173          case 0xb:
174            Stream_write_string(f, "\\v");
175            break;
176          */
177          case 0xc:
178            Stream_write_string(f, "\\f");
179            break;
180          case 0xd:
181            Stream_write_string(f, "\\r");
182            break;
183          default:
184            Stream_printf(f, "\\u%04x", c);
185            break;
186          }
187        }
188    }    }
189  }  }
190    
# Line 87  Line 194 
194    print_string(s, f);    print_string(s, f);
195  }  }
196    
197  static void print_string_jsval(jsval value, Stream * f) {  static void print_regex(jsval value, Stream * f) {
198    assert(JSVAL_IS_STRING(value));    assert(JSVAL_IS_STRING(value));
199    JSString * s = JSVAL_TO_STRING(value);    JSString * s = JSVAL_TO_STRING(value);
200    print_string(s, f);    size_t length = JSSTRING_LENGTH(s);
201      jschar * characters = JSSTRING_CHARS(s);
202      for (size_t i = 0; i < length; i++) {
203        jschar c = characters[i];
204        if (32 <= c && c <= 126) {
205          Stream_write_char(f, c);
206        }
207        else {
208          Stream_printf(f, "\\u%04x", c);
209        }
210      }
211  }  }
212    
213  static void print_quoted_string_atom(JSAtom * atom, Stream * f) {  static void print_quoted_string_atom(JSAtom * atom, Stream * f) {
214    assert(ATOM_IS_STRING(atom));    assert(ATOM_IS_STRING(atom));
215    JSString * s = ATOM_TO_STRING(atom);    JSString * s = ATOM_TO_STRING(atom);
216    JSString * quoted = js_QuoteString(context, s, '"');    Stream_write_char(f, '"');
217    print_string(quoted, f);    print_string(s, f);
218      Stream_write_char(f, '"');
219  }  }
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 112  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 146  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 219  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        case TOK_RB:
472        case TOK_RC:
473          /* destructuring */
474          instrument_expression(p, f);
475          break;
476        default:
477          abort();
478          break;
479        }
480      }
481    }
482    
483  /*  /*
484  See <Expressions> in jsparse.h.  See <Expressions> in jsparse.h.
485  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
# Line 277  Line 538 
538      instrument_expression(node->pn_kid3, f);      instrument_expression(node->pn_kid3, f);
539      break;      break;
540    case TOK_OR:    case TOK_OR:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " || ");  
     instrument_expression(node->pn_right, f);  
     break;  
541    case TOK_AND:    case TOK_AND:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " && ");  
     instrument_expression(node->pn_right, f);  
     break;  
542    case TOK_BITOR:    case TOK_BITOR:
543    case TOK_BITXOR:    case TOK_BITXOR:
544    case TOK_BITAND:    case TOK_BITAND:
# Line 341  Line 594 
594        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
595        break;        break;
596      default:      default:
597        abort();        fatal_source(file_id, node->pn_pos.begin.lineno, "unknown operator (%d)", node->pn_op);
598        break;        break;
599      }      }
600      break;      break;
# Line 398  Line 651 
651      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
652      {      {
653        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
654        /* XXX - semantics changed in 1.7 */        bool must_quote;
655        if (! ATOM_KEYWORD(node->pn_atom) && js_IsIdentifier(s)) {        if (JSSTRING_LENGTH(s) == 0) {
656          Stream_write_char(f, '.');          must_quote = true;
657          print_string_atom(node->pn_atom, f);        }
658          else if (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF) {
659            must_quote = true;
660          }
661          else if (! js_IsIdentifier(s)) {
662            must_quote = true;
663        }        }
664        else {        else {
665            must_quote = false;
666          }
667          if (must_quote) {
668          Stream_write_char(f, '[');          Stream_write_char(f, '[');
669          print_quoted_string_atom(node->pn_atom, f);          print_quoted_string_atom(node->pn_atom, f);
670          Stream_write_char(f, ']');          Stream_write_char(f, ']');
671        }        }
672          else {
673            Stream_write_char(f, '.');
674            print_string_atom(node->pn_atom, f);
675          }
676      }      }
677      break;      break;
678    case TOK_LB:    case TOK_LB:
# Line 438  Line 703 
703    case TOK_RC:    case TOK_RC:
704      Stream_write_char(f, '{');      Stream_write_char(f, '{');
705      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) {
706        assert(p->pn_type == TOK_COLON);        if (p->pn_type != TOK_COLON) {
707            fatal_source(file_id, p->pn_pos.begin.lineno, "unsupported node type (%d)", p->pn_type);
708          }
709        if (p != node->pn_head) {        if (p != node->pn_head) {
710          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
711        }        }
# Line 446  Line 713 
713        /* check whether this is a getter or setter */        /* check whether this is a getter or setter */
714        switch (p->pn_op) {        switch (p->pn_op) {
715        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;  
716        case JSOP_SETTER:        case JSOP_SETTER:
717          Stream_write_string(f, "set ");          if (p->pn_op == JSOP_GETTER) {
718              Stream_write_string(f, "get ");
719            }
720            else {
721              Stream_write_string(f, "set ");
722            }
723          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
724            if (p->pn_right->pn_type != TOK_FUNCTION) {
725              fatal_source(file_id, p->pn_pos.begin.lineno, "expected function");
726            }
727          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);
728          break;          break;
729        default:        default:
# Line 475  Line 746 
746    case TOK_STRING:    case TOK_STRING:
747      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
748      break;      break;
749    case TOK_OBJECT:    case TOK_REGEXP:
750      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
751      case JSOP_OBJECT:      {
752        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
753        abort();        jsval result;
754        break;        js_regexp_toString(context, object, &result);
755      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_string_jsval(result, f);  
       }  
       break;  
     default:  
       abort();  
       break;  
756      }      }
757      break;      break;
758    case TOK_NUMBER:    case TOK_NUMBER:
# Line 538  Line 798 
798      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
799      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
800      break;      break;
801    default:    case TOK_LEXICALSCOPE:
802      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      assert(node->pn_arity == PN_NAME);
803    }      assert(node->pn_expr->pn_type == TOK_LET);
804  }      assert(node->pn_expr->pn_arity == PN_BINARY);
805        Stream_write_string(f, "let(");
806  static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {      assert(node->pn_expr->pn_left->pn_type == TOK_LP);
807    assert(node->pn_arity == PN_LIST);      assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
808    Stream_printf(f, "%*s", indent, "");      instrument_declarations(node->pn_expr->pn_left, f);
809    Stream_write_string(f, "var ");      Stream_write_string(f, ") ");
810    for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {      instrument_expression(node->pn_expr->pn_right, f);
811      assert(p->pn_type == TOK_NAME);      break;
812      assert(p->pn_arity == PN_NAME);    case TOK_YIELD:
813      if (p != node->pn_head) {      assert(node->pn_arity == PN_UNARY);
814        Stream_write_string(f, ", ");      Stream_write_string(f, "yield");
815        if (node->pn_kid != NULL) {
816          Stream_write_char(f, ' ');
817          instrument_expression(node->pn_kid, f);
818      }      }
819      print_string_atom(p->pn_atom, f);      break;
820      if (p->pn_expr != NULL) {    case TOK_ARRAYCOMP:
821        Stream_write_string(f, " = ");      assert(node->pn_arity == PN_LIST);
822        instrument_expression(p->pn_expr, f);      {
823          JSParseNode * block_node;
824          switch (node->pn_count) {
825          case 1:
826            block_node = node->pn_head;
827            break;
828          case 2:
829            block_node = node->pn_head->pn_next;
830            break;
831          default:
832            abort();
833            break;
834          }
835          Stream_write_char(f, '[');
836          output_array_comprehension_or_generator_expression(block_node, f);
837          Stream_write_char(f, ']');
838      }      }
839        break;
840      case TOK_VAR:
841        assert(node->pn_arity == PN_LIST);
842        Stream_write_string(f, "var ");
843        instrument_declarations(node, f);
844        break;
845      case TOK_LET:
846        assert(node->pn_arity == PN_LIST);
847        Stream_write_string(f, "let ");
848        instrument_declarations(node, f);
849        break;
850      default:
851        fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported node type (%d)", node->pn_type);
852    }    }
853  }  }
854    
855  static void output_statement(JSParseNode * node, Stream * f, int indent) {  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
856    switch (node->pn_type) {    switch (node->pn_type) {
857    case TOK_FUNCTION:    case TOK_FUNCTION:
858      instrument_function(node, f, indent, FUNCTION_NORMAL);      instrument_function(node, f, indent, FUNCTION_NORMAL);
# Line 572  Line 863 
863      Stream_write_string(f, "{\n");      Stream_write_string(f, "{\n");
864  */  */
865      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) {
866        instrument_statement(p, f, indent);        instrument_statement(p, f, indent, false);
867      }      }
868  /*  /*
869      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
# Line 580  Line 871 
871  */  */
872      break;      break;
873    case TOK_IF:    case TOK_IF:
874      {
875      assert(node->pn_arity == PN_TERNARY);      assert(node->pn_arity == PN_TERNARY);
876    
877        uint16_t line = node->pn_pos.begin.lineno;
878        if (! is_jscoverage_if) {
879          if (line > num_lines) {
880            fatal("file %s contains more than 65,535 lines", file_id);
881          }
882          if (line >= 2 && exclusive_directives[line - 2]) {
883            is_jscoverage_if = true;
884          }
885        }
886    
887      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
888      Stream_write_string(f, "if (");      Stream_write_string(f, "if (");
889      instrument_expression(node->pn_kid1, f);      instrument_expression(node->pn_kid1, f);
890      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
891      instrument_statement(node->pn_kid2, f, indent + 2);      if (is_jscoverage_if && node->pn_kid3) {
892          uint16_t else_start = node->pn_kid3->pn_pos.begin.lineno;
893          uint16_t else_end = node->pn_kid3->pn_pos.end.lineno + 1;
894          Stream_printf(f, "%*s", indent + 2, "");
895          Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, else_start, else_end);
896        }
897        instrument_statement(node->pn_kid2, f, indent + 2, false);
898      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
899      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
900      if (node->pn_kid3) {  
901        if (node->pn_kid3 || is_jscoverage_if) {
902        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
903        Stream_write_string(f, "else {\n");        Stream_write_string(f, "else {\n");
904        instrument_statement(node->pn_kid3, f, indent + 2);  
905          if (is_jscoverage_if) {
906            uint16_t if_start = node->pn_kid2->pn_pos.begin.lineno + 1;
907            uint16_t if_end = node->pn_kid2->pn_pos.end.lineno + 1;
908            Stream_printf(f, "%*s", indent + 2, "");
909            Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_start, if_end);
910          }
911    
912          if (node->pn_kid3) {
913            instrument_statement(node->pn_kid3, f, indent + 2, is_jscoverage_if);
914          }
915    
916        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
917        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
918      }      }
919    
920      break;      break;
921      }
922    case TOK_SWITCH:    case TOK_SWITCH:
923      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
924      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
925      Stream_write_string(f, "switch (");      Stream_write_string(f, "switch (");
926      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
927      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
928      for (struct JSParseNode * p = node->pn_right->pn_head; p != NULL; p = p->pn_next) {      {
929        Stream_printf(f, "%*s", indent, "");        JSParseNode * list = node->pn_right;
930        switch (p->pn_type) {        if (list->pn_type == TOK_LEXICALSCOPE) {
931        case TOK_CASE:          list = list->pn_expr;
932          Stream_write_string(f, "case ");        }
933          instrument_expression(p->pn_left, f);        for (struct JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
934          Stream_write_string(f, ":\n");          Stream_printf(f, "%*s", indent, "");
935          break;          switch (p->pn_type) {
936        case TOK_DEFAULT:          case TOK_CASE:
937          Stream_write_string(f, "default:\n");            Stream_write_string(f, "case ");
938          break;            instrument_expression(p->pn_left, f);
939        default:            Stream_write_string(f, ":\n");
940          abort();            break;
941          break;          case TOK_DEFAULT:
942              Stream_write_string(f, "default:\n");
943              break;
944            default:
945              abort();
946              break;
947            }
948            instrument_statement(p->pn_right, f, indent + 2, false);
949        }        }
       instrument_statement(p->pn_right, f, indent + 2);  
950      }      }
951      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
952      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 632  Line 961 
961      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
962      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
963      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
964      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
965      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
966      break;      break;
967    case TOK_DO:    case TOK_DO:
968      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
969      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
970      Stream_write_string(f, "do {\n");      Stream_write_string(f, "do {\n");
971      instrument_statement(node->pn_left, f, indent + 2);      instrument_statement(node->pn_left, f, indent + 2, false);
972      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
973      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
974      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
# Line 649  Line 978 
978    case TOK_FOR:    case TOK_FOR:
979      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
980      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
981      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
982      case TOK_IN:      case TOK_IN:
983        /* for/in */        /* for/in */
984        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
985        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);  
986        break;        break;
987      case TOK_RESERVED:      case TOK_RESERVED:
988        /* for (;;) */        /* for (;;) */
989        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
990          Stream_write_string(f, "for (");
991        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
992          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);  
         }  
993        }        }
994        Stream_write_string(f, ";");        Stream_write_string(f, ";");
995        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 696  Line 1001 
1001          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
1002          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
1003        }        }
1004          Stream_write_char(f, ')');
1005        break;        break;
1006      default:      default:
1007        abort();        abort();
1008        break;        break;
1009      }      }
1010      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
1011      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
1012      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1013      break;      break;
1014    case TOK_THROW:    case TOK_THROW:
# Line 715  Line 1021 
1021    case TOK_TRY:    case TOK_TRY:
1022      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1023      Stream_write_string(f, "try {\n");      Stream_write_string(f, "try {\n");
1024      instrument_statement(node->pn_kid1, f, indent + 2);      instrument_statement(node->pn_kid1, f, indent + 2, false);
1025      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1026      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1027      {      if (node->pn_kid2) {
1028        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
1029          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
1030            assert(scope->pn_type == TOK_LEXICALSCOPE);
1031            JSParseNode * catch = scope->pn_expr;
1032          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
1033          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1034          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
1035            /* this may not be a name - destructuring assignment */
1036            /*
1037          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
1038          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
1039          if (catch->pn_kid1->pn_expr) {          */
1040            instrument_expression(catch->pn_kid1, f);
1041            if (catch->pn_kid2) {
1042            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
1043            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
1044          }          }
1045          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
1046          instrument_statement(catch->pn_kid3, f, indent + 2);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
1047          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
1048          Stream_write_string(f, "}\n");          Stream_write_string(f, "}\n");
1049        }        }
# Line 738  Line 1051 
1051      if (node->pn_kid3) {      if (node->pn_kid3) {
1052        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1053        Stream_write_string(f, "finally {\n");        Stream_write_string(f, "finally {\n");
1054        instrument_statement(node->pn_kid3, f, indent + 2);        instrument_statement(node->pn_kid3, f, indent + 2, false);
1055        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
1056        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
1057      }      }
# Line 764  Line 1077 
1077      Stream_write_string(f, "with (");      Stream_write_string(f, "with (");
1078      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
1079      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
1080      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
1081      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
1082      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
1083      break;      break;
1084    case TOK_VAR:    case TOK_VAR:
1085      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
1086        instrument_expression(node, f);
1087      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
1088      break;      break;
1089    case TOK_RETURN:    case TOK_RETURN:
# Line 802  Line 1116 
1116      /*      /*
1117      ... use output_statement instead of instrument_statement.      ... use output_statement instead of instrument_statement.
1118      */      */
1119      output_statement(node->pn_expr, f, indent);      output_statement(node->pn_expr, f, indent, false);
1120        break;
1121      case TOK_LEXICALSCOPE:
1122        /* let statement */
1123        assert(node->pn_arity == PN_NAME);
1124        switch (node->pn_expr->pn_type) {
1125        case TOK_LET:
1126          /* let statement */
1127          assert(node->pn_expr->pn_arity == PN_BINARY);
1128          instrument_statement(node->pn_expr, f, indent, false);
1129          break;
1130        case TOK_LC:
1131          /* block */
1132          Stream_printf(f, "%*s", indent, "");
1133          Stream_write_string(f, "{\n");
1134          instrument_statement(node->pn_expr, f, indent + 2, false);
1135          Stream_printf(f, "%*s", indent, "");
1136          Stream_write_string(f, "}\n");
1137          break;
1138        case TOK_FOR:
1139          instrument_statement(node->pn_expr, f, indent, false);
1140          break;
1141        default:
1142          abort();
1143          break;
1144        }
1145        break;
1146      case TOK_LET:
1147        switch (node->pn_arity) {
1148        case PN_BINARY:
1149          /* let statement */
1150          Stream_printf(f, "%*s", indent, "");
1151          Stream_write_string(f, "let (");
1152          assert(node->pn_left->pn_type == TOK_LP);
1153          assert(node->pn_left->pn_arity == PN_LIST);
1154          instrument_declarations(node->pn_left, f);
1155          Stream_write_string(f, ") {\n");
1156          instrument_statement(node->pn_right, f, indent + 2, false);
1157          Stream_printf(f, "%*s", indent, "");
1158          Stream_write_string(f, "}\n");
1159          break;
1160        case PN_LIST:
1161          /* let definition */
1162          Stream_printf(f, "%*s", indent, "");
1163          instrument_expression(node, f);
1164          Stream_write_string(f, ";\n");
1165          break;
1166        default:
1167          abort();
1168          break;
1169        }
1170        break;
1171      case TOK_DEBUGGER:
1172        Stream_printf(f, "%*s", indent, "");
1173        Stream_write_string(f, "debugger;\n");
1174      break;      break;
1175    default:    default:
1176      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);
1177    }    }
1178  }  }
1179    
# Line 814  Line 1182 
1182  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
1183  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1184  */  */
1185  static void instrument_statement(JSParseNode * node, Stream * f, int indent) {  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
1186    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1187      int line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1188        if (line > num_lines) {
1189          fatal("file %s contains more than 65,535 lines", file_id);
1190        }
1191    
1192      /* the root node has line number 0 */      /* the root node has line number 0 */
1193      if (line != 0) {      if (line != 0) {
1194        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
# Line 824  Line 1196 
1196        lines[line - 1] = 1;        lines[line - 1] = 1;
1197      }      }
1198    }    }
1199    output_statement(node, f, indent);    output_statement(node, f, indent, is_jscoverage_if);
1200  }  }
1201    
1202  void jscoverage_instrument_js(const char * id, Stream * input, Stream * output) {  static bool characters_start_with(const jschar * characters, size_t line_start, size_t line_end, const char * prefix) {
1203    file_id = id;    const jschar * characters_end = characters + line_end;
1204      const jschar * cp = characters + line_start;
1205    /* scan the javascript */    const char * bp = prefix;
1206    size_t input_length = input->length;    for (;;) {
1207    jschar * base = js_InflateString(context, (char *) input->data, &input_length);      if (*bp == '\0') {
1208    if (base == NULL) {        return true;
1209      fatal("out of memory");      }
1210        else if (cp == characters_end) {
1211          return false;
1212        }
1213        else if (*cp != *bp) {
1214          return false;
1215        }
1216        bp++;
1217        cp++;
1218    }    }
1219    JSTokenStream * token_stream = js_NewTokenStream(context, base, input_length, NULL, 1, NULL);  }
1220    if (token_stream == NULL) {  
1221      fatal("cannot create token stream from file: %s", file_id);  static bool characters_are_white_space(const jschar * characters, size_t line_start, size_t line_end) {
1222      /* XXX - other Unicode space */
1223      const jschar * end = characters + line_end;
1224      for (const jschar * p = characters + line_start; p < end; p++) {
1225        jschar c = *p;
1226        if (c == 0x9 || c == 0xB || c == 0xC || c == 0x20 || c == 0xA0) {
1227          continue;
1228        }
1229        else {
1230          return false;
1231        }
1232    }    }
1233      return true;
1234    }
1235    
1236    static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1237      warn_source(file_id, report->lineno, "%s", message);
1238    }
1239    
1240    void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {
1241      file_id = id;
1242    
1243    /* parse the javascript */    /* parse the javascript */
1244    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseContext parse_context;
1245      if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1246        fatal("cannot create token stream from file %s", file_id);
1247      }
1248      JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1249      JSParseNode * node = js_ParseScript(context, global, &parse_context);
1250    if (node == NULL) {    if (node == NULL) {
1251      fatal("parse error in file: %s", file_id);      js_ReportUncaughtException(context);
1252        fatal("parse error in file %s", file_id);
1253    }    }
1254    int num_lines = node->pn_pos.end.lineno;    JS_SetErrorReporter(context, old_error_reporter);
1255      num_lines = node->pn_pos.end.lineno;
1256    lines = xmalloc(num_lines);    lines = xmalloc(num_lines);
1257    for (int i = 0; i < num_lines; i++) {    for (unsigned int i = 0; i < num_lines; i++) {
1258      lines[i] = 0;      lines[i] = 0;
1259    }    }
1260    
1261      /* search code for conditionals */
1262      exclusive_directives = xnew(bool, num_lines);
1263      for (unsigned int i = 0; i < num_lines; i++) {
1264        exclusive_directives[i] = false;
1265      }
1266    
1267      bool has_conditionals = false;
1268      struct IfDirective * if_directives = NULL;
1269      size_t line_number = 0;
1270      size_t i = 0;
1271      while (i < num_characters) {
1272        if (line_number == UINT16_MAX) {
1273          fatal("file %s contains more than 65,535 lines", file_id);
1274        }
1275        line_number++;
1276        size_t line_start = i;
1277        jschar c;
1278        bool done = false;
1279        while (! done && i < num_characters) {
1280          c = characters[i];
1281          switch (c) {
1282          case '\r':
1283          case '\n':
1284          case 0x2028:
1285          case 0x2029:
1286            done = true;
1287            break;
1288          default:
1289            i++;
1290          }
1291        }
1292        size_t line_end = i;
1293        if (i < num_characters) {
1294          i++;
1295          if (c == '\r' && i < num_characters && characters[i] == '\n') {
1296            i++;
1297          }
1298        }
1299    
1300        if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_IF")) {
1301          has_conditionals = true;
1302    
1303          if (characters_are_white_space(characters, line_start + 16, line_end)) {
1304            exclusive_directives[line_number - 1] = true;
1305          }
1306          else {
1307            struct IfDirective * if_directive = xnew(struct IfDirective, 1);
1308            if_directive->condition_start = characters + line_start + 16;
1309            if_directive->condition_end = characters + line_end;
1310            if_directive->start_line = line_number;
1311            if_directive->end_line = 0;
1312            if_directive->next = if_directives;
1313            if_directives = if_directive;
1314          }
1315        }
1316        else if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_ENDIF")) {
1317          for (struct IfDirective * p = if_directives; p != NULL; p = p->next) {
1318            if (p->end_line == 0) {
1319              p->end_line = line_number;
1320              break;
1321            }
1322          }
1323        }
1324      }
1325    
1326    /*    /*
1327    An instrumented JavaScript file has 3 sections:    An instrumented JavaScript file has 4 sections:
1328    1. initialization    1. initialization
1329    2. instrumented source code    2. instrumented source code
1330    3. original source code    3. conditionals
1331      4. original source code
1332    */    */
1333    
1334    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1335    instrument_statement(node, instrumented, 0);    instrument_statement(node, instrumented, 0, false);
1336      js_FinishParseContext(context, &parse_context);
1337    
1338    /* write line number info to the output */    /* write line number info to the output */
1339    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
1340    Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");    if (jscoverage_mozilla) {
1341    Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");      Stream_write_string(output, "try {\n");
1342        Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
1343        Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
1344        Stream_write_string(output, "}\n");
1345        Stream_write_string(output, "catch (e) {\n");
1346        Stream_write_string(output, "  _$jscoverage = {};\n");
1347        Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
1348        Stream_write_string(output, "}\n");
1349      }
1350      else {
1351        Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
1352        Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
1353      }
1354    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
1355    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
1356    for (int i = 0; i < num_lines; i++) {    for (int i = 0; i < num_lines; i++) {
# Line 876  Line 1361 
1361    Stream_write_string(output, "}\n");    Stream_write_string(output, "}\n");
1362    free(lines);    free(lines);
1363    lines = NULL;    lines = NULL;
1364      free(exclusive_directives);
1365      exclusive_directives = NULL;
1366    
1367      /* conditionals */
1368      if (has_conditionals) {
1369        Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);
1370      }
1371    
1372    /* copy the instrumented source code to the output */    /* copy the instrumented source code to the output */
1373    Stream_write(output, instrumented->data, instrumented->length);    Stream_write(output, instrumented->data, instrumented->length);
   Stream_write_char(output, '\n');  
1374    
1375    /* conditionals */    /* conditionals */
1376    bool has_conditionals = false;    for (struct IfDirective * if_directive = if_directives; if_directive != NULL; if_directive = if_directive->next) {
1377    size_t line_number = 0;      Stream_write_string(output, "if (!(");
1378    size_t i = 0;      print_javascript(if_directive->condition_start, if_directive->condition_end - if_directive->condition_start, output);
1379    while (i < input_length) {      Stream_write_string(output, ")) {\n");
1380      line_number++;      Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_directive->start_line, if_directive->end_line);
1381      size_t line_start = i;      Stream_write_string(output, "}\n");
1382      while (i < input_length && base[i] != '\r' && base[i] != '\n') {    }
1383        i++;  
1384      }    /* free */
1385      size_t line_end = i;    while (if_directives != NULL) {
1386      if (i < input_length) {      struct IfDirective * if_directive = if_directives;
1387        if (base[i] == '\r') {      if_directives = if_directives->next;
1388          line_end = i;      free(if_directive);
         i++;  
         if (i < input_length && base[i] == '\n') {  
           i++;  
         }  
       }  
       else if (base[i] == '\n') {  
         line_end = i;  
         i++;  
       }  
       else {  
         abort();  
       }  
     }  
     char * line = js_DeflateString(context, base + line_start, line_end - line_start);  
     if (str_starts_with(line, "//#JSCOVERAGE_IF")) {  
       if (! has_conditionals) {  
         has_conditionals = true;  
         Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);  
       }  
       Stream_printf(output, "if (!%s) {\n", line + 16);  
       Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = ", file_id, line_number);  
     }  
     else if (str_starts_with(line, "//#JSCOVERAGE_ENDIF")) {  
       Stream_printf(output, "%d;\n", line_number);  
       Stream_printf(output, "}\n");  
     }  
     JS_free(context, line);  
1389    }    }
1390    
1391    /* copy the original source to the output */    /* copy the original source to the output */
1392    i = 0;    Stream_printf(output, "_$jscoverage['%s'].source = ", file_id);
1393    while (i < input_length) {    jscoverage_write_source(id, characters, num_characters, output);
1394      Stream_write_string(output, "// ");    Stream_printf(output, ";\n");
     size_t line_start = i;  
     while (i < input_length && base[i] != '\r' && base[i] != '\n') {  
       i++;  
     }  
1395    
1396      size_t line_end = i;    Stream_delete(instrumented);
1397      if (i < input_length) {  
1398        if (base[i] == '\r') {    file_id = NULL;
1399          line_end = i;  }
1400    
1401    void jscoverage_write_source(const char * id, const jschar * characters, size_t num_characters, Stream * output) {
1402      Stream_write_string(output, "[");
1403      if (jscoverage_highlight) {
1404        Stream * highlighted_stream = Stream_new(num_characters);
1405        jscoverage_highlight_js(context, id, characters, num_characters, highlighted_stream);
1406        size_t i = 0;
1407        while (i < highlighted_stream->length) {
1408          if (i > 0) {
1409            Stream_write_char(output, ',');
1410          }
1411    
1412          Stream_write_char(output, '"');
1413          bool done = false;
1414          while (! done) {
1415            char c = highlighted_stream->data[i];
1416            switch (c) {
1417            case 0x8:
1418              /* backspace */
1419              Stream_write_string(output, "\\b");
1420              break;
1421            case 0x9:
1422              /* horizontal tab */
1423              Stream_write_string(output, "\\t");
1424              break;
1425            case 0xa:
1426              /* line feed (new line) */
1427              done = true;
1428              break;
1429            /* IE doesn't support this */
1430            /*
1431            case 0xb:
1432              Stream_write_string(output, "\\v");
1433              break;
1434            */
1435            case 0xc:
1436              /* form feed */
1437              Stream_write_string(output, "\\f");
1438              break;
1439            case 0xd:
1440              /* carriage return */
1441              done = true;
1442              if (i + 1 < highlighted_stream->length && highlighted_stream->data[i + 1] == '\n') {
1443                i++;
1444              }
1445              break;
1446            case '"':
1447              Stream_write_string(output, "\\\"");
1448              break;
1449            case '\\':
1450              Stream_write_string(output, "\\\\");
1451              break;
1452            default:
1453              Stream_write_char(output, c);
1454              break;
1455            }
1456          i++;          i++;
1457          if (i < input_length && base[i] == '\n') {          if (i >= highlighted_stream->length) {
1458            i++;            done = true;
1459          }          }
1460        }        }
1461        else if (base[i] == '\n') {        Stream_write_char(output, '"');
1462          line_end = i;      }
1463        Stream_delete(highlighted_stream);
1464      }
1465      else {
1466        size_t i = 0;
1467        while (i < num_characters) {
1468          if (i > 0) {
1469            Stream_write_char(output, ',');
1470          }
1471    
1472          Stream_write_char(output, '"');
1473          bool done = false;
1474          while (! done) {
1475            jschar c = characters[i];
1476            switch (c) {
1477            case 0x8:
1478              /* backspace */
1479              Stream_write_string(output, "\\b");
1480              break;
1481            case 0x9:
1482              /* horizontal tab */
1483              Stream_write_string(output, "\\t");
1484              break;
1485            case 0xa:
1486              /* line feed (new line) */
1487              done = true;
1488              break;
1489            /* IE doesn't support this */
1490            /*
1491            case 0xb:
1492              Stream_write_string(output, "\\v");
1493              break;
1494            */
1495            case 0xc:
1496              /* form feed */
1497              Stream_write_string(output, "\\f");
1498              break;
1499            case 0xd:
1500              /* carriage return */
1501              done = true;
1502              if (i + 1 < num_characters && characters[i + 1] == '\n') {
1503                i++;
1504              }
1505              break;
1506            case '"':
1507              Stream_write_string(output, "\\\"");
1508              break;
1509            case '\\':
1510              Stream_write_string(output, "\\\\");
1511              break;
1512            case '&':
1513              Stream_write_string(output, "&amp;");
1514              break;
1515            case '<':
1516              Stream_write_string(output, "&lt;");
1517              break;
1518            case '>':
1519              Stream_write_string(output, "&gt;");
1520              break;
1521            case 0x2028:
1522            case 0x2029:
1523              done = true;
1524              break;
1525            default:
1526              if (32 <= c && c <= 126) {
1527                Stream_write_char(output, c);
1528              }
1529              else {
1530                Stream_printf(output, "&#%d;", c);
1531              }
1532              break;
1533            }
1534          i++;          i++;
1535            if (i >= num_characters) {
1536              done = true;
1537            }
1538        }        }
1539        else {        Stream_write_char(output, '"');
         abort();  
       }  
1540      }      }
   
     char * line = js_DeflateString(context, base + line_start, line_end - line_start);  
     Stream_write_string(output, line);  
     Stream_write_char(output, '\n');  
     JS_free(context, line);  
1541    }    }
1542      Stream_write_string(output, "]");
   Stream_delete(instrumented);  
   
   JS_free(context, base);  
   
   file_id = NULL;  
1543  }  }
1544    
1545  void jscoverage_copy_resources(const char * destination_directory) {  void jscoverage_copy_resources(const char * destination_directory) {
# Line 970  Line 1548 
1548    copy_resource("jscoverage.js", destination_directory);    copy_resource("jscoverage.js", destination_directory);
1549    copy_resource("jscoverage-ie.css", destination_directory);    copy_resource("jscoverage-ie.css", destination_directory);
1550    copy_resource("jscoverage-throbber.gif", destination_directory);    copy_resource("jscoverage-throbber.gif", destination_directory);
1551    copy_resource("jscoverage-sh_main.js", destination_directory);    copy_resource("jscoverage-highlight.css", destination_directory);
   copy_resource("jscoverage-sh_javascript.js", destination_directory);  
   copy_resource("jscoverage-sh_nedit.css", destination_directory);  
1552  }  }
1553    
1554  /*  /*
# Line 1007  Line 1583 
1583    JS_HashTableDestroy(coverage->coverage_table);    JS_HashTableDestroy(coverage->coverage_table);
1584    struct FileCoverageList * p = coverage->coverage_list;    struct FileCoverageList * p = coverage->coverage_list;
1585    while (p != NULL) {    while (p != NULL) {
1586      free(p->file_coverage->lines);      free(p->file_coverage->coverage_lines);
1587      free(p->file_coverage->source);      if (p->file_coverage->source_lines != NULL) {
1588          for (uint32 i = 0; i < p->file_coverage->num_source_lines; i++) {
1589            free(p->file_coverage->source_lines[i]);
1590          }
1591          free(p->file_coverage->source_lines);
1592        }
1593      free(p->file_coverage->id);      free(p->file_coverage->id);
1594      free(p->file_coverage);      free(p->file_coverage);
1595      struct FileCoverageList * q = p;      struct FileCoverageList * q = p;
# Line 1037  Line 1618 
1618  }  }
1619    
1620  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) {
1621      int result = 0;
1622    
1623    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1624    if (base == NULL) {    if (base == NULL) {
1625      fatal("out of memory");      fatal("out of memory");
# Line 1049  Line 1632 
1632    
1633    JS_free(context, base);    JS_free(context, base);
1634    
1635    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1636    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1637      fatal("cannot create token stream");      free(parenthesized_json);
1638        return -1;
1639    }    }
1640      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1641    free(parenthesized_json);    free(parenthesized_json);
1642    if (root == NULL) {    if (root == NULL) {
1643      return -1;      result = -1;
1644        goto done;
1645    }    }
1646    
1647    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1648    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1649      return -1;      result = -1;
1650        goto done;
1651    }    }
1652    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1653    
1654    /* 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 */
1655    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1656      return -1;      result = -1;
1657        goto done;
1658    }    }
1659    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1660    
1661    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1662    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1663      return -1;      result = -1;
1664        goto done;
1665    }    }
1666    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1667    
1668    /* this must be an object literal */    /* this must be an object literal */
1669    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1670      return -1;      result = -1;
1671        goto done;
1672    }    }
1673    
1674    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1675      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1676      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1677        return -1;        result = -1;
1678          goto done;
1679      }      }
1680    
1681      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1682      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1683      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1684        return -1;        result = -1;
1685          goto done;
1686      }      }
1687      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1688    
1689      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1690      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1691      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1692        return -1;        result = -1;
1693          goto done;
1694      }      }
1695    
1696      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1111  Line 1702 
1702      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1703        /* an object literal */        /* an object literal */
1704        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1705          return -1;          result = -1;
1706            goto done;
1707        }        }
1708        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1709          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1710            return -1;            result = -1;
1711              goto done;
1712          }          }
1713          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1714          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1715            return -1;            result = -1;
1716              goto done;
1717          }          }
1718          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1719          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1720            array = element->pn_right;            array = element->pn_right;
1721            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1722              return -1;              result = -1;
1723                goto done;
1724            }            }
1725          }          }
1726          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1727            source = element->pn_right;            source = element->pn_right;
1728            if (source->pn_type != TOK_STRING || ! ATOM_IS_STRING(source->pn_atom)) {            if (source->pn_type != TOK_RB) {
1729              return -1;              result = -1;
1730                goto done;
1731            }            }
1732          }          }
1733          else {          else {
1734            return -1;            result = -1;
1735              goto done;
1736          }          }
1737        }        }
1738      }      }
1739      else {      else {
1740        return -1;        result = -1;
1741          goto done;
1742      }      }
1743    
1744      if (array == NULL) {      if (array == NULL) {
1745        return -1;        result = -1;
1746          goto done;
1747      }      }
1748    
1749      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1154  Line 1753 
1753        char * id = xstrdup(id_bytes);        char * id = xstrdup(id_bytes);
1754        file_coverage = xmalloc(sizeof(FileCoverage));        file_coverage = xmalloc(sizeof(FileCoverage));
1755        file_coverage->id = id;        file_coverage->id = id;
1756        file_coverage->num_lines = array->pn_count - 1;        file_coverage->num_coverage_lines = array->pn_count;
1757        file_coverage->lines = xnew(int, array->pn_count);        file_coverage->coverage_lines = xnew(int, array->pn_count);
1758        if (source == NULL) {        file_coverage->source_lines = NULL;
         file_coverage->source = NULL;  
       }  
       else {  
         file_coverage->source = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(source->pn_atom)));  
       }  
1759    
1760        /* set coverage for all lines */        /* set coverage for all lines */
1761        uint32 i = 0;        uint32 i = 0;
1762        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++) {
1763          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1764            file_coverage->lines[i] = (int) element->pn_dval;            file_coverage->coverage_lines[i] = (int) element->pn_dval;
1765          }          }
1766          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1767            file_coverage->lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1768          }          }
1769          else {          else {
1770            return -1;            result = -1;
1771              goto done;
1772          }          }
1773        }        }
1774        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1188  Line 1783 
1783      else {      else {
1784        /* sanity check */        /* sanity check */
1785        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1786        if (file_coverage->num_lines != array->pn_count - 1) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1787          return -2;          result = -2;
1788            goto done;
1789        }        }
1790    
1791        /* merge the coverage */        /* merge the coverage */
1792        uint32 i = 0;        uint32 i = 0;
1793        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++) {
1794          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1795            if (file_coverage->lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1796              return -2;              result = -2;
1797                goto done;
1798            }            }
1799            file_coverage->lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1800          }          }
1801          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1802            if (file_coverage->lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1803              return -2;              result = -2;
1804                goto done;
1805            }            }
1806          }          }
1807          else {          else {
1808            return -1;            result = -1;
1809              goto done;
1810          }          }
1811        }        }
1812        assert(i == array->pn_count);        assert(i == array->pn_count);
1813        }
1814    
1815        /* if this JSON file has source, use it */      /* if this JSON file has source, use it */
1816        if (file_coverage->source == NULL && source != NULL) {      if (file_coverage->source_lines == NULL && source != NULL) {
1817          file_coverage->source = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(source->pn_atom)));        file_coverage->num_source_lines = source->pn_count;
1818          file_coverage->source_lines = xnew(char *, source->pn_count);
1819          uint32 i = 0;
1820          for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {
1821            if (element->pn_type != TOK_STRING) {
1822              result = -1;
1823              goto done;
1824            }
1825            file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));
1826        }        }
1827          assert(i == source->pn_count);
1828      }      }
1829    }    }
1830    
1831    return 0;  done:
1832      js_FinishParseContext(context, &parse_context);
1833      return result;
1834  }  }

Legend:
Removed from v.169  
changed lines
  Added in v.373

  ViewVC Help
Powered by ViewVC 1.1.24