/[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 317 by siliconforks, Tue Oct 14 01:28:46 2008 UTC revision 343 by siliconforks, Fri Oct 24 16:15:25 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 <jsexn.h>  #include <jsexn.h>
32  #include <jsfun.h>  #include <jsfun.h>
33  #include <jsinterp.h>  #include <jsinterp.h>
34    #include <jsiter.h>
35  #include <jsparse.h>  #include <jsparse.h>
36  #include <jsregexp.h>  #include <jsregexp.h>
37  #include <jsscope.h>  #include <jsscope.h>
# Line 54  Line 56 
56  static JSRuntime * runtime = NULL;  static JSRuntime * runtime = NULL;
57  static JSContext * context = NULL;  static JSContext * context = NULL;
58  static JSObject * global = NULL;  static JSObject * global = NULL;
59    static JSVersion js_version = JSVERSION_ECMA_3;
60    
61  /*  /*
62  JSParseNode objects store line numbers starting from 1.  JSParseNode objects store line numbers starting from 1.
# Line 63  Line 66 
66  static char * lines = NULL;  static char * lines = NULL;
67  static uint16_t num_lines = 0;  static uint16_t num_lines = 0;
68    
69    void jscoverage_set_js_version(const char * version) {
70      js_version = atoi(version);
71    }
72    
73  void jscoverage_init(void) {  void jscoverage_init(void) {
74    runtime = JS_NewRuntime(8L * 1024L * 1024L);    runtime = JS_NewRuntime(8L * 1024L * 1024L);
75    if (runtime == NULL) {    if (runtime == NULL) {
# Line 74  Line 81 
81      fatal("cannot create context");      fatal("cannot create context");
82    }    }
83    
84      JS_SetVersion(context, js_version);
85    
86    global = JS_NewObject(context, NULL, NULL, NULL);    global = JS_NewObject(context, NULL, NULL, NULL);
87    if (global == NULL) {    if (global == NULL) {
88      fatal("cannot create global object");      fatal("cannot create global object");
# Line 199  Line 208 
208    
209  static const char * get_op(uint8 op) {  static const char * get_op(uint8 op) {
210    switch(op) {    switch(op) {
211      case JSOP_OR:
212        return "||";
213      case JSOP_AND:
214        return "&&";
215    case JSOP_BITOR:    case JSOP_BITOR:
216      return "|";      return "|";
217    case JSOP_BITXOR:    case JSOP_BITXOR:
# Line 209  Line 222 
222      return "==";      return "==";
223    case JSOP_NE:    case JSOP_NE:
224      return "!=";      return "!=";
225    case JSOP_NEW_EQ:    case JSOP_STRICTEQ:
226      return "===";      return "===";
227    case JSOP_NEW_NE:    case JSOP_STRICTNE:
228      return "!==";      return "!==";
229    case JSOP_LT:    case JSOP_LT:
230      return "<";      return "<";
# Line 251  Line 264 
264  };  };
265    
266  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) {
267      assert(node->pn_type == TOK_FUNCTION);
268    assert(node->pn_arity == PN_FUNC);    assert(node->pn_arity == PN_FUNC);
269    assert(ATOM_IS_OBJECT(node->pn_funAtom));    JSObject * object = node->pn_funpob->object;
   JSObject * object = ATOM_TO_OBJECT(node->pn_funAtom);  
270    assert(JS_ObjectIsFunction(context, object));    assert(JS_ObjectIsFunction(context, object));
271    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);    JSFunction * function = (JSFunction *) JS_GetPrivate(context, object);
272    assert(function);    assert(function);
273    assert(object == function->object);    assert(object == &function->object);
274    Stream_printf(f, "%*s", indent, "");    Stream_printf(f, "%*s", indent, "");
275    if (type == FUNCTION_NORMAL) {    if (type == FUNCTION_NORMAL) {
276      Stream_write_string(f, "function");      Stream_write_string(f, "function");
# Line 269  Line 282 
282      print_string_atom(function->atom, f);      print_string_atom(function->atom, f);
283    }    }
284    
285    /* function parameters */    /*
286      function parameters - see JS_DecompileFunction in jsapi.cpp, which calls
287      js_DecompileFunction in jsopcode.cpp
288      */
289    Stream_write_string(f, "(");    Stream_write_string(f, "(");
290    JSAtom ** params = xnew(JSAtom *, function->nargs);    JSArenaPool pool;
291    for (int i = 0; i < function->nargs; i++) {    JS_INIT_ARENA_POOL(&pool, "instrument_function", 256, 1, &context->scriptStackQuota);
292      /* initialize to NULL for sanity check */    jsuword * local_names = NULL;
293      params[i] = NULL;    if (JS_GET_LOCAL_NAME_COUNT(function)) {
294    }      local_names = js_GetLocalNameArray(context, function, &pool);
295    JSScope * scope = OBJ_SCOPE(object);      if (local_names == NULL) {
296    for (JSScopeProperty * scope_property = SCOPE_LAST_PROP(scope); scope_property != NULL; scope_property = scope_property->parent) {        fatal("out of memory");
     if (scope_property->getter != js_GetArgument) {  
       continue;  
297      }      }
     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);  
298    }    }
299    for (int i = 0; i < function->nargs; i++) {    for (int i = 0; i < function->nargs; i++) {
     assert(params[i] != NULL);  
300      if (i > 0) {      if (i > 0) {
301        Stream_write_string(f, ", ");        Stream_write_string(f, ", ");
302      }      }
303      if (ATOM_IS_STRING(params[i])) {      JSAtom * param = JS_LOCAL_NAME_TO_ATOM(local_names[i]);
304        print_string_atom(params[i], f);      print_string_atom(param, f);
     }  
305    }    }
306      JS_FinishArenaPool(&pool);
307    Stream_write_string(f, ") {\n");    Stream_write_string(f, ") {\n");
   free(params);  
