/[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 174 by siliconforks, Sat Sep 20 23:27:14 2008 UTC revision 246 by siliconforks, Sun Oct 5 18:05:42 2008 UTC
# Line 35  Line 35 
35  #include <jsstr.h>  #include <jsstr.h>
36    
37  #include "encoding.h"  #include "encoding.h"
38    #include "global.h"
39    #include "highlight.h"
40  #include "resource-manager.h"  #include "resource-manager.h"
41  #include "util.h"  #include "util.h"
42    
43    struct IfDirective {
44      const jschar * condition_start;
45      const jschar * condition_end;
46      uint16_t start_line;
47      uint16_t end_line;
48      struct IfDirective * next;
49    };
50    
51    static bool * exclusive_directives = NULL;
52    
53  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
54  static JSContext * context = NULL;  static JSContext * context = NULL;
55  static JSObject * global = NULL;  static JSObject * global = NULL;
# Line 48  Line 60 
60  */  */
61  static const char * file_id = NULL;  static const char * file_id = NULL;
62  static char * lines = NULL;  static char * lines = NULL;
63    static uint16_t num_lines = 0;
64    
65  void jscoverage_init(void) {  void jscoverage_init(void) {
66    runtime = JS_NewRuntime(8L * 1024L * 1024L);    runtime = JS_NewRuntime(8L * 1024L * 1024L);
# Line 75  Line 88 
88    JS_DestroyRuntime(runtime);    JS_DestroyRuntime(runtime);
89  }  }
90    
91    static void print_javascript(const jschar * characters, size_t num_characters, Stream * f) {
92      for (size_t i = 0; i < num_characters; i++) {
93        jschar c = characters[i];
94        /*
95        XXX does not handle no-break space, other unicode "space separator"
96        */
97        switch (c) {
98        case 0x9:
99        case 0xB:
100        case 0xC:
101          Stream_write_char(f, c);
102          break;
103        default:
104          if (32 <= c && c <= 126) {
105            Stream_write_char(f, c);
106          }
107          else {
108            Stream_printf(f, "\\u%04x", c);
109          }
110          break;
111        }
112      }
113    }
114    
115  static void print_string(JSString * s, Stream * f) {  static void print_string(JSString * s, Stream * f) {
116    size_t length = JSSTRING_LENGTH(s);    size_t length = JSSTRING_LENGTH(s);
117    jschar * characters = JSSTRING_CHARS(s);    jschar * characters = JSSTRING_CHARS(s);
# Line 202  Line 239 
239  }  }
240    
241  static void instrument_expression(JSParseNode * node, Stream * f);  static void instrument_expression(JSParseNode * node, Stream * f);
242  static void instrument_statement(JSParseNode * node, Stream * f, int indent);  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if);
243    
244  enum FunctionType {  enum FunctionType {
245    FUNCTION_NORMAL,    FUNCTION_NORMAL,
# Line 258  Line 295 
295    free(params);    free(params);
296    
297    /* function body */    /* function body */
298    instrument_statement(node->pn_body, f, indent + 2);    instrument_statement(node->pn_body, f, indent + 2, false);
299    
300    Stream_write_string(f, "}\n");    Stream_write_string(f, "}\n");
301  }  }
# Line 617  Line 654 
654    }    }
655  }  }
656    
657  static void output_statement(JSParseNode * node, Stream * f, int indent) {  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
658    switch (node->pn_type) {    switch (node->pn_type) {
659    case TOK_FUNCTION:    case TOK_FUNCTION:
660      instrument_function(node, f, indent, FUNCTION_NORMAL);      instrument_function(node, f, indent, FUNCTION_NORMAL);
# Line 628  Line 665 
665      Stream_write_string(f, "{\n");      Stream_write_string(f, "{\n");
666  */  */
667      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) {
668        instrument_statement(p, f, indent);        instrument_statement(p, f, indent, false);
669      }      }
670  /*  /*
671      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
# Line 636  Line 673 
673  */  */
674      break;      break;
675    case TOK_IF:    case TOK_IF:
676      {
677      assert(node->pn_arity == PN_TERNARY);      assert(node->pn_arity == PN_TERNARY);
678    
679        uint16_t line = node->pn_pos.begin.lineno;
680        if (! is_jscoverage_if) {
681          if (line > num_lines) {
682            fatal("%s: script contains more than 65,535 lines", file_id);
683          }
684          if (line >= 2 && exclusive_directives[line - 2]) {
685            is_jscoverage_if = true;
686          }
687        }
688    
689      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
690      Stream_write_string(f, "if (");      Stream_write_string(f, "if (");
691      instrument_expression(node->pn_kid1, f);      instrument_expression(node->pn_kid1, f);
692      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
693      instrument_statement(node->pn_kid2, f, indent + 2);      if (is_jscoverage_if && node->pn_kid3) {
694          uint16_t else_start = node->pn_kid3->pn_pos.begin.lineno;
695          uint16_t else_end = node->pn_kid3->pn_pos.end.lineno + 1;
696          Stream_printf(f, "%*s", indent + 2, "");
697          Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, else_start, else_end);
698        }
699        instrument_statement(node->pn_kid2, f, indent + 2, false);
700      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
701      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
702      if (node->pn_kid3) {  
703        if (node->pn_kid3 || is_jscoverage_if) {
704        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
705        Stream_write_string(f, "else {\n");        Stream_write_string(f, "else {\n");
706        instrument_statement(node->pn_kid3, f, indent + 2);  
707          if (is_jscoverage_if) {
708            uint16_t if_start = node->pn_kid2->pn_pos.begin.lineno + 1;
709            uint16_t if_end = node->pn_kid2->pn_pos.end.lineno + 1;
710            Stream_printf(f, "%*s", indent + 2, "");
711            Stream_printf(f, "_$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_start, if_end);
712          }
713    
714          if (node->pn_kid3) {
715            instrument_statement(node->pn_kid3, f, indent + 2, is_jscoverage_if);
716          }
717    
718        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
719        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
720      }      }
721    
722      break;      break;
723      }
724    case TOK_SWITCH:    case TOK_SWITCH:
725      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
726      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
# Line 673  Line 742 
742          abort();          abort();
743          break;          break;
744        }        }
745        instrument_statement(p->pn_right, f, indent + 2);        instrument_statement(p->pn_right, f, indent + 2, false);
746      }      }
747      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
748      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
# Line 688  Line 757 
757      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
758      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
759      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
760      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
761      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
762      break;      break;
763    case TOK_DO:    case TOK_DO:
764      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
765      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
766      Stream_write_string(f, "do {\n");      Stream_write_string(f, "do {\n");
767      instrument_statement(node->pn_left, f, indent + 2);      instrument_statement(node->pn_left, f, indent + 2, false);
768      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
769      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
770      Stream_write_string(f, "while (");      Stream_write_string(f, "while (");
# Line 758  Line 827 
827        break;        break;
828      }      }
829      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
830      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
831      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
832      break;      break;
833    case TOK_THROW:    case TOK_THROW:
# Line 771  Line 840 
840    case TOK_TRY:    case TOK_TRY:
841      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
842      Stream_write_string(f, "try {\n");      Stream_write_string(f, "try {\n");
843      instrument_statement(node->pn_kid1, f, indent + 2);      instrument_statement(node->pn_kid1, f, indent + 2, false);
844      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
845      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
846      {      {
# Line 786  Line 855 
855            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid1->pn_expr, f);
856          }          }
857          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
858          instrument_statement(catch->pn_kid3, f, indent + 2);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
859          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
860          Stream_write_string(f, "}\n");          Stream_write_string(f, "}\n");
861        }        }
# Line 794  Line 863 
863      if (node->pn_kid3) {      if (node->pn_kid3) {
864        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
865        Stream_write_string(f, "finally {\n");        Stream_write_string(f, "finally {\n");
866        instrument_statement(node->pn_kid3, f, indent + 2);        instrument_statement(node->pn_kid3, f, indent + 2, false);
867        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
868        Stream_write_string(f, "}\n");        Stream_write_string(f, "}\n");
869      }      }
# Line 820  Line 889 
889      Stream_write_string(f, "with (");      Stream_write_string(f, "with (");
890      instrument_expression(node->pn_left, f);      instrument_expression(node->pn_left, f);
891      Stream_write_string(f, ") {\n");      Stream_write_string(f, ") {\n");
892      instrument_statement(node->pn_right, f, indent + 2);      instrument_statement(node->pn_right, f, indent + 2, false);
893      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
894      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
895      break;      break;
# Line 858  Line 927 
927      /*      /*
928      ... use output_statement instead of instrument_statement.      ... use output_statement instead of instrument_statement.
929      */      */
930      output_statement(node->pn_expr, f, indent);      output_statement(node->pn_expr, f, indent, false);
931      break;      break;
932    default:    default:
933      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);      fatal("unsupported node type in file %s: %d", file_id, node->pn_type);
# Line 870  Line 939 
939  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
940  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
941  */  */
942  static void instrument_statement(JSParseNode * node, Stream * f, int indent) {  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
943    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC) {
944      int line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
945        if (line > num_lines) {
946          fatal("%s: script contains more than 65,535 lines", file_id);
947        }
948    
949      /* the root node has line number 0 */      /* the root node has line number 0 */
950      if (line != 0) {      if (line != 0) {
951        Stream_printf(f, "%*s", indent, "");        Stream_printf(f, "%*s", indent, "");
# Line 880  Line 953 
953        lines[line - 1] = 1;        lines[line - 1] = 1;
954      }      }
955    }    }
956    output_statement(node, f, indent);    output_statement(node, f, indent, is_jscoverage_if);
957  }  }
958    
959  void jscoverage_instrument_js(const char * id, const char * encoding, Stream * input, Stream * output) {  static bool characters_start_with(const jschar * characters, size_t line_start, size_t line_end, const char * prefix) {
960      const jschar * characters_end = characters + line_end;
961      const jschar * cp = characters + line_start;
962      const char * bp = prefix;
963      for (;;) {
964        if (*bp == '\0') {
965          return true;
966        }
967        else if (cp == characters_end) {
968          return false;
969        }
970        else if (*cp != *bp) {
971          return false;
972        }
973        bp++;
974        cp++;
975      }
976    }
977    
978    static bool characters_are_white_space(const jschar * characters, size_t line_start, size_t line_end) {
979      /* XXX - other Unicode space */
980      const jschar * end = characters + line_end;
981      for (const jschar * p = characters + line_start; p < end; p++) {
982        jschar c = *p;
983        if (c == 0x9 || c == 0xB || c == 0xC || c == 0x20 || c == 0xA0) {
984          continue;
985        }
986        else {
987          return false;
988        }
989      }
990      return true;
991    }
992    
993    void jscoverage_instrument_js(const char * id, const uint16_t * characters, size_t num_characters, Stream * output) {
994    file_id = id;    file_id = id;
995    
996    /* scan the javascript */    /* scan the javascript */
997    size_t input_length = input->length;    JSTokenStream * token_stream = js_NewTokenStream(context, characters, num_characters, NULL, 1, NULL);
   jschar * base = NULL;  
   int result = jscoverage_bytes_to_characters(encoding, input->data, input->length, &base, &input_length);  
   if (result == JSCOVERAGE_ERROR_ENCODING_NOT_SUPPORTED) {  
     fatal("encoding %s not supported in file %s", encoding, id);  
   }  
   else if (result == JSCOVERAGE_ERROR_INVALID_BYTE_SEQUENCE) {  
     fatal("error decoding %s in file %s", encoding, id);  
   }  
   JSTokenStream * token_stream = js_NewTokenStream(context, base, input_length, NULL, 1, NULL);  
998    if (token_stream == NULL) {    if (token_stream == NULL) {
999      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file: %s", file_id);
1000    }    }
# Line 906  Line 1004 
1004    if (node == NULL) {    if (node == NULL) {
1005      fatal("parse error in file: %s", file_id);      fatal("parse error in file: %s", file_id);
1006    }    }
1007    int num_lines = node->pn_pos.end.lineno;    num_lines = node->pn_pos.end.lineno;
1008    lines = xmalloc(num_lines);    lines = xmalloc(num_lines);
1009    for (int i = 0; i < num_lines; i++) {    for (unsigned int i = 0; i < num_lines; i++) {
1010      lines[i] = 0;      lines[i] = 0;
1011    }    }
1012    
1013      /* search code for conditionals */
1014      exclusive_directives = xnew(bool, num_lines);
1015      for (unsigned int i = 0; i < num_lines; i++) {
1016        exclusive_directives[i] = false;
1017      }
1018    
1019      bool has_conditionals = false;
1020      struct IfDirective * if_directives = NULL;
1021      size_t line_number = 0;
1022      size_t i = 0;
1023      while (i < num_characters) {
1024        if (line_number == UINT16_MAX) {
1025          fatal("%s: script has more than 65,535 lines", file_id);
1026        }
1027        line_number++;
1028        size_t line_start = i;
1029        jschar c;
1030        bool done = false;
1031        while (! done && i < num_characters) {
1032          c = characters[i];
1033          switch (c) {
1034          case '\r':
1035          case '\n':
1036          case 0x2028:
1037          case 0x2029:
1038            done = true;
1039            break;
1040          default:
1041            i++;
1042          }
1043        }
1044        size_t line_end = i;
1045        if (i < num_characters) {
1046          i++;
1047          if (c == '\r' && i < num_characters && characters[i] == '\n') {
1048            i++;
1049          }
1050        }
1051    
1052        if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_IF")) {
1053          has_conditionals = true;
1054    
1055          if (characters_are_white_space(characters, line_start + 16, line_end)) {
1056            exclusive_directives[line_number - 1] = true;
1057          }
1058          else {
1059            struct IfDirective * if_directive = xnew(struct IfDirective, 1);
1060            if_directive->condition_start = characters + line_start + 16;
1061            if_directive->condition_end = characters + line_end;
1062            if_directive->start_line = line_number;
1063            if_directive->end_line = 0;
1064            if_directive->next = if_directives;
1065            if_directives = if_directive;
1066          }
1067        }
1068        else if (characters_start_with(characters, line_start, line_end, "//#JSCOVERAGE_ENDIF")) {
1069          for (struct IfDirective * p = if_directives; p != NULL; p = p->next) {
1070            if (p->end_line == 0) {
1071              p->end_line = line_number;
1072              break;
1073            }
1074          }
1075        }
1076      }
1077    
1078    /*    /*
1079    An instrumented JavaScript file has 3 sections:    An instrumented JavaScript file has 4 sections:
1080    1. initialization    1. initialization
1081    2. instrumented source code    2. instrumented source code
1082    3. original source code    3. conditionals
1083      4. original source code
1084    */    */
1085    
1086    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1087    instrument_statement(node, instrumented, 0);    instrument_statement(node, instrumented, 0, false);
1088    
1089    /* write line number info to the output */    /* write line number info to the output */
1090    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");    Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
# Line 936  Line 1100 
1100    Stream_write_string(output, "}\n");    Stream_write_string(output, "}\n");
1101    free(lines);    free(lines);
1102    lines = NULL;    lines = NULL;
1103      free(exclusive_directives);
1104      exclusive_directives = NULL;
1105    
1106      /* conditionals */
1107      if (has_conditionals) {
1108        Stream_printf(output, "_$jscoverage['%s'].conditionals = [];\n", file_id);
1109      }
1110    
1111    /* copy the instrumented source code to the output */    /* copy the instrumented source code to the output */
1112    Stream_write(output, instrumented->data, instrumented->length);    Stream_write(output, instrumented->data, instrumented->length);
   Stream_write_char(output, '\n');  
1113    
1114    /* conditionals */    /* conditionals */
1115    bool has_conditionals = false;    for (struct IfDirective * if_directive = if_directives; if_directive != NULL; if_directive = if_directive->next) {
1116    size_t line_number = 0;      Stream_write_string(output, "if (!(");
1117    size_t i = 0;      print_javascript(if_directive->condition_start, if_directive->condition_end - if_directive->condition_start, output);
1118    while (i < input_length) {      Stream_write_string(output, ")) {\n");
1119      line_number++;      Stream_printf(output, "  _$jscoverage['%s'].conditionals[%d] = %d;\n", file_id, if_directive->start_line, if_directive->end_line);
1120      size_t line_start = i;      Stream_write_string(output, "}\n");
1121      while (i < input_length && base[i] != '\r' && base[i] != '\n') {    }
1122        i++;  
1123      }    /* free */
1124      size_t line_end = i;    while (if_directives != NULL) {
1125      if (i < input_length) {      struct IfDirective * if_directive = if_directives;
1126        if (base[i] == '\r') {      if_directives = if_directives->next;
1127          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);  
1128    }    }
1129    
1130    /* copy the original source to the output */    /* copy the original source to the output */
1131    i = 0;    Stream_printf(output, "_$jscoverage['%s'].source = ", file_id);
1132    while (i < input_length) {    jscoverage_write_source(id, characters, num_characters, output);
1133      Stream_write_string(output, "// ");    Stream_printf(output, ";\n");
     size_t line_start = i;  
     while (i < input_length && base[i] != '\r' && base[i] != '\n') {  
       i++;  
     }  
1134    
1135      size_t line_end = i;    Stream_delete(instrumented);
1136      if (i < input_length) {  
1137        if (base[i] == '\r') {    file_id = NULL;
1138          line_end = i;  }
1139    
1140    void jscoverage_write_source(const char * id, const jschar * characters, size_t num_characters, Stream * output) {
1141      Stream_write_string(output, "[");
1142      if (jscoverage_highlight) {
1143        Stream * highlighted_stream = Stream_new(num_characters);
1144        jscoverage_highlight_js(context, id, characters, num_characters, highlighted_stream);
1145        size_t i = 0;
1146        while (i < highlighted_stream->length) {
1147          if (i > 0) {
1148            Stream_write_char(output, ',');
1149          }
1150    
1151          Stream_write_char(output, '"');
1152          bool done = false;
1153          while (! done) {
1154            char c = highlighted_stream->data[i];
1155            switch (c) {
1156            case 0x8:
1157              /* backspace */
1158              Stream_write_string(output, "\\b");
1159              break;
1160            case 0x9:
1161              /* horizontal tab */
1162              Stream_write_string(output, "\\t");
1163              break;
1164            case 0xa:
1165              /* line feed (new line) */
1166              done = true;
1167              break;
1168            case 0xb:
1169              /* vertical tab */
1170              Stream_write_string(output, "\\v");
1171              break;
1172            case 0xc:
1173              /* form feed */
1174              Stream_write_string(output, "\\f");
1175              break;
1176            case 0xd:
1177              /* carriage return */
1178              done = true;
1179              if (i + 1 < highlighted_stream->length && highlighted_stream->data[i + 1] == '\n') {
1180                i++;
1181              }
1182              break;
1183            case '"':
1184              Stream_write_string(output, "\\\"");
1185              break;
1186            case '\\':
1187              Stream_write_string(output, "\\\\");
1188              break;
1189            default:
1190              Stream_write_char(output, c);
1191              break;
1192            }
1193          i++;          i++;
1194          if (i < input_length && base[i] == '\n') {          if (i >= highlighted_stream->length) {
1195            i++;            done = true;
1196          }          }
1197        }        }
1198        else if (base[i] == '\n') {        Stream_write_char(output, '"');
1199          line_end = i;      }
1200        Stream_delete(highlighted_stream);
1201      }
1202      else {
1203        size_t i = 0;
1204        while (i < num_characters) {
1205          if (i > 0) {
1206            Stream_write_char(output, ',');
1207          }
1208    
1209          Stream_write_char(output, '"');
1210          bool done = false;
1211          while (! done) {
1212            jschar c = characters[i];
1213            switch (c) {
1214            case 0x8:
1215              /* backspace */
1216              Stream_write_string(output, "\\b");
1217              break;
1218            case 0x9:
1219              /* horizontal tab */
1220              Stream_write_string(output, "\\t");
1221              break;
1222            case 0xa:
1223              /* line feed (new line) */
1224              done = true;
1225              break;
1226            case 0xb:
1227              /* vertical tab */
1228              Stream_write_string(output, "\\v");
1229              break;
1230            case 0xc:
1231              /* form feed */
1232              Stream_write_string(output, "\\f");
1233              break;
1234            case 0xd:
1235              /* carriage return */
1236              done = true;
1237              if (i + 1 < num_characters && characters[i + 1] == '\n') {
1238                i++;
1239              }
1240              break;
1241            case '"':
1242              Stream_write_string(output, "\\\"");
1243              break;
1244            case '\\':
1245              Stream_write_string(output, "\\\\");
1246              break;
1247            case '&':
1248              Stream_write_string(output, "&amp;");
1249              break;
1250            case '<':
1251              Stream_write_string(output, "&lt;");
1252              break;
1253            case '>':
1254              Stream_write_string(output, "&gt;");
1255              break;
1256            case 0x2028:
1257            case 0x2029:
1258              done = true;
1259              break;
1260            default:
1261              if (32 <= c && c <= 126) {
1262                Stream_write_char(output, c);
1263              }
1264              else {
1265                Stream_printf(output, "&#%d;", c);
1266              }
1267              break;
1268            }
1269          i++;          i++;
1270            if (i >= num_characters) {
1271              done = true;
1272            }
1273        }        }
1274        else {        Stream_write_char(output, '"');
         abort();  
       }  
1275      }      }
   
     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);  
1276    }    }
1277      Stream_write_string(output, "]");
   Stream_delete(instrumented);  
   
   JS_free(context, base);  
   
   file_id = NULL;  
1278  }  }
1279    
1280  void jscoverage_copy_resources(const char * destination_directory) {  void jscoverage_copy_resources(const char * destination_directory) {
# Line 1030  Line 1283 
1283    copy_resource("jscoverage.js", destination_directory);    copy_resource("jscoverage.js", destination_directory);
1284    copy_resource("jscoverage-ie.css", destination_directory);    copy_resource("jscoverage-ie.css", destination_directory);
1285    copy_resource("jscoverage-throbber.gif", destination_directory);    copy_resource("jscoverage-throbber.gif", destination_directory);
1286    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);  
1287  }  }
1288    
1289  /*  /*
# Line 1067  Line 1318 
1318    JS_HashTableDestroy(coverage->coverage_table);    JS_HashTableDestroy(coverage->coverage_table);
1319    struct FileCoverageList * p = coverage->coverage_list;    struct FileCoverageList * p = coverage->coverage_list;
1320    while (p != NULL) {    while (p != NULL) {
1321      free(p->file_coverage->lines);      free(p->file_coverage->coverage_lines);
1322      free(p->file_coverage->source);      if (p->file_coverage->source_lines != NULL) {
1323          for (uint32 i = 0; i < p->file_coverage->num_source_lines; i++) {
1324            free(p->file_coverage->source_lines[i]);
1325          }
1326          free(p->file_coverage->source_lines);
1327        }
1328      free(p->file_coverage->id);      free(p->file_coverage->id);
1329      free(p->file_coverage);      free(p->file_coverage);
1330      struct FileCoverageList * q = p;      struct FileCoverageList * q = p;
# Line 1190  Line 1446 
1446          }          }
1447          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1448            source = element->pn_right;            source = element->pn_right;
1449            if (source->pn_type != TOK_STRING || ! ATOM_IS_STRING(source->pn_atom)) {            if (source->pn_type != TOK_RB) {
1450              return -1;              return -1;
1451            }            }
1452          }          }
# Line 1214  Line 1470 
1470        char * id = xstrdup(id_bytes);        char * id = xstrdup(id_bytes);
1471        file_coverage = xmalloc(sizeof(FileCoverage));        file_coverage = xmalloc(sizeof(FileCoverage));
1472        file_coverage->id = id;        file_coverage->id = id;
1473        file_coverage->num_lines = array->pn_count - 1;        file_coverage->num_coverage_lines = array->pn_count;
1474        file_coverage->lines = xnew(int, array->pn_count);        file_coverage->coverage_lines = xnew(int, array->pn_count);
1475        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)));  
       }  
1476    
1477        /* set coverage for all lines */        /* set coverage for all lines */
1478        uint32 i = 0;        uint32 i = 0;
1479        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++) {
1480          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1481            file_coverage->lines[i] = (int) element->pn_dval;            file_coverage->coverage_lines[i] = (int) element->pn_dval;
1482          }          }
1483          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1484            file_coverage->lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1485          }          }
1486          else {          else {
1487            return -1;            return -1;
# Line 1248  Line 1499 
1499      else {      else {
1500        /* sanity check */        /* sanity check */
1501        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1502        if (file_coverage->num_lines != array->pn_count - 1) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1503          return -2;          return -2;
1504        }        }
1505    
# Line 1256  Line 1507 
1507        uint32 i = 0;        uint32 i = 0;
1508        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++) {
1509          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1510            if (file_coverage->lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1511              return -2;              return -2;
1512            }            }
1513            file_coverage->lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1514          }          }
1515          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1516            if (file_coverage->lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1517              return -2;              return -2;
1518            }            }
1519          }          }
# Line 1271  Line 1522 
1522          }          }
1523        }        }
1524        assert(i == array->pn_count);        assert(i == array->pn_count);
1525        }
1526    
1527        /* if this JSON file has source, use it */      /* if this JSON file has source, use it */
1528        if (file_coverage->source == NULL && source != NULL) {      if (file_coverage->source_lines == NULL && source != NULL) {
1529          file_coverage->source = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(source->pn_atom)));        file_coverage->num_source_lines = source->pn_count;
1530          file_coverage->source_lines = xnew(char *, source->pn_count);
1531          uint32 i = 0;
1532          for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {
1533            if (element->pn_type != TOK_STRING) {
1534              return -1;
1535            }
1536            file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));
1537        }        }
1538          assert(i == source->pn_count);
1539      }      }
1540    }    }
1541    

Legend:
Removed from v.174  
changed lines
  Added in v.246

  ViewVC Help
Powered by ViewVC 1.1.24