Provide default .BUILD and fix Builder to use unwrap

parrot · Mar 7, 2011 · 158897b · 158897b
1 parent 3f98103
commit 158897b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/runtime/parrot/library/LLVM/BasicBlock.pm b/runtime/parrot/library/LLVM/BasicBlock.pm
@@ -1,5 +1,4 @@
 class LLVM::BasicBlock is LLVM::Opaque {
-    method BUILD($ref) { self.wrap($ptr) };
 };
 
 # vim: ft=perl6
diff --git a/runtime/parrot/library/LLVM/Builder.pm b/runtime/parrot/library/LLVM/Builder.pm
@@ -18,7 +18,7 @@ class LLVM::Builder {
 
 #            LLVMPositionBuilder             => "vppp",
     multi method set_position(LLVM::BasicBlock $bb, $value) {
-        %LLVM::F<LLVMPositionBuilder>($!ref, $bb._get_ptr(), $value);
+        %LLVM::F<LLVMPositionBuilder>($!ref, $bb.unwrap(), $value);
     }
 
 #            LLVMPositionBuilderBefore       => "vpp",
@@ -28,7 +28,7 @@ class LLVM::Builder {
 
 #            LLVMPositionBuilderAtEnd        => "vpp",
     multi method set_position(LLVM::BasicBlock $bb) {
-        %LLVM::F<LLVMPositionBuilderAtEnd>($!ref, $bb._get_ptr());
+        %LLVM::F<LLVMPositionBuilderAtEnd>($!ref, $bb.unwrap());
     }
 
 #            LLVMGetInsertBlock              => "pp",
@@ -128,7 +128,7 @@ class LLVM::Builder {
     method call($func, *@args, :$name?) {
         %LLVM::F<LLVMBuildCall>(
             $!ref,
-            $func._get_ptr,
+            $func.unwrap(),
             LLVM::convert_to_struct(@args),
             +@args,
             $name // ""

diff --git a/runtime/parrot/library/LLVM/Function.pm b/runtime/parrot/library/LLVM/Function.pm
@@ -1,8 +1,6 @@
 class LLVM::Function is LLVM::Opaque {
     our $counter;
 
-    method BUILD($ptr) { self.wrap($ptr) };
-
     method append_basic_block($name?) {
         LLVM::BasicBlock.new.BUILD(
             %LLVM::F<LLVMAppendBasicBlock>($!ptr, $name ?? $name !! "block" ~~ $counter++)

diff --git a/runtime/parrot/library/LLVM/Opaque.pm b/runtime/parrot/library/LLVM/Opaque.pm
@@ -1,6 +1,9 @@
 class LLVM::Opaque {
     has $!ptr;
 
+    # Default implementation of BUILD.
+    method BUILD($ptr) { self.wrap($ptr) }
+
     method wrap($ptr) { $!ptr := $ptr; self };
     method unwrap()   { $!ptr };
 };