1.1 --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VarType.java	Tue Feb 26 16:54:16 2013 +0100
     1.2 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VarType.java	Mon Mar 04 19:20:40 2013 +0100
     1.3 @@ -17,8 +17,6 @@
     1.4   */
     1.5  package org.apidesign.vm4brwsr;
     1.6  
     1.7 -import org.apidesign.javap.RuntimeConstants;
     1.8 -
     1.9  final class VarType {
    1.10      public static final int INTEGER = 0;
    1.11      public static final int LONG = 1;
    1.12 @@ -37,21 +35,21 @@
    1.13  
    1.14      public static int fromStackMapType(final int smType) {
    1.15          switch (smType & 0xff) {
    1.16 -            case RuntimeConstants.ITEM_Integer:
    1.17 +            case ByteCodeParser.ITEM_Integer:
    1.18                  return VarType.INTEGER;
    1.19 -            case RuntimeConstants.ITEM_Float:
    1.20 +            case ByteCodeParser.ITEM_Float:
    1.21                  return VarType.FLOAT;
    1.22 -            case RuntimeConstants.ITEM_Double:
    1.23 +            case ByteCodeParser.ITEM_Double:
    1.24                  return VarType.DOUBLE;
    1.25 -            case RuntimeConstants.ITEM_Long:
    1.26 +            case ByteCodeParser.ITEM_Long:
    1.27                  return VarType.LONG;
    1.28 -            case RuntimeConstants.ITEM_Null:
    1.29 -            case RuntimeConstants.ITEM_InitObject:
    1.30 -            case RuntimeConstants.ITEM_Object:
    1.31 -            case RuntimeConstants.ITEM_NewObject:
    1.32 +            case ByteCodeParser.ITEM_Null:
    1.33 +            case ByteCodeParser.ITEM_InitObject:
    1.34 +            case ByteCodeParser.ITEM_Object:
    1.35 +            case ByteCodeParser.ITEM_NewObject:
    1.36                  return VarType.REFERENCE;
    1.37  
    1.38 -            case RuntimeConstants.ITEM_Bogus:
    1.39 +            case ByteCodeParser.ITEM_Bogus:
    1.40                  /* unclear how to handle for now */
    1.41              default:
    1.42                  throw new IllegalStateException("Unhandled stack map type");
    1.43 @@ -60,25 +58,25 @@
    1.44  
    1.45      public static int fromConstantType(final byte constantTag) {
    1.46          switch (constantTag) {
    1.47 -            case RuntimeConstants.CONSTANT_INTEGER:
    1.48 +            case ByteCodeParser.CONSTANT_INTEGER:
    1.49                  return VarType.INTEGER;
    1.50 -            case RuntimeConstants.CONSTANT_FLOAT:
    1.51 +            case ByteCodeParser.CONSTANT_FLOAT:
    1.52                  return VarType.FLOAT;
    1.53 -            case RuntimeConstants.CONSTANT_LONG:
    1.54 +            case ByteCodeParser.CONSTANT_LONG:
    1.55                  return VarType.LONG;
    1.56 -            case RuntimeConstants.CONSTANT_DOUBLE:
    1.57 +            case ByteCodeParser.CONSTANT_DOUBLE:
    1.58                  return VarType.DOUBLE;
    1.59  
    1.60 -            case RuntimeConstants.CONSTANT_CLASS:
    1.61 -            case RuntimeConstants.CONSTANT_UTF8:
    1.62 -            case RuntimeConstants.CONSTANT_UNICODE:
    1.63 -            case RuntimeConstants.CONSTANT_STRING:
    1.64 +            case ByteCodeParser.CONSTANT_CLASS:
    1.65 +            case ByteCodeParser.CONSTANT_UTF8:
    1.66 +            case ByteCodeParser.CONSTANT_UNICODE:
    1.67 +            case ByteCodeParser.CONSTANT_STRING:
    1.68                  return VarType.REFERENCE;
    1.69  
    1.70 -            case RuntimeConstants.CONSTANT_FIELD:
    1.71 -            case RuntimeConstants.CONSTANT_METHOD:
    1.72 -            case RuntimeConstants.CONSTANT_INTERFACEMETHOD:
    1.73 -            case RuntimeConstants.CONSTANT_NAMEANDTYPE:
    1.74 +            case ByteCodeParser.CONSTANT_FIELD:
    1.75 +            case ByteCodeParser.CONSTANT_METHOD:
    1.76 +            case ByteCodeParser.CONSTANT_INTERFACEMETHOD:
    1.77 +            case ByteCodeParser.CONSTANT_NAMEANDTYPE:
    1.78                  /* unclear how to handle for now */
    1.79              default:
    1.80                  throw new IllegalStateException("Unhandled constant tag");