/[jscoverage]/trunk/instrument-js.c
ViewVC logotype

Diff of /trunk/instrument-js.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 350 by siliconforks, Fri Oct 24 16:17:39 2008 UTC revision 369 by siliconforks, Mon Oct 27 20:33:57 2008 UTC
# Line 28  Line 28 
28  #include <jsapi.h>  #include <jsapi.h>
29  #include <jsarena.h>  #include <jsarena.h>
30  #include <jsatom.h>  #include <jsatom.h>
31    #include <jsemit.h>
32  #include <jsexn.h>  #include <jsexn.h>
33  #include <jsfun.h>  #include <jsfun.h>
34  #include <jsinterp.h>  #include <jsinterp.h>
# Line 51  Line 52 
52    struct IfDirective * next;    struct IfDirective * next;
53  };  };
54    
55    bool jscoverage_mozilla = false;
56    
57  static bool * exclusive_directives = NULL;  static bool * exclusive_directives = NULL;
58    
59  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
# Line 67  Line 70 
70  static uint16_t num_lines = 0;  static uint16_t num_lines = 0;
71    
72  void jscoverage_set_js_version(const char * version) {  void jscoverage_set_js_version(const char * version) {
73    js_version = atoi(version);    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 (end - version != strlen(version)) {
81        fatal("invalid version: %s", version);
82      }
83  }  }
84    
85  void jscoverage_init(void) {  void jscoverage_init(void) {
# Line 276  Line 288 
288    Stream_write_char(f, ')');    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);    assert(node->pn_type == TOK_FUNCTION);
330    assert(node->pn_arity == PN_FUNC);    assert(node->pn_arity == PN_FUNC);
# Line 314  Line 363 
363        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
364      }      }
365      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
366        if (param == NULL) {
367          fatal("unsupported parameter type for function: %s", file_id);
368        }
369      print_string_atom(param, f);      print_string_atom(param, f);
370    }    }
371    JS_FinishArenaPool(&pool);    JS_FinishArenaPool(&pool);
# Line 332  Line 384 
384  }  }
385    
386  static void instrument_function_call(JSParseNode * node, Stream * f) {  static void instrument_function_call(JSParseNode * node, Stream * f) {
387    if (node->pn_head->pn_type == TOK_FUNCTION) {    JSParseNode * function_node = node->pn_head;
388      /* it's a generator expression */    if (function_node->pn_type == TOK_FUNCTION) {
389      JSParseNode * function_node = node->pn_head;      JSObject * object = function_node->pn_funpob->object;
390      JSParseNode * lexical_scope_node = function_node->pn_body;      assert(JS_ObjectIsFunction(context, object));
391      assert(lexical_scope_node->pn_type == TOK_LEXICALSCOPE);      JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
392      assert(lexical_scope_node->pn_arity == PN_NAME);      assert(function);
393      JSParseNode * for_node = lexical_scope_node->pn_body;      assert(object == &function->object);
394      assert(for_node->pn_type == TOK_FOR);  
395      assert(for_node->pn_arity == PN_BINARY);      if (function_node->pn_flags & TCF_GENEXP_LAMBDA) {
396      JSParseNode * if_node = NULL;        /* it's a generator expression */
397      JSParseNode * semi_node;        Stream_write_char(f, '(');
398      switch (for_node->pn_right->pn_type) {        output_array_comprehension_or_generator_expression(function_node->pn_body, f);
399      case TOK_SEMI:        Stream_write_char(f, ')');
400        semi_node = for_node->pn_right;        return;
       break;  
     case TOK_IF:  
       if_node = for_node->pn_right;  
       assert(if_node->pn_arity == PN_TERNARY);  
       semi_node = if_node->pn_kid2;  
       assert(semi_node->pn_type == TOK_SEMI);  
       break;  
     default:  
       abort();  
       break;  
401      }      }
402      assert(semi_node->pn_arity == PN_UNARY);      else {
403      JSParseNode * yield_node = semi_node->pn_kid;        Stream_write_char(f, '(');
404      assert(yield_node->pn_type == TOK_YIELD);        instrument_expression(function_node, f);
     Stream_write_char(f, '(');  
     instrument_expression(yield_node->pn_kid, f);  
     Stream_write_char(f, ' ');  
     output_for_in(for_node, f);  
     if (if_node) {  
       Stream_write_string(f, " if (");  
       instrument_expression(if_node->pn_kid1, f);  
405        Stream_write_char(f, ')');        Stream_write_char(f, ')');
406      }      }
     Stream_write_char(f, ')');  
407    }    }
408    else {    else {
409      instrument_expression(node->pn_head, f);      instrument_expression(function_node, f);
410      Stream_write_char(f, '(');    }
411      for (struct JSParseNode * p = node->pn_head->pn_next; p != NULL; p = p->pn_next) {    Stream_write_char(f, '(');
412        if (p != node->pn_head->pn_next) {    for (struct JSParseNode * p = function_node->pn_next; p != NULL; p = p->pn_next) {
413          Stream_write_string(f, ", ");      if (p != node->pn_head->pn_next) {
414        }        Stream_write_string(f, ", ");
       instrument_expression(p, f);  
415      }      }
416      Stream_write_char(f, ')');      instrument_expression(p, f);
417    }    }
418      Stream_write_char(f, ')');
419  }  }
420    
421  static void instrument_declarations(JSParseNode * list, Stream * f) {  static void instrument_declarations(JSParseNode * list, Stream * f) {
# Line 526  Line 560 
560        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
561        break;        break;
562      default:      default:
563        abort();        fatal("%s: unknown operator (%d) in file", file_id, node->pn_op);
564        break;        break;
565      }      }
566      break;      break;
# Line 635  Line 669 
669    case TOK_RC:    case TOK_RC:
670      Stream_write_char(f, '{');      Stream_write_char(f, '{');
671      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) {
672        assert(p->pn_type == TOK_COLON);        if (p->pn_type != TOK_COLON) {
673            fatal("unsupported node type in file %s: %d", file_id, p->pn_type);
674          }
675        if (p != node->pn_head) {        if (p != node->pn_head) {
676          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
677        }        }
# Line 741  Line 777 
777      break;      break;
778    case TOK_YIELD:    case TOK_YIELD:
779      assert(node->pn_arity == PN_UNARY);      assert(node->pn_arity == PN_UNARY);
780      Stream_write_string(f, "yield ");      Stream_write_string(f, "yield");
781      instrument_expression(node->pn_kid, f);      if (node->pn_kid != NULL) {
782          Stream_write_char(f, ' ');
783          instrument_expression(node->pn_kid, f);
784        }
785      break;      break;
786    case TOK_ARRAYCOMP:    case TOK_ARRAYCOMP:
787      assert(node->pn_arity == PN_LIST);      assert(node->pn_arity == PN_LIST);
# Line 759  Line 798 
798          abort();          abort();
799          break;          break;
800        }        }
       assert(block_node->pn_type == TOK_LEXICALSCOPE);  
       assert(block_node->pn_arity == PN_NAME);  
       JSParseNode * for_node = block_node->pn_expr;  
       assert(for_node->pn_type == TOK_FOR);  
       assert(for_node->pn_arity == PN_BINARY);  
       JSParseNode * if_node = NULL;  
       JSParseNode * push_node;  
       switch (for_node->pn_right->pn_type) {  
       case TOK_ARRAYPUSH:  
         push_node = for_node->pn_right;  
         assert(push_node->pn_arity == PN_UNARY);  
         break;  
       case TOK_IF:  
         if_node = for_node->pn_right;  
         assert(if_node->pn_arity == PN_TERNARY);  
         push_node = if_node->pn_kid2;  
         break;  
       default:  
         abort();  
         break;  
       }  
