diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 2 | ||||
| -rw-r--r-- | src/encoding.c | 2 | ||||
| -rw-r--r-- | src/error.c | 2 | ||||
| -rw-r--r-- | src/kernel.c | 2 | ||||
| -rw-r--r-- | src/numeric.c | 2 | ||||
| -rw-r--r-- | src/range.c | 2 | ||||
| -rw-r--r-- | src/re.c | 2 | ||||
| -rw-r--r-- | src/string.c | 3 | ||||
| -rw-r--r-- | src/struct.c | 2 | ||||
| -rw-r--r-- | src/symbol.c | 2 | ||||
| -rw-r--r-- | src/transcode.c | 2 | ||||
| -rw-r--r-- | src/variable.c | 2 | ||||
| -rw-r--r-- | src/variable.h | 47 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vm.c | 2 |
15 files changed, 14 insertions, 62 deletions
diff --git a/src/class.c b/src/class.c index 4abd0896e..51926b019 100644 --- a/src/class.c +++ b/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" diff --git a/src/encoding.c b/src/encoding.c index ed30a222a..2f698865b 100644 --- a/src/encoding.c +++ b/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 diff --git a/src/error.c b/src/error.c index 26c906437..e80a24e45 100644 --- a/src/error.c +++ b/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" diff --git a/src/kernel.c b/src/kernel.c index 0badb4366..0aaa49d95 100644 --- a/src/kernel.c +++ b/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" diff --git a/src/numeric.c b/src/numeric.c index 2462e63df..a5105548c 100644 --- a/src/numeric.c +++ b/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> diff --git a/src/range.c b/src/range.c index 7e9c85b0d..a12e7bae6 100644 --- a/src/range.c +++ b/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" @@ -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 diff --git a/src/string.c b/src/string.c index b5d7c4342..efa4a107c 100644 --- a/src/string.c +++ b/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" diff --git a/src/struct.c b/src/struct.c index 41a6bb15c..c7e09d4ed 100644 --- a/src/struct.c +++ b/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" diff --git a/src/symbol.c b/src/symbol.c index 2645b7cd4..679b3c35a 100644 --- a/src/symbol.c +++ b/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 diff --git a/src/transcode.c b/src/transcode.c index 66a4d4e42..3aab69581 100644 --- a/src/transcode.c +++ b/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" diff --git a/src/variable.c b/src/variable.c index 9804ab2ef..f5506d779 100644 --- a/src/variable.c +++ b/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" diff --git a/src/variable.h b/src/variable.h deleted file mode 100644 index 9076fcf7c..000000000 --- a/src/variable.h +++ /dev/null @@ -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 */ diff --git a/src/version.c b/src/version.c index f0edc6731..9be292a35 100644 --- a/src/version.c +++ b/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)) @@ -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" |