summaryrefslogtreecommitdiff
path: root/iseq.h
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-21 20:58:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-21 20:58:26 +0000
commitfe1ce93f52827f59c069247a6e5998c3a5f907b8 (patch)
treedc68c377c5347844138e9aa22610ee815677a7a4 /iseq.h
parent2c34b66e24f1992e2ceca0b8a8f3d710f05f21ae (diff)
* compile.c, cont.c, gc.c, insns.def, iseq.c, iseq.h, process.c,
thread.c, vm.c, vm_core.h, vm_dump.c, vm_eval.c, vm_insnhelper.c, vm_method.c, template/insns_info.inc.tmpl, tool/instruction.rb: fixed types. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'iseq.h')
-rw-r--r--iseq.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/iseq.h b/iseq.h
index 981b1fca00..27271488c7 100644
--- a/iseq.h
+++ b/iseq.h
@@ -32,12 +32,12 @@ struct st_table *ruby_insn_make_insn_table(void);
#define ISEQ_TYPE_MAIN INT2FIX(8)
#define ISEQ_TYPE_DEFINED_GUARD INT2FIX(9)
-#define CATCH_TYPE_RESCUE INT2FIX(1)
-#define CATCH_TYPE_ENSURE INT2FIX(2)
-#define CATCH_TYPE_RETRY INT2FIX(3)
-#define CATCH_TYPE_BREAK INT2FIX(4)
-#define CATCH_TYPE_REDO INT2FIX(5)
-#define CATCH_TYPE_NEXT INT2FIX(6)
+#define CATCH_TYPE_RESCUE ((int)INT2FIX(1))
+#define CATCH_TYPE_ENSURE ((int)INT2FIX(2))
+#define CATCH_TYPE_RETRY ((int)INT2FIX(3))
+#define CATCH_TYPE_BREAK ((int)INT2FIX(4))
+#define CATCH_TYPE_REDO ((int)INT2FIX(5))
+#define CATCH_TYPE_NEXT ((int)INT2FIX(6))
struct iseq_insn_info_entry {
unsigned short position;
@@ -74,10 +74,10 @@ struct iseq_compile_data {
struct iseq_label_data *end_label;
struct iseq_label_data *redo_label;
VALUE current_block;
- VALUE loopval_popped; /* used by NODE_BREAK */
VALUE ensure_node;
VALUE for_iseq;
struct iseq_compile_data_ensure_node_stack *ensure_node_stack;
+ int loopval_popped; /* used by NODE_BREAK */
int cached_const;
struct iseq_compile_data_storage *storage_head;
struct iseq_compile_data_storage *storage_current;