Move 'at' and 'put' primitives to 'object_at' and 'object_put'.

steveklabnik · Aug 4, 2008 · a732f0e · a732f0e
1 parent 9e815fe
commit a732f0e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/kernel/bootstrap/class.rb b/kernel/bootstrap/class.rb
@@ -54,12 +54,12 @@ class RuntimePrimitive
   ByteCodes = 4
 
   def put(idx, val)
-    Ruby.primitive :put
-    raise InvalidIndexError, "Object#put failed."
+    Ruby.primitive :object_put
+    raise InvalidIndexError, "RuntimePrimitive#put failed."
   end
 
   def at(idx)
-    Ruby.primitive :at
+    Ruby.primitive :object_at
     raise InvalidIndexError, "RuntimePrimitive#at failed."
   end
 

diff --git a/kernel/bootstrap/tuple.rb b/kernel/bootstrap/tuple.rb
@@ -16,22 +16,22 @@ def shifted(distance)
   end
 
   def [](idx)
-    Ruby.primitive :at
+    Ruby.primitive :object_at
     raise InvalidIndexError, "Unable to access index '#{idx}' of #{self}"
   end
 
   def []=(idx, val)
-    Ruby.primitive :put
+    Ruby.primitive :object_put
     raise InvalidIndexError, "Unable to set index '#{idx}' of #{self}"
   end
 
   def at(idx)
-    Ruby.primitive :at
-    raise InvalidIndexError, "Object#at failed."
+    Ruby.primitive :object_at
+    raise InvalidIndexError, "Tuple#at failed."
   end
 
   def put(idx, val)
-    Ruby.primitive :put
+    Ruby.primitive :object_put
     raise InvalidIndexError, "Unable to set index '#{idx}' of #{self}"
   end
 

diff --git a/runtime/stable/bootstrap.rba b/runtime/stable/bootstrap.rba
diff --git a/runtime/stable/compiler.rba b/runtime/stable/compiler.rba
diff --git a/shotgun/lib/primitives.rb b/shotgun/lib/primitives.rb
@@ -438,9 +438,8 @@ def fixnum_ge
     CODE
   end
 
-
-  defprim :at
-  def at
+  defprim :object_at
+  def object_at
     <<-CODE
     ARITY(1);
     OBJECT t1;
@@ -456,8 +455,8 @@ def at
     CODE
   end
 
-  defprim :put
-  def put
+  defprim :object_put
+  def object_put
     <<-CODE
     ARITY(2);
     OBJECT t1, t2;