mv variable.h to mruby/variable.h

src/class.c

@@ -11,7 +11,7 @@
 #include "mruby/proc.h"
 #include "mruby/string.h"
 #include "mruby/numeric.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "mruby/array.h"
 #include "error.h"
 

src/encoding.c

@@ -28,7 +28,7 @@
 #include "mruby/numeric.h"
 #include "mruby/string.h"
 #include "mruby/array.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "mruby/hash.h"
 
 #define pprintf printf

src/error.c

@@ -14,7 +14,7 @@
 #include "irep.h"
 #include "mruby/proc.h"
 #include "mruby/numeric.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "mruby/string.h"
 #include "eval_intern.h"
 #include "mruby/class.h"

src/kernel.c

@@ -16,7 +16,7 @@
 #include "mruby/hash.h"
 #include "mruby/class.h"
 #include "mruby/struct.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "ritehash.h"
 #include "error.h"
 #include "method.h"

src/numeric.c

@@ -10,7 +10,7 @@
 #include "mruby/array.h"
 #include <string.h>
 #include "mruby/class.h"
-#include "variable.h"
+#include "mruby/variable.h"
 
 #include <ctype.h>
 #include <math.h>

src/range.c

@@ -7,7 +7,7 @@
 #include "mruby.h"
 #include "mruby/class.h"
 #include "mruby/range.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "error.h"
 #include "mruby/numeric.h"
 #include "mruby/string.h"

src/re.c

@@ -16,7 +16,7 @@
 #include "regint.h"
 #include "mruby/class.h"
 #include "mruby/hash.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "error.h"
 #ifdef INCLUDE_REGEXP
 

src/string.c

@@ -14,10 +14,9 @@
 #include <ctype.h>
 #include "mruby/array.h"
 #include "mruby/class.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "mruby/hash.h"
 #include <stdio.h>
-#include "variable.h"
 #include "re.h"
 #ifdef INCLUDE_REGEXP
 #include "regex.h"

src/struct.c

@@ -24,7 +24,7 @@ mrb_value mrb_exec_recursive_paired(mrb_state *mrb, mrb_value (*func) (mrb_state
 #include "mruby/hash.h"
 #include "mruby/string.h"
 #include "mruby/class.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "mruby/range.h"
 #include "error.h"
 //#include "defines.h"

src/symbol.c

@@ -13,7 +13,7 @@
 #include "mruby/string.h"
 #include <ctype.h>
 #include "mruby/class.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include <stdio.h>
 
 #ifdef INCLUDE_REGEXP

src/transcode.c

@@ -16,7 +16,7 @@
 #include "transcode_data.h"
 #include <ctype.h>
 #include "st.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include <string.h>
 #include "mruby/string.h"
 #include "mruby/array.h"

src/variable.c

@@ -8,7 +8,7 @@
 #include "mruby.h"
 #include "mruby/class.h"
 #include "ritehash.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "mruby/string.h"
 #include "mruby/range.h"
 #include "error.h"

src/variable.h

@@ -1,47 +0,0 @@
-/*
-** variable.h - mruby variables
-** 
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef MRUBY_VARIABLE_H
-#define MRUBY_VARIABLE_H
-
-typedef struct global_variable {
-    int   counter;
-    mrb_value *data;
-    mrb_value (*getter)();
-    void  (*setter)();
-    //void  (*marker)();
-    //int block_trace;
-    //struct trace_var *trace;
-} global_variable;
-struct global_entry {
-    global_variable *var;
-    mrb_sym id;
-};
-
-mrb_value mrb_vm_special_get(mrb_state*, mrb_sym);
-void mrb_vm_special_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_vm_iv_get(mrb_state*, mrb_sym);
-void mrb_vm_iv_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_vm_cv_get(mrb_state*, mrb_sym);
-void mrb_vm_cv_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_vm_const_get(mrb_state*, mrb_sym);
-void mrb_vm_const_set(mrb_state*, mrb_sym, mrb_value);
-mrb_value mrb_const_get(mrb_state*, mrb_value, mrb_sym);
-void mrb_const_set(mrb_state*, mrb_value, mrb_sym, mrb_value);
-int mrb_const_defined(mrb_state*, mrb_value, mrb_sym);
-
-mrb_value mrb_obj_iv_get(mrb_state*, struct RObject*, mrb_sym);
-void mrb_obj_iv_set(mrb_state*, struct RObject*, mrb_sym, mrb_value);
-const char * mrb_class2name(mrb_state *mrb, struct RClass* klass);
-mrb_value mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym);
-void mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v); /* mrb_iv_set */
-void mrb_copy_generic_ivar(mrb_value clone, mrb_value obj);
-int mrb_const_defined_at(mrb_state *mrb, struct RClass *klass, mrb_sym id);
-mrb_value mrb_f_global_variables(mrb_state *mrb, mrb_value self);
-mrb_value mrb_gv_get(mrb_state *mrb, mrb_sym sym);
-void mrb_gv_set(mrb_state *mrb, mrb_sym sym, mrb_value val);
-
-#endif	/* MRUBY_VARIABLE_H */

src/version.c

@@ -8,7 +8,7 @@
 #include "version.h"
 #include <stdio.h>
 #include "mruby/string.h"
-#include "variable.h"
+#include "mruby/variable.h"
 
 #define PRINT(type) puts(ruby_##type)
 //#define MKSTR(type) mrb_obj_freeze(mrb_str_new(ruby_##type, sizeof(ruby_##type)-1))

src/vm.c

@@ -7,7 +7,7 @@
 #include "mruby.h"
 #include "opcode.h"
 #include "irep.h"
-#include "variable.h"
+#include "mruby/variable.h"
 #include "mruby/proc.h"
 #include "mruby/array.h"
 #include "mruby/string.h"