801        Stream_write_char(f, '[');        Stream_write_char(f, '[');
802        instrument_expression(push_node->pn_kid, f);        output_array_comprehension_or_generator_expression(block_node, f);
       Stream_write_char(f, ' ');  
       output_for_in(for_node, f);  
       if (if_node) {  
         Stream_write_string(f, " if (");  
         instrument_expression(if_node->pn_kid1, f);  
         Stream_write_char(f, ')');  
       }  
803        Stream_write_char(f, ']');        Stream_write_char(f, ']');
804      }      }
805      break;      break;
# Line 1292  Line 1303 
1303    
1304    /* write line number info to the output */    /* write line number info to the output */
1305    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
1306    Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");    if (jscoverage_mozilla) {
1307    Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");      Stream_write_string(output, "try {\n");
1308        Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
1309        Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
1310        Stream_write_string(output, "}\n");
1311        Stream_write_string(output, "catch (e) {\n");
1312        Stream_write_string(output, "  _$jscoverage = {};\n");
1313        Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
1314        Stream_write_string(output, "}\n");
1315      }
1316      else {
1317        Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
1318        Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
1319      }
1320    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);    Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
1321    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);    Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
1322    for (int i = 0; i < num_lines; i++) {    for (int i = 0; i < num_lines; i++) {

Legend:
Removed from v.350  
changed lines
  Added in v.369

  ViewVC Help
Powered by ViewVC 1.1.24