Permalink
Browse files

Changed all OBJECT, SYMBOL, FIXNUM, INTEGER to normal syntax.

* I.e., s/OBJECT/Object*/ &c.
  • Loading branch information...
1 parent 3a0e9a4 commit 1fdd151d4b0c487df2512133159cf8f775ac05ff @rue rue committed Oct 18, 2008
Showing with 1,744 additions and 1,691 deletions.
  1. +2 −2 vm/builtin/access_variable.hpp
  2. +11 −11 vm/builtin/array.cpp
  3. +12 −12 vm/builtin/array.hpp
  4. +61 −61 vm/builtin/bignum.cpp
  5. +54 −54 vm/builtin/bignum.hpp
  6. +3 −3 vm/builtin/block_environment.cpp
  7. +2 −2 vm/builtin/block_environment.hpp
  8. +9 −9 vm/builtin/bytearray.cpp
  9. +9 −9 vm/builtin/bytearray.hpp
  10. +13 −13 vm/builtin/channel.cpp
  11. +9 −9 vm/builtin/channel.hpp
  12. +4 −4 vm/builtin/class.cpp
  13. +6 −6 vm/builtin/class.hpp
  14. +8 −8 vm/builtin/compactlookuptable.cpp
  15. +4 −4 vm/builtin/compactlookuptable.hpp
  16. +3 −3 vm/builtin/compiledmethod.cpp
  17. +9 −9 vm/builtin/compiledmethod.hpp
  18. +10 −11 vm/builtin/contexts.cpp
  19. +19 −19 vm/builtin/contexts.hpp
  20. +5 −5 vm/builtin/dir.cpp
  21. +5 −5 vm/builtin/dir.hpp
  22. +7 −7 vm/builtin/exception.cpp
  23. +7 −7 vm/builtin/exception.hpp
  24. +2 −2 vm/builtin/executable.cpp
  25. +3 −3 vm/builtin/executable.hpp
  26. +45 −45 vm/builtin/fixnum.cpp
  27. +49 −50 vm/builtin/fixnum.hpp
  28. +29 −29 vm/builtin/float.cpp
  29. +30 −30 vm/builtin/float.hpp
  30. +7 −7 vm/builtin/immediates.cpp
  31. +7 −7 vm/builtin/immediates.hpp
  32. +14 −14 vm/builtin/integer.cpp
  33. +6 −6 vm/builtin/integer.hpp
  34. +12 −12 vm/builtin/io.cpp
  35. +19 −19 vm/builtin/io.hpp
  36. +1 −1 vm/builtin/iseq.hpp
  37. +3 −3 vm/builtin/list.cpp
  38. +6 −6 vm/builtin/list.hpp
  39. +18 −18 vm/builtin/lookuptable.cpp
  40. +16 −16 vm/builtin/lookuptable.hpp
  41. +13 −12 vm/builtin/memorypointer.cpp
  42. +8 −8 vm/builtin/memorypointer.hpp
  43. +1 −1 vm/builtin/methodvisibility.cpp
  44. +2 −2 vm/builtin/methodvisibility.hpp
  45. +12 −12 vm/builtin/module.cpp
  46. +12 −12 vm/builtin/module.hpp
  47. +12 −11 vm/builtin/nativefunction.cpp
  48. +7 −7 vm/builtin/nativefunction.hpp
  49. +30 −30 vm/builtin/object.cpp
  50. +28 −28 vm/builtin/object.hpp
  51. +11 −11 vm/builtin/regexp.cpp
  52. +5 −5 vm/builtin/regexp.hpp
  53. +5 −5 vm/builtin/selector.cpp
  54. +5 −5 vm/builtin/selector.hpp
  55. +9 −9 vm/builtin/sendsite.cpp
  56. +6 −6 vm/builtin/sendsite.hpp
  57. +29 −29 vm/builtin/string.cpp
  58. +19 −19 vm/builtin/string.hpp
  59. +5 −5 vm/builtin/symbol.cpp
  60. +4 −5 vm/builtin/symbol.hpp
  61. +10 −10 vm/builtin/system.cpp
  62. +10 −10 vm/builtin/system.hpp
  63. +31 −31 vm/builtin/task.cpp
  64. +24 −24 vm/builtin/task.hpp
  65. +6 −6 vm/builtin/taskprobe.cpp
  66. +5 −5 vm/builtin/taskprobe.hpp
  67. +2 −2 vm/builtin/thread.cpp
  68. +6 −6 vm/builtin/thread.hpp
  69. +14 −14 vm/builtin/time.cpp
  70. +3 −3 vm/builtin/time.hpp
  71. +15 −15 vm/builtin/tuple.cpp
  72. +14 −14 vm/builtin/tuple.hpp
  73. +11 −13 vm/codegen/field_extract.rb
  74. +4 −4 vm/compiled_file.cpp
  75. +7 −1 vm/compiled_file.hpp
  76. +1 −0 vm/environment.cpp
  77. +16 −2 vm/event.cpp
  78. +2 −2 vm/event.hpp
  79. +1 −1 vm/exception.cpp
  80. +3 −3 vm/exception.hpp
  81. +7 −7 vm/gc.cpp
  82. +6 −3 vm/gc.hpp
  83. +13 −13 vm/gc_baker.cpp
  84. +13 −13 vm/gc_baker.hpp
  85. +2 −2 vm/gc_debug.cpp
  86. +6 −3 vm/gc_debug.hpp
  87. +9 −9 vm/gc_marksweep.cpp
  88. +8 −8 vm/gc_marksweep.hpp
  89. +2 −2 vm/gc_root.cpp
  90. +10 −10 vm/gc_root.hpp
  91. +5 −5 vm/global_cache.hpp
  92. +13 −11 vm/globals.hpp
  93. +113 −113 vm/instructions.rb
  94. +5 −5 vm/llvm/instructions.cpp
  95. +15 −15 vm/marshal.cpp
  96. +7 −6 vm/marshal.hpp
  97. +5 −5 vm/message.cpp
  98. +11 −11 vm/message.hpp
  99. +17 −17 vm/objectmemory.cpp
  100. +13 −13 vm/objectmemory.hpp
  101. +1 −1 vm/ontology.cpp
  102. +11 −11 vm/oop.hpp
  103. +3 −1 vm/prelude.hpp
  104. +12 −5 vm/primitives.hpp
  105. +5 −5 vm/symboltable.cpp
  106. +7 −5 vm/symboltable.hpp
  107. +7 −7 vm/test/test_access_variable.hpp
  108. +1 −1 vm/test/test_array.hpp
  109. +18 −18 vm/test/test_bignum.hpp
  110. +24 −24 vm/test/test_bytearray.hpp
  111. +8 −8 vm/test/test_channel.hpp
  112. +3 −2 vm/test/test_compactlookuptable.hpp
  113. +1 −1 vm/test/test_contexts.hpp
  114. +3 −3 vm/test/test_dir.hpp
  115. +3 −3 vm/test/test_event.hpp
  116. +4 −4 vm/test/test_exception.hpp
  117. +54 −54 vm/test/test_fixnum.hpp
  118. +1 −1 vm/test/test_float.hpp
  119. +8 −8 vm/test/test_integer.hpp
  120. +4 −4 vm/test/test_io.hpp
  121. +2 −1 vm/test/test_list.hpp
  122. +25 −25 vm/test/test_lookuptable.hpp
  123. +44 −44 vm/test/test_memorypointer.hpp
  124. +3 −3 vm/test/test_message.hpp
  125. +41 −41 vm/test/test_nativefunction.hpp
  126. +31 −31 vm/test/test_object.hpp
  127. +19 −15 vm/test/test_objectmemory.hpp
  128. +12 −12 vm/test/test_profiler.hpp
  129. +13 −13 vm/test/test_regexp.hpp
  130. +1 −1 vm/test/test_selector.hpp
  131. +10 −10 vm/test/test_sendsite.hpp
  132. +13 −13 vm/test/test_string.hpp
  133. +9 −7 vm/test/test_symboltable.hpp
  134. +7 −7 vm/test/test_task.hpp
  135. +1 −1 vm/test/test_thread.hpp
  136. +17 −17 vm/test/test_time.hpp
  137. +1 −1 vm/test/test_tuple.hpp
  138. +17 −17 vm/test/test_unmarshal.hpp
  139. +11 −11 vm/test/test_vm.hpp
  140. +12 −12 vm/type_info.cpp
  141. +15 −16 vm/type_info.hpp
  142. +4 −1 vm/virtual.hpp
  143. +10 −10 vm/vm.cpp
  144. +10 −10 vm/vm.hpp
  145. +3 −3 vm/vmmethod.cpp
  146. +8 −3 vm/vmmethod.hpp
