catchup on some pending updates

clang-output/lua_hdr.h

@@ -95,16 +95,18 @@ enum ravitype_t {
 
 struct Upvaldesc {
   struct TString *name;  /* upvalue name (for debug information) */
-  enum ravitype_t type; /* RAVI type of upvalue */
+  struct TString *usertype; /* RAVI extension: name of user type */
+  lu_byte ravi_type; /* RAVI type of upvalue */
   lu_byte instack; /* whether it is in stack */
   lu_byte idx; /* index of upvalue (in stack or in outer function's list) */
 };
 
 struct LocVar {
   struct TString *varname;
+  struct TString *usertype; /* RAVI extension: name of user type */
   int startpc; /* first point where variable is active */
   int endpc;   /* first point where variable is dead */
-  enum ravitype_t ravi_type; /* RAVI type of the variable - RAVI_TANY if unknown */
+  lu_byte ravi_type; /* RAVI type of the variable - RAVI_TANY if unknown */
 };
 
 struct RaviJITProto {

src/ravi_jitshared.c

@@ -263,7 +263,7 @@ static const char Lua_header[] = ""
 "	  io->value_ = iu->user_; settt_(io, iu->ttuv_); \\\n"
 "	  checkliveness(L,io); }\n"
 "typedef enum {\n"
-"	RAVI_TANY = -1,\n"
+"	RAVI_TANY = 0,\n"
 "	RAVI_TNUMINT = 1,\n"
 "	RAVI_TNUMFLT,\n"
 "	RAVI_TARRAYINT,\n"
@@ -277,15 +277,17 @@ static const char Lua_header[] = ""
 "} ravitype_t;\n"
 "typedef struct Upvaldesc {\n"
 "	TString *name;\n"
-"	ravitype_t type;\n"
+"	TString *usertype;\n"
+"	lu_byte ravi_type;\n"
 "	lu_byte instack;\n"
 "	lu_byte idx;\n"
 "} Upvaldesc;\n"
 "typedef struct LocVar {\n"
 "	TString *varname;\n"
+"	TString *usertype;\n"
 "	int startpc;\n"
 "	int endpc;\n"
-"	ravitype_t ravi_type;\n"
+"	lu_byte ravi_type;\n"
 "} LocVar;\n"
 "typedef enum {\n"
 "	RAVI_JIT_NOT_COMPILED = 0,\n"