308    
309    /* function body */    /* function body */
310    instrument_statement(node->pn_body, f, indent + 2, false);    instrument_statement(node->pn_body, f, indent + 2, false);
# Line 316  Line 324 
324    Stream_write_char(f, ')');    Stream_write_char(f, ')');
325  }  }
326    
327    static void instrument_declarations(JSParseNode * list, Stream * f) {
328      assert(list->pn_arity == PN_LIST);
329      for (JSParseNode * p = list->pn_head; p != NULL; p = p->pn_next) {
330        switch (p->pn_type) {
331        case TOK_NAME:
332          assert(p->pn_arity == PN_NAME);
333          if (p != list->pn_head) {
334            Stream_write_string(f, ", ");
335          }
336          print_string_atom(p->pn_atom, f);
337          if (p->pn_expr != NULL) {
338            Stream_write_string(f, " = ");
339            instrument_expression(p->pn_expr, f);
340          }
341          break;
342        case TOK_ASSIGN:
343        case TOK_RB:
344        case TOK_RC:
345          /* destructuring */
346          instrument_expression(p, f);
347          break;
348        default:
349          abort();
350          break;
351        }
352      }
353    }
354    
355    static void output_for_in(JSParseNode * node, Stream * f) {
356      assert(node->pn_type == TOK_FOR);
357      assert(node->pn_arity == PN_BINARY);
358      Stream_write_string(f, "for ");
359      if (node->pn_iflags & JSITER_FOREACH) {
360        Stream_write_string(f, "each ");
361      }
362      Stream_write_char(f, '(');
363      instrument_expression(node->pn_left, f);
364      Stream_write_char(f, ')');
365    }
366    
367  /*  /*
368  See <Expressions> in jsparse.h.  See <Expressions> in jsparse.h.
369  TOK_FUNCTION is handled as a statement and as an expression.  TOK_FUNCTION is handled as a statement and as an expression.
# Line 374  Line 422 
422      instrument_expression(node->pn_kid3, f);      instrument_expression(node->pn_kid3, f);
423      break;      break;
424    case TOK_OR:    case TOK_OR:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " || ");  
     instrument_expression(node->pn_right, f);  
     break;  
425    case TOK_AND:    case TOK_AND:
     instrument_expression(node->pn_left, f);  
     Stream_write_string(f, " && ");  
     instrument_expression(node->pn_right, f);  
     break;  
426    case TOK_BITOR:    case TOK_BITOR:
427    case TOK_BITXOR:    case TOK_BITXOR:
428    case TOK_BITAND:    case TOK_BITAND:
# Line 495  Line 535 
535      assert(ATOM_IS_STRING(node->pn_atom));      assert(ATOM_IS_STRING(node->pn_atom));
536      {      {
537        JSString * s = ATOM_TO_STRING(node->pn_atom);        JSString * s = ATOM_TO_STRING(node->pn_atom);
538        /* XXX - semantics changed in 1.7 */        bool is_keyword = (js_CheckKeyword(JSSTRING_CHARS(s), JSSTRING_LENGTH(s)) != TOK_EOF);
539        if (! ATOM_KEYWORD(node->pn_atom) && js_IsIdentifier(s)) {        if (! is_keyword && js_IsIdentifier(s)) {
540          Stream_write_char(f, '.');          Stream_write_char(f, '.');
541          print_string_atom(node->pn_atom, f);          print_string_atom(node->pn_atom, f);
542        }        }
# Line 576  Line 616 
616    case TOK_STRING:    case TOK_STRING:
617      print_quoted_string_atom(node->pn_atom, f);      print_quoted_string_atom(node->pn_atom, f);
618      break;      break;
619    case TOK_OBJECT:    case TOK_REGEXP:
620      switch (node->pn_op) {      assert(node->pn_op == JSOP_REGEXP);
621      case JSOP_OBJECT:      {
622        /* I assume this is JSOP_REGEXP */        JSObject * object = node->pn_pob->object;
623        abort();        jsval result;
624        break;        js_regexp_toString(context, object, &result);
625      case JSOP_REGEXP:        print_regex(result, f);
       assert(ATOM_IS_OBJECT(node->pn_atom));  
       {  
         JSObject * object = ATOM_TO_OBJECT(node->pn_atom);  
         jsval result;  
         js_regexp_toString(context, object, 0, NULL, &result);  
         print_regex(result, f);  
       }  
       break;  
     default:  
       abort();  
       break;  
626      }      }
627      break;      break;
628    case TOK_NUMBER:    case TOK_NUMBER:
# Line 639  Line 668 
668      Stream_write_string(f, " in ");      Stream_write_string(f, " in ");
669      instrument_expression(node->pn_right, f);      instrument_expression(node->pn_right, f);
670      break;      break;
671      case TOK_LEXICALSCOPE:
672        assert(node->pn_arity == PN_NAME);
673        assert(node->pn_expr->pn_type == TOK_LET);
674        assert(node->pn_expr->pn_arity == PN_BINARY);
675        Stream_write_string(f, "let(");
676        assert(node->pn_expr->pn_left->pn_type == TOK_LP);
677        assert(node->pn_expr->pn_left->pn_arity == PN_LIST);
678        instrument_declarations(node->pn_expr->pn_left, f);
679        Stream_write_string(f, ") ");
680        instrument_expression(node->pn_expr->pn_right, f);
681        break;
682      case TOK_YIELD:
683        assert(node->pn_arity == PN_UNARY);
684        Stream_write_string(f, "yield ");
685        instrument_expression(node->pn_kid, f);
686        break;
687      case TOK_ARRAYCOMP:
688        assert(node->pn_arity == PN_LIST);
689        {
690          JSParseNode * block_node;
691          switch (node->pn_count) {
692          case 1:
693            block_node = node->pn_head;
694            break;
695          case 2:
696            block_node = node->pn_head->pn_next;
697            break;
698          default:
699            abort();
700            break;
701          }
702          assert(block_node->pn_type == TOK_LEXICALSCOPE);
703          assert(block_node->pn_arity == PN_NAME);
704          JSParseNode * for_node = block_node->pn_expr;
705          assert(for_node->pn_type == TOK_FOR);
706          assert(for_node->pn_arity == PN_BINARY);
707          JSParseNode * push_node;
708          JSParseNode * if_node = NULL;
709          switch (for_node->pn_right->pn_type) {
710          case TOK_ARRAYPUSH:
711            push_node = for_node->pn_right;
712            assert(push_node->pn_arity == PN_UNARY);
713            break;
714          case TOK_IF:
715            if_node = for_node->pn_right;
716            assert(if_node->pn_arity == PN_TERNARY);
717            push_node = if_node->pn_kid2;
718            break;
719          default:
720            abort();
721            break;
722          }
723          Stream_write_char(f, '[');
724          instrument_expression(push_node->pn_kid, f);
725          Stream_write_char(f, ' ');
726          output_for_in(for_node, f);
727          if (if_node) {
728            Stream_write_string(f, " if (");
729            instrument_expression(if_node->pn_kid1, f);
730            Stream_write_char(f, ')');
731          }
732          Stream_write_char(f, ']');
733        }
734        break;
735      case TOK_VAR:
736        assert(node->pn_arity == PN_LIST);
737        Stream_write_string(f, "var ");
738        instrument_declarations(node, f);
739        break;
740      case TOK_LET:
741        assert(node->pn_arity == PN_LIST);
742        Stream_write_string(f, "let ");
743        instrument_declarations(node, f);
744        break;
745    default:    default:
746      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);
747    }    }
748  }  }
749    
 static void instrument_var_statement(JSParseNode * node, Stream * f, int indent) {  
   assert(node->pn_arity == PN_LIST);  
   Stream_printf(f, "%*s", indent, "");  
   Stream_write_string(f, "var ");  
   for (struct JSParseNode * p = node->pn_u.list.head; p != NULL; p = p->pn_next) {  
     assert(p->pn_type == TOK_NAME);  
     assert(p->pn_arity == PN_NAME);  
     if (p != node->pn_head) {  
       Stream_write_string(f, ", ");  
     }  
     print_string_atom(p->pn_atom, f);  
     if (p->pn_expr != NULL) {  
       Stream_write_string(f, " = ");  
       instrument_expression(p->pn_expr, f);  
     }  
   }  
 }  
   
