yarv_generator 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 649fb103d7d383a977b6105e1b029826e2aff1ee
-  data.tar.gz: 2486274e4a546f01642e4cce156b65cb423fab2b
+  metadata.gz: b3d4a956c5122dad94eb6a5cd46bf134e2603217
+  data.tar.gz: 9ac66e7f566b0f619ab17ab03cae536ba0d5d331
 SHA512:
-  metadata.gz: 80289c8d0b97954f8db67be5521cf15faf6f36ded4e1b226d66dd6bce2b745efdd62cc50057c69a71219829a2fe2c0048b2584dc20a9cc3102e5f4d2bd9214f1
-  data.tar.gz: d0dc203221b3611c8cb183f4de73ed356535bf4ddc6ec37e5886d31e0f2436ecc1b28137b56141fdc4de188c099cc77bd2236bfd9481e524e88888b7e310c62d
+  metadata.gz: 90d07824dba96aaa7e12a26e27a29fc656fdfe4de7644cd32d44cbf3cd12bce0ec0278115a36f5a96b854050d7992564b086064cbcaf23407cf79c43b3104746
+  data.tar.gz: 838eaf818a0b2cddaaad3844970c25d19665f0da9478b688c594f23f529082ed8765086d1b2cf923c4e57bd3e0151f9c234a5f17dbc6dd8731387dd3617e1cb1

data/ext/yarv_generator/yarv_generator.c

@@ -39,16 +39,20 @@ yarv_builder_build_yarv_tree(rb_iseq_t *iseq)
   VALUE type = yarv_builder_insn_type(iseq);
   rb_funcall(iseq_object, rb_intern("type="), 1, type);
 
-  VALUE local_table = yarv_builder_local_table(iseq);
+  VALUE local_table;
+  local_table = yarv_builder_local_table(iseq);
   rb_funcall(iseq_object, rb_intern("local_table="), 1, local_table);
 
-  VALUE params = yarv_builder_params(iseq, labels_table);
+  VALUE params;
+  params = yarv_builder_params(iseq, labels_table);
   rb_funcall(iseq_object, rb_intern("params="), 1, params);
 
-  VALUE catch_table = yarv_builder_catch_table(iseq, labels_table);
+  VALUE catch_table;
+  catch_table = yarv_builder_catch_table(iseq, labels_table);
   rb_funcall(iseq_object, rb_intern("catch_table="), 1, catch_table);
 
-  VALUE instructions = yarv_builder_instructions(iseq, labels_table);
+  VALUE instructions;
+  instructions = yarv_builder_instructions(iseq, labels_table);
   rb_funcall(iseq_object, rb_intern("instructions="), 1, instructions);
 
   rb_funcall(iseq_object, rb_intern("label="), 1, iseq->body->location.label);
