/[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 354 by siliconforks, Fri Oct 24 16:18:54 2008 UTC revision 370 by siliconforks, Mon Oct 27 20:34:27 2008 UTC
# Line 52  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 68  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 ((size_t) (end - version) != strlen(version)) {
81        fatal("invalid version: %s", version);
82      }
83  }  }
84    
85  void jscoverage_init(void) {  void jscoverage_init(void) {
# Line 277  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 316  Line 364 
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) {      if (param == NULL) {
367        fatal("unsupported parameter type for function: %s", file_id);        fatal_source(file_id, node->pn_pos.begin.lineno, "unsupported parameter type for function");
368      }      }
369      print_string_atom(param, f);      print_string_atom(param, f);
370    }    }
# Line 346  Line 394 
394    
395      if (function_node->pn_flags & TCF_GENEXP_LAMBDA) {      if (function_node->pn_flags & TCF_GENEXP_LAMBDA) {
396        /* it's a generator expression */        /* it's a generator expression */
       JSParseNode * lexical_scope_node = function_node->pn_body;  
       assert(lexical_scope_node->pn_type == TOK_LEXICALSCOPE);  
       assert(lexical_scope_node->pn_arity == PN_NAME);  
       JSParseNode * for_node = lexical_scope_node->pn_body;  
       assert(for_node->pn_type == TOK_FOR);  
       assert(for_node->pn_arity == PN_BINARY);  
       JSParseNode * if_node = NULL;  
       JSParseNode * semi_node;  
       switch (for_node->pn_right->pn_type) {  
       case TOK_SEMI:  
         semi_node = for_node->pn_right;  
         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;  
       }  
       assert(semi_node->pn_arity == PN_UNARY);  
       JSParseNode * yield_node = semi_node->pn_kid;  
       assert(yield_node->pn_type == TOK_YIELD);  
397        Stream_write_char(f, '(');        Stream_write_char(f, '(');
398        instrument_expression(yield_node->pn_kid, f);        output_array_comprehension_or_generator_expression(function_node->pn_body, 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, ')');  
       }  
399        Stream_write_char(f, ')');        Stream_write_char(f, ')');
400        return;        return;
401      }      }
# Line 544  Line 560 
560        instrument_expression(node->pn_kid, f);        instrument_expression(node->pn_kid, f);
561        break;        break;
562      default:      default:
563        fatal("%s: unknown operator (%d) in file", file_id, node->pn_op);        fatal_source(file_id, node->pn_pos.begin.lineno, "unknown operator (%d)", node->pn_op);
564        break;        break;
565      }      }
566      break;      break;
# Line 654  Line 670 
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        if (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);          fatal_source(file_id, p->pn_pos.begin.lineno, "unsupported node type (%d)", p->pn_type);
674        }        }
675        if (p != node->pn_head) {        if (p != node->pn_head) {
676          Stream_write_string(f, ", ");          Stream_write_string(f, ", ");
# Line 672  Line 688 
688          }          }
689          instrument_expression(p->pn_left, f);          instrument_expression(p->pn_left, f);
690          if (p->pn_right->pn_type != TOK_FUNCTION) {          if (p->pn_right->pn_type != TOK_FUNCTION) {
691            fatal("parse error: expected function");            fatal_source(file_id, p->pn_pos.begin.lineno, "expected function");
692          }          }
693          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);          instrument_function(p->pn_right, f, 0, FUNCTION_GETTER_OR_SETTER);
694          break;          break;
# Line 761  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 779  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 823  Line 814 
814      instrument_declarations(node, f);      instrument_declarations(node, f);
815      break;      break;
816    default:    default:
817      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);
818    }    }
819  }  }
820    
# Line 852  Line 843 
843      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
844      if (! is_jscoverage_if) {      if (! is_jscoverage_if) {
845        if (line > num_lines) {        if (line > num_lines) {
846          fatal("%s: script contains more than 65,535 lines", file_id);          fatal("file %s contains more than 65,535 lines", file_id);
847        }        }
848        if (line >= 2 && exclusive_directives[line - 2]) {        if (line >= 2 && exclusive_directives[line - 2]) {
849          is_jscoverage_if = true;          is_jscoverage_if = true;
# Line 1148  Line 1139 
1139      Stream_write_string(f, "debugger;\n");      Stream_write_string(f, "debugger;\n");
1140      break;      break;
1141    default:    default:
1142      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);
1143    }    }
1144  }  }
1145    
# Line 1161  Line 1152 
1152    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1153      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1154      if (line > num_lines) {      if (line > num_lines) {
1155        fatal("%s: script contains more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1156      }      }
1157    
1158      /* the root node has line number 0 */      /* the root node has line number 0 */
# Line 1209  Line 1200 
1200  }  }
1201    
1202  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {  static void error_reporter(JSContext * context, const char * message, JSErrorReport * report) {
1203    fprintf(stderr, "jscoverage: parse error: line %u: %s\n", report->lineno, message);    fatal_source(file_id, report->lineno, message);
1204  }  }
1205    
1206  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) {
# Line 1218  Line 1209 
1209    /* parse the javascript */    /* parse the javascript */
1210    JSParseContext parse_context;    JSParseContext parse_context;
1211    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1212      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file %s", file_id);
1213    }    }
1214    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1215    JSParseNode * node = js_ParseScript(context, global, &parse_context);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1216    if (node == NULL) {    if (node == NULL) {
1217      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1218      fatal("parse error in file: %s", file_id);      fatal("parse error in file %s", file_id);
1219    }    }
1220    JS_SetErrorReporter(context, old_error_reporter);    JS_SetErrorReporter(context, old_error_reporter);
1221    num_lines = node->pn_pos.end.lineno;    num_lines = node->pn_pos.end.lineno;
# Line 1245  Line 1236 
1236    size_t i = 0;    size_t i = 0;
1237    while (i < num_characters) {    while (i < num_characters) {
1238      if (line_number == UINT16_MAX) {      if (line_number == UINT16_MAX) {
1239        fatal("%s: script has more than 65,535 lines", file_id);        fatal("file %s contains more than 65,535 lines", file_id);
1240      }      }
1241      line_number++;      line_number++;
1242      size_t line_start = i;      size_t line_start = i;
# Line 1312  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.354  
changed lines
  Added in v.370

  ViewVC Help
Powered by ViewVC 1.1.24