750  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {  static void output_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
751    switch (node->pn_type) {    switch (node->pn_type) {
752    case TOK_FUNCTION:    case TOK_FUNCTION:
# Line 782  Line 867 
867    case TOK_FOR:    case TOK_FOR:
868      assert(node->pn_arity == PN_BINARY);      assert(node->pn_arity == PN_BINARY);
869      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
     Stream_write_string(f, "for (");  
870      switch (node->pn_left->pn_type) {      switch (node->pn_left->pn_type) {
871      case TOK_IN:      case TOK_IN:
872        /* for/in */        /* for/in */
873        assert(node->pn_left->pn_arity == PN_BINARY);        assert(node->pn_left->pn_arity == PN_BINARY);
874        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);  
875        break;        break;
876      case TOK_RESERVED:      case TOK_RESERVED:
877        /* for (;;) */        /* for (;;) */
878        assert(node->pn_left->pn_arity == PN_TERNARY);        assert(node->pn_left->pn_arity == PN_TERNARY);
879          Stream_write_string(f, "for (");
880        if (node->pn_left->pn_kid1) {        if (node->pn_left->pn_kid1) {
881          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);  
         }  
882        }        }
883        Stream_write_string(f, ";");        Stream_write_string(f, ";");
884        if (node->pn_left->pn_kid2) {        if (node->pn_left->pn_kid2) {
# Line 829  Line 890 
890          Stream_write_char(f, ' ');          Stream_write_char(f, ' ');
891          instrument_expression(node->pn_left->pn_kid3, f);          instrument_expression(node->pn_left->pn_kid3, f);
892        }        }
893          Stream_write_char(f, ')');
894        break;        break;
895      default:      default:
896        abort();        abort();
897        break;        break;
898      }      }
899      Stream_write_string(f, ") {\n");      Stream_write_string(f, " {\n");
900      instrument_statement(node->pn_right, f, indent + 2, false);      instrument_statement(node->pn_right, f, indent + 2, false);
901      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
902      break;      break;
# Line 851  Line 913 
913      instrument_statement(node->pn_kid1, f, indent + 2, false);      instrument_statement(node->pn_kid1, f, indent + 2, false);
914      Stream_printf(f, "%*s", indent, "");      Stream_printf(f, "%*s", indent, "");
915      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
916      {      if (node->pn_kid2) {
917        for (JSParseNode * catch = node->pn_kid2; catch != NULL; catch = catch->pn_kid2) {        assert(node->pn_kid2->pn_type == TOK_RESERVED);
918          for (JSParseNode * scope = node->pn_kid2->pn_head; scope != NULL; scope = scope->pn_next) {
919            assert(scope->pn_type == TOK_LEXICALSCOPE);
920            JSParseNode * catch = scope->pn_expr;
921          assert(catch->pn_type == TOK_CATCH);          assert(catch->pn_type == TOK_CATCH);
922          Stream_printf(f, "%*s", indent, "");          Stream_printf(f, "%*s", indent, "");
923          Stream_write_string(f, "catch (");          Stream_write_string(f, "catch (");
924            /* this may not be a name - destructuring assignment */
925            /*
926          assert(catch->pn_kid1->pn_arity == PN_NAME);          assert(catch->pn_kid1->pn_arity == PN_NAME);
927          print_string_atom(catch->pn_kid1->pn_atom, f);          print_string_atom(catch->pn_kid1->pn_atom, f);
928          if (catch->pn_kid1->pn_expr) {          */
929            instrument_expression(catch->pn_kid1, f);
930            if (catch->pn_kid2) {
931            Stream_write_string(f, " if ");            Stream_write_string(f, " if ");
932            instrument_expression(catch->pn_kid1->pn_expr, f);            instrument_expression(catch->pn_kid2, f);
933          }          }
934          Stream_write_string(f, ") {\n");          Stream_write_string(f, ") {\n");
935          instrument_statement(catch->pn_kid3, f, indent + 2, false);          instrument_statement(catch->pn_kid3, f, indent + 2, false);
# Line 902  Line 971 
971      Stream_write_string(f, "}\n");      Stream_write_string(f, "}\n");
972      break;      break;
973    case TOK_VAR:    case TOK_VAR:
974      instrument_var_statement(node, f, indent);      Stream_printf(f, "%*s", indent, "");
975        instrument_expression(node, f);
976      Stream_write_string(f, ";\n");      Stream_write_string(f, ";\n");
977      break;      break;
978    case TOK_RETURN:    case TOK_RETURN:
# Line 937  Line 1007 
1007      */      */
1008      output_statement(node->pn_expr, f, indent, false);      output_statement(node->pn_expr, f, indent, false);
1009      break;      break;
1010      case TOK_LEXICALSCOPE:
1011        /* let statement */
1012        assert(node->pn_arity == PN_NAME);
1013        switch (node->pn_expr->pn_type) {
1014        case TOK_LET:
1015          /* let statement */
1016          assert(node->pn_expr->pn_arity == PN_BINARY);
1017          instrument_statement(node->pn_expr, f, indent, false);
1018          break;
1019        case TOK_LC:
1020          /* block */
1021          Stream_printf(f, "%*s", indent, "");
1022          Stream_write_string(f, "{\n");
1023          instrument_statement(node->pn_expr, f, indent + 2, false);
1024          Stream_printf(f, "%*s", indent, "");
1025          Stream_write_string(f, "}\n");
1026          break;
1027        case TOK_FOR:
1028          instrument_statement(node->pn_expr, f, indent, false);
1029          break;
1030        default:
1031          abort();
1032          break;
1033        }
1034        break;
1035      case TOK_LET:
1036        switch (node->pn_arity) {
1037        case PN_BINARY:
1038          /* let statement */
1039          Stream_printf(f, "%*s", indent, "");
1040          Stream_write_string(f, "let (");
1041          assert(node->pn_left->pn_type == TOK_LP);
1042          assert(node->pn_left->pn_arity == PN_LIST);
1043          instrument_declarations(node->pn_left, f);
1044          Stream_write_string(f, ") {\n");
1045          instrument_statement(node->pn_right, f, indent + 2, false);
1046          Stream_printf(f, "%*s", indent, "");
1047          Stream_write_string(f, "}\n");
1048          break;
1049        case PN_LIST:
1050          /* let definition */
1051          Stream_printf(f, "%*s", indent, "");
1052          instrument_expression(node, f);
1053          Stream_write_string(f, ";\n");
1054          break;
1055        default:
1056          abort();
1057          break;
1058        }
1059        break;
1060    default:    default:
1061      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);
1062    }    }
# Line 948  Line 1068 
1068  TOK_EXPORT, TOK_IMPORT are not handled.  TOK_EXPORT, TOK_IMPORT are not handled.
1069  */  */
1070  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {  static void instrument_statement(JSParseNode * node, Stream * f, int indent, bool is_jscoverage_if) {
1071    if (node->pn_type != TOK_LC) {    if (node->pn_type != TOK_LC && node->pn_type != TOK_LEXICALSCOPE) {
1072      uint16_t line = node->pn_pos.begin.lineno;      uint16_t line = node->pn_pos.begin.lineno;
1073      if (line > num_lines) {      if (line > num_lines) {
1074        fatal("%s: script contains more than 65,535 lines", file_id);        fatal("%s: script contains more than 65,535 lines", file_id);
# Line 1005  Line 1125 
1125  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) {
1126    file_id = id;    file_id = id;
1127    
1128    /* scan the javascript */    /* parse the javascript */
1129    JSTokenStream * token_stream = js_NewTokenStream(context, characters, num_characters, NULL, 1, NULL);    JSParseContext parse_context;
1130    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, characters, num_characters, NULL, NULL, 1)) {
1131      fatal("cannot create token stream from file: %s", file_id);      fatal("cannot create token stream from file: %s", file_id);
1132    }    }
   
   /* parse the javascript */  
1133    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);    JSErrorReporter old_error_reporter = JS_SetErrorReporter(context, error_reporter);
1134    JSParseNode * node = js_ParseTokenStream(context, global, token_stream);    JSParseNode * node = js_ParseScript(context, global, &parse_context);
1135    if (node == NULL) {    if (node == NULL) {
1136      js_ReportUncaughtException(context);      js_ReportUncaughtException(context);
1137      fatal("parse error in file: %s", file_id);      fatal("parse error in file: %s", file_id);
# Line 1100  Line 1218 
1218    
1219    Stream * instrumented = Stream_new(0);    Stream * instrumented = Stream_new(0);
1220    instrument_statement(node, instrumented, 0, false);    instrument_statement(node, instrumented, 0, false);
1221      js_FinishParseContext(context, &parse_context);
1222    
1223    /* write line number info to the output */    /* write line number info to the output */
1224    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 1372  Line 1491 
1491  }  }
1492    
1493  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) {
1494      int result = 0;
1495    
1496    jschar * base = js_InflateString(context, (char *) json, &length);    jschar * base = js_InflateString(context, (char *) json, &length);
1497    if (base == NULL) {    if (base == NULL) {
1498      fatal("out of memory");      fatal("out of memory");
# Line 1384  Line 1505 
1505    
1506    JS_free(context, base);    JS_free(context, base);
1507    
1508    JSTokenStream * token_stream = js_NewTokenStream(context, parenthesized_json, length + 2, NULL, 1, NULL);    JSParseContext parse_context;
1509    if (token_stream == NULL) {    if (! js_InitParseContext(context, &parse_context, NULL, NULL, parenthesized_json, length + 2, NULL, NULL, 1)) {
1510      fatal("cannot create token stream");      free(parenthesized_json);
1511        return -1;
1512    }    }
1513      JSParseNode * root = js_ParseScript(context, global, &parse_context);
   JSParseNode * root = js_ParseTokenStream(context, global, token_stream);  
1514    free(parenthesized_json);    free(parenthesized_json);
1515    if (root == NULL) {    if (root == NULL) {
1516      return -1;      result = -1;
1517        goto done;
1518    }    }
1519    
1520    /* root node must be TOK_LC */    /* root node must be TOK_LC */
1521    if (root->pn_type != TOK_LC) {    if (root->pn_type != TOK_LC) {
1522      return -1;      result = -1;
1523        goto done;
1524    }    }
1525    JSParseNode * semi = root->pn_u.list.head;    JSParseNode * semi = root->pn_u.list.head;
1526    
1527    /* 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 */
1528    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {    if (semi->pn_type != TOK_SEMI || semi->pn_next != NULL) {
1529      return -1;      result = -1;
1530        goto done;
1531    }    }
1532    JSParseNode * parenthesized = semi->pn_kid;    JSParseNode * parenthesized = semi->pn_kid;
1533    
1534    /* this must be a parenthesized expression */    /* this must be a parenthesized expression */
1535    if (parenthesized->pn_type != TOK_RP) {    if (parenthesized->pn_type != TOK_RP) {
1536      return -1;      result = -1;
1537        goto done;
1538    }    }
1539    JSParseNode * object = parenthesized->pn_kid;    JSParseNode * object = parenthesized->pn_kid;
1540    
1541    /* this must be an object literal */    /* this must be an object literal */
1542    if (object->pn_type != TOK_RC) {    if (object->pn_type != TOK_RC) {
1543      return -1;      result = -1;
1544        goto done;
1545    }    }
1546    
1547    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {    for (JSParseNode * p = object->pn_head; p != NULL; p = p->pn_next) {
1548      /* every element of this list must be TOK_COLON */      /* every element of this list must be TOK_COLON */
1549      if (p->pn_type != TOK_COLON) {      if (p->pn_type != TOK_COLON) {
1550        return -1;        result = -1;
1551          goto done;
1552      }      }
1553    
1554      /* the key must be a string representing the file */      /* the key must be a string representing the file */
1555      JSParseNode * key = p->pn_left;      JSParseNode * key = p->pn_left;
1556      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {      if (key->pn_type != TOK_STRING || ! ATOM_IS_STRING(key->pn_atom)) {
1557        return -1;        result = -1;
1558          goto done;
1559      }      }
1560      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));      char * id_bytes = JS_GetStringBytes(ATOM_TO_STRING(key->pn_atom));
1561    
1562      /* the value must be an object literal OR an array */      /* the value must be an object literal OR an array */
1563      JSParseNode * value = p->pn_right;      JSParseNode * value = p->pn_right;
1564      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {      if (! (value->pn_type == TOK_RC || value->pn_type == TOK_RB)) {
1565        return -1;        result = -1;
1566          goto done;
1567      }      }
1568    
1569      JSParseNode * array = NULL;      JSParseNode * array = NULL;
# Line 1446  Line 1575 
1575      else if (value->pn_type == TOK_RC) {      else if (value->pn_type == TOK_RC) {
1576        /* an object literal */        /* an object literal */
1577        if (value->pn_count != 2) {        if (value->pn_count != 2) {
1578          return -1;          result = -1;
1579            goto done;
1580        }        }
1581        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {        for (JSParseNode * element = value->pn_head; element != NULL; element = element->pn_next) {
1582          if (element->pn_type != TOK_COLON) {          if (element->pn_type != TOK_COLON) {
1583            return -1;            result = -1;
1584              goto done;
1585          }          }
1586          JSParseNode * left = element->pn_left;          JSParseNode * left = element->pn_left;
1587          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {          if (left->pn_type != TOK_STRING || ! ATOM_IS_STRING(left->pn_atom)) {
1588            return -1;            result = -1;
1589              goto done;
1590          }          }
1591          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));          const char * s = JS_GetStringBytes(ATOM_TO_STRING(left->pn_atom));
1592          if (strcmp(s, "coverage") == 0) {          if (strcmp(s, "coverage") == 0) {
1593            array = element->pn_right;            array = element->pn_right;
1594            if (array->pn_type != TOK_RB) {            if (array->pn_type != TOK_RB) {
1595              return -1;              result = -1;
1596                goto done;
1597            }            }
1598          }          }
1599          else if (strcmp(s, "source") == 0) {          else if (strcmp(s, "source") == 0) {
1600            source = element->pn_right;            source = element->pn_right;
1601            if (source->pn_type != TOK_RB) {            if (source->pn_type != TOK_RB) {
1602              return -1;              result = -1;
1603                goto done;
1604            }            }
1605          }          }
1606          else {          else {
1607            return -1;            result = -1;
1608              goto done;
1609          }          }
1610        }        }
1611      }      }
1612      else {      else {
1613        return -1;        result = -1;
1614          goto done;
1615      }      }
1616    
1617      if (array == NULL) {      if (array == NULL) {
1618        return -1;        result = -1;
1619          goto done;
1620      }      }
1621    
1622      /* look up the file in the coverage table */      /* look up the file in the coverage table */
# Line 1503  Line 1640 
1640            file_coverage->coverage_lines[i] = -1;            file_coverage->coverage_lines[i] = -1;
1641          }          }
1642          else {          else {
1643            return -1;            result = -1;
1644              goto done;
1645          }          }
1646        }        }
1647        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1519  Line 1657 
1657        /* sanity check */        /* sanity check */
1658        assert(strcmp(file_coverage->id, id_bytes) == 0);        assert(strcmp(file_coverage->id, id_bytes) == 0);
1659        if (file_coverage->num_coverage_lines != array->pn_count) {        if (file_coverage->num_coverage_lines != array->pn_count) {
1660          return -2;          result = -2;
1661            goto done;
1662        }        }
1663    
1664        /* merge the coverage */        /* merge the coverage */
# Line 1527  Line 1666 
1666        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++) {
1667          if (element->pn_type == TOK_NUMBER) {          if (element->pn_type == TOK_NUMBER) {
1668            if (file_coverage->coverage_lines[i] == -1) {            if (file_coverage->coverage_lines[i] == -1) {
1669              return -2;              result = -2;
1670                goto done;
1671            }            }
1672            file_coverage->coverage_lines[i] += (int) element->pn_dval;            file_coverage->coverage_lines[i] += (int) element->pn_dval;
1673          }          }
1674          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {          else if (element->pn_type == TOK_PRIMARY && element->pn_op == JSOP_NULL) {
1675            if (file_coverage->coverage_lines[i] != -1) {            if (file_coverage->coverage_lines[i] != -1) {
1676              return -2;              result = -2;
1677                goto done;
1678            }            }
1679          }          }
1680          else {          else {
1681            return -1;            result = -1;
1682              goto done;
1683          }          }
1684        }        }
1685        assert(i == array->pn_count);        assert(i == array->pn_count);
# Line 1550  Line 1692 
1692        uint32 i = 0;        uint32 i = 0;
1693        for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {        for (JSParseNode * element = source->pn_head; element != NULL; element = element->pn_next, i++) {
1694          if (element->pn_type != TOK_STRING) {          if (element->pn_type != TOK_STRING) {
1695            return -1;            result = -1;
1696              goto done;
1697          }          }
1698          file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));          file_coverage->source_lines[i] = xstrdup(JS_GetStringBytes(ATOM_TO_STRING(element->pn_atom)));
1699        }        }
# Line 1558  Line 1701 
1701      }      }
1702    }    }
1703    
1704    return 0;  done:
1705      js_FinishParseContext(context, &parse_context);
1706      return result;
1707  }  }

Legend:
Removed from v.317  
changed lines
  Added in v.343

  ViewVC Help
Powered by ViewVC 1.1.24