@@ -17,8 +17,8 @@ namespace rubinius {
const static object_type type = AccessVariableType;
private:
- SYMBOL name_; // slot
- OBJECT write_; // slot
+ Symbol* name_; // slot
+ Object* write_; // slot
public:
/* accessors */
View
@@ -54,7 +54,7 @@ namespace rubinius {
// code makes sure we're only called when the arity and type are correct.
// Thus we know that this is a simple a[n] case only, which we can
// fully handle.
- OBJECT Array::aref(STATE, Fixnum* idx) {
+ Object* Array::aref(STATE, Fixnum* idx) {
native_int index = idx->to_native();
const native_int start = start_->to_native();
const native_int total = start + total_->to_native();
@@ -72,7 +72,7 @@ namespace rubinius {
return tuple_->at(state, index);
}
- OBJECT Array::aset(STATE, Fixnum* idx, OBJECT val) {
+ Object* Array::aset(STATE, Fixnum* idx, Object* val) {
native_int index = idx->to_native();
if(index < 0) {
@@ -82,7 +82,7 @@ namespace rubinius {
return this->set(state, index, val);
}
- OBJECT Array::get(STATE, size_t idx) {
+ Object* Array::get(STATE, size_t idx) {
if(idx >= (size_t)total_->to_native()) {
return Qnil;
}
@@ -92,7 +92,7 @@ namespace rubinius {
return tuple_->at(state, idx);
}
- OBJECT Array::set(STATE, size_t idx, OBJECT val) {
+ Object* Array::set(STATE, size_t idx, Object* val) {
size_t cur, oidx;
Tuple* tup = tuple_;
@@ -125,7 +125,7 @@ namespace rubinius {
return val;
}
- void Array::unshift(STATE, OBJECT val) {
+ void Array::unshift(STATE, Object* val) {
size_t new_size = total_->to_native() + 1;
Tuple* nt = Tuple::create(state, new_size);
for(size_t i = 0; i < (size_t)total_->to_native(); i++) {
@@ -139,19 +139,19 @@ namespace rubinius {
tuple(state, nt);
}
- OBJECT Array::shift(STATE) {
- OBJECT obj = get(state, 0);
+ Object* Array::shift(STATE) {
+ Object* obj = get(state, 0);
start(state, Fixnum::from(start_->to_native() + 1));
total(state, Fixnum::from(total_->to_native() - 1));
return obj;
}
- OBJECT Array::append(STATE, OBJECT val) {
+ Object* Array::append(STATE, Object* val) {
set(state, (size_t)total_->to_native(), val);
return val;
}
- bool Array::includes_p(STATE, OBJECT val) {
+ bool Array::includes_p(STATE, Object* val) {
size_t max = size();
for(size_t i = 0; i < max; i++) {
@@ -161,7 +161,7 @@ namespace rubinius {
return false;
}
- void Array::Info::show(STATE, OBJECT self, int level) {
+ void Array::Info::show(STATE, Object* self, int level) {
Array* ary = as<Array>(self);
size_t size = ary->size();
size_t stop = size < 5 ? size : 5;
@@ -176,7 +176,7 @@ namespace rubinius {
++level;
for(size_t i = 0; i < stop; i++) {
indent(level);
- OBJECT obj = ary->get(state, i);
+ Object* obj = ary->get(state, i);
if(obj == ary) {
class_info(state, obj, true);
} else {
View
@@ -14,10 +14,10 @@ namespace rubinius {
const static object_type type = ArrayType;
private:
- INTEGER total_; // slot
+ Integer* total_; // slot
Tuple* tuple_; // slot
- INTEGER start_; // slot
- OBJECT shared_; // slot
+ Integer* start_; // slot
+ Object* shared_; // slot
public:
/* accessors */
@@ -36,22 +36,22 @@ namespace rubinius {
void setup(STATE, size_t size);
// Ruby.primitive :array_aref
- OBJECT aref(STATE, Fixnum* idx);
+ Object* aref(STATE, Fixnum* idx);
// Ruby.primitive :array_aset
- OBJECT aset(STATE, Fixnum* idx, OBJECT val);
+ Object* aset(STATE, Fixnum* idx, Object* val);
- OBJECT get(STATE, size_t idx);
- OBJECT set(STATE, size_t idx, OBJECT val);
- void unshift(STATE, OBJECT val);
- OBJECT shift(STATE);
- OBJECT append(STATE, OBJECT val);
- bool includes_p(STATE, OBJECT val);
+ Object* get(STATE, size_t idx);
+ Object* set(STATE, size_t idx, Object* val);
+ void unshift(STATE, Object* val);
+ Object* shift(STATE);
+ Object* append(STATE, Object* val);
+ bool includes_p(STATE, Object* val);
class Info : public TypeInfo {
public:
BASIC_TYPEINFO(TypeInfo)
- virtual void show(STATE, OBJECT self, int level);
+ virtual void show(STATE, Object* self, int level);
};
};
};
Oops, something went wrong.

0 comments on commit 1fdd151

Please sign in to comment.