@@ -103,8 +107,10 @@ yarv_builder_insn_type(rb_iseq_t *iseq)
 VALUE
 yarv_builder_local_table(rb_iseq_t *iseq)
 {
-  VALUE local_table = rb_ary_new();
-  for (unsigned int i = 0; i < iseq->body->local_table_size; i++) {
+  VALUE local_table;
+  local_table = rb_ary_new();
+  unsigned int i;
+  for (i = 0; i < iseq->body->local_table_size; i++) {
     ID var_id = iseq->body->local_table[i];
     if (var_id) {
       if (rb_id2str(var_id)) {
@@ -130,14 +136,19 @@ yarv_builder_instructions(rb_iseq_t *iseq, st_table *labels_table)
 
   VALUE *iseq_original = rb_iseq_original_iseq((rb_iseq_t *)iseq);
 
-  for (VALUE *seq = iseq_original; seq < iseq_original + iseq->body->iseq_size; ) {
-    VALUE insn = *seq++;
-    int len = insn_len_info[(int)insn];
-    VALUE operands = rb_ary_new2(len);
+  VALUE *seq;
+  VALUE insn;
+  VALUE *nseq;
+  int len;
+  int j;
 
-    VALUE *nseq = seq + len;
+  for (seq = iseq_original; seq < iseq_original + iseq->body->iseq_size; ) {
+    insn = *seq++;
+    len = insn_len_info[(int)insn];
+    VALUE operands = rb_ary_new2(len);
+    nseq = seq + len;
 
-    for (int j = 0; j < len - 1; j++, seq++) {
+    for (j = 0; j < len - 1; j++, seq++) {
       VALUE operand = Qnil;
       switch (insn_op_type(insn, j)) {
         case TS_LINDEX:
@@ -198,7 +209,8 @@ yarv_builder_instructions(rb_iseq_t *iseq, st_table *labels_table)
             operand = rb_ary_new();
             rb_hash_foreach(hash, cdhash_each, operand);
 
-            for (int i=0; i<RARRAY_LEN(operand); i+=2) {
+            int i;
+            for (i=0; i<RARRAY_LEN(operand); i+=2) {
               VALUE pos = FIX2INT(rb_ary_entry(operand, i+1));
               unsigned long idx = nseq - iseq_original + pos;
 
@@ -217,8 +229,9 @@ yarv_builder_instructions(rb_iseq_t *iseq, st_table *labels_table)
     rb_ary_push(instructions, insn_object);
   }
 
-  for (unsigned int i = 0, pos = 0, line_pos = 0; i < RARRAY_LEN(instructions); i++) {
-    VALUE instruction = RARRAY_AREF(instructions, i);
+  unsigned int ip, pos, line_pos;
+  for (ip = 0, pos = 0, line_pos = 0; ip < RARRAY_LEN(instructions); ip++) {
+    VALUE instruction = RARRAY_AREF(instructions, ip);
 
     st_data_t label;
     if (st_lookup(labels_table, pos, &label)) {
@@ -242,9 +255,10 @@ VALUE yarv_builder_params(rb_iseq_t *iseq, st_table *labels_table) {
     rb_hash_aset(params, ID2SYM(rb_intern("lead_num")), INT2FIX(iseq->body->param.lead_num));
   }
 
+  int i;
   if (iseq->body->param.flags.has_opt) {
     VALUE opts = rb_ary_new2(iseq->body->param.opt_num);
-    for (int i = 0; i < iseq->body->param.opt_num; i++) {
+    for (i = 0; i < iseq->body->param.opt_num; i++) {
       VALUE value = iseq->body->param.opt_table[i];
       register_label(labels_table, value);
       rb_ary_push(opts, value);
@@ -264,7 +278,7 @@ VALUE yarv_builder_params(rb_iseq_t *iseq, st_table *labels_table) {
   if (iseq->body->param.flags.has_kw) {
     VALUE keywords = rb_ary_new();
     int j = 0;
-    for (int i = 0; i < iseq->body->param.keyword->num; i++) {
+    for (i = 0; i < iseq->body->param.keyword->num; i++) {
       if (i < iseq->body->param.keyword->required_num) {
         // Require params
         rb_ary_push(keywords, ID2SYM(iseq->body->param.keyword->table[i]));
@@ -295,8 +309,9 @@ VALUE yarv_builder_catch_table(rb_iseq_t *iseq, st_table *labels_table) {
   VALUE catch_table = rb_ary_new();
   VALUE rb_cYarvCatchEntry = rb_path2class("YarvGenerator::CatchEntry");
 
+  unsigned int i;
   if (iseq->body->catch_table) {
-    for (int i = 0; i < iseq->body->catch_table->size; i++) {
+    for (i = 0; i < iseq->body->catch_table->size; i++) {
       VALUE catch_entry = rb_funcall(rb_cYarvCatchEntry, rb_intern("new"), 0);
 
       const struct iseq_catch_table_entry *entry = &iseq->body->catch_table->entries[i];
@@ -350,7 +365,8 @@ yarv_builder_call_info(VALUE *seq)
     struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci;
     VALUE kw = rb_ary_new2(ci_kw->kw_arg->keyword_len);
     int len = ci->orig_argc - ci_kw->kw_arg->keyword_len;
-    for (int i = 0; i < len; i++) {
+    int i;
+    for (i = 0; i < len; i++) {
       rb_ary_push(kw, ci_kw->kw_arg->keywords[i]);
     }
     rb_funcall(ci_object, rb_intern("kw_arg="), 1, kw);

data/lib/yarv_generator/version.rb

@@ -1,3 +1,3 @@
 class YarvGenerator
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarv_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Minh Nguyen