Rename PhpResource to PippResource.

bschmalhofer · Mar 1, 2009 · 35a5f67 · 35a5f67
1 parent 27e2fee
commit 35a5f67
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,11 +13,13 @@
 /src/pct/gen_*.pir
 
 /src/pmc/Makefile
-/src/pmc/php*.c
 /src/pmc/pipp_group.c
 /src/pmc/pipp_group.h
 /src/pmc/php*.h
-/src/pmc/pmc_php*.h
+/src/pmc/php*.c
+/src/pmc/pippresource.c
+/src/pmc/pmc_*.h
+/src/pmc/pmc_*.c
 /src/pmc/*.bundle
 /src/pmc/*.dll
 /src/pmc/*.dump

diff --git a/build/templates/src/pmc/Makefile.in b/build/templates/src/pmc/Makefile.in
@@ -27,7 +27,7 @@ PMCS = \
   phpboolean \
   phpfloat \
   phpinteger \
-  phpresource \
+  pippresource \
   phpstring \
   phpnull
 
@@ -37,7 +37,7 @@ PMC_SOURCES = \
   phpboolean.pmc \
   phpfloat.pmc \
   phpinteger.pmc \
-  phpresource.pmc \
+  pippresource.pmc \
   phpstring.pmc \
   phpnull.pmc
 

diff --git a/src/common/php_API.pir b/src/common/php_API.pir
@@ -62,7 +62,7 @@ php_API.pir - PHP API Library
     .param pmc val
     .param string type
 
-    $I0 = isa val, 'PhpResource'
+    $I0 = isa val, 'PippResource'
     if $I0 goto L1
     $P0 = getinterp
     $P1 = $P0['sub'; 1]
@@ -325,7 +325,7 @@ STILL INCOMPLETE (see parse_arg_impl).
     .return ('boolean')
   not_boolean:
     unless c == 'r' goto not_resource
-    $I0 = isa arg, 'PhpResource'
+    $I0 = isa arg, 'PippResource'
     if $I0 goto L5
     $I0 = isa arg, 'PhpNull'
     unless $I0 goto L51

diff --git a/src/common/php_MACRO.pir b/src/common/php_MACRO.pir
@@ -111,7 +111,7 @@ php_MACRO.pir - PHP API macros
 =cut
 
 .macro RETURN_RESOURCE(val)
-    new $P0, 'PhpResource', .val
+    new $P0, 'PippResource', .val
     .return ($P0)
 .endm
 

diff --git a/src/common/php_builtin.pir b/src/common/php_builtin.pir
@@ -100,7 +100,7 @@ STILL INCOMPLETE.
     if $I0 goto L4
     $I0 = isa $P2, 'PhpBoolean'
     if $I0 goto L4
-    $I0 = isa $P2, 'PhpResource'
+    $I0 = isa $P2, 'PippResource'
     if $I0 goto L4
     $I0 = isa $P2, 'PhpNull'
     if $I0 goto L4
@@ -426,7 +426,7 @@ Get the resource type name for a given resource
     .RETURN_NULL()
   L1:
     $P1 = shift args
-    $I0 = isa $P1, 'PhpResource'
+    $I0 = isa $P1, 'PippResource'
     if $I0 goto L2
     error(E_WARNING, "Supplied argument is not a valid resource handle")
     .RETURN_FALSE()

diff --git a/src/common/php_gmp.pir b/src/common/php_gmp.pir
@@ -348,7 +348,7 @@ Gets signed long value of GMP number
     .RETURN_NULL()
   L1:
     $P1 = shift args
-    $I0 = isa $P1, 'PhpResource'
+    $I0 = isa $P1, 'PippResource'
     unless $I0 goto L2
     .local pmc gmpnum
     gmpnum = fetch_resource($P1, GMP_PMC)

diff --git a/src/pmc/phpresource.pmc → src/pmc/pippresource.pmc b/src/pmc/phpresource.pmc → src/pmc/pippresource.pmc
@@ -3,7 +3,7 @@ Copyright (C) 2008, The Perl Foundation.
 
 =head1 NAME
 
-src/pmc/phpresource.pmc - PHP Resource
+src/pmc/pippresource.pmc - Pipp Resource
 
 =head1 DESCRIPTION
 
@@ -17,7 +17,7 @@ src/pmc/phpresource.pmc - PHP Resource
 
 #include "php_private.h"
 
-pmclass PhpResource
+pmclass PippResource
     provides ref
     dynpmc
     group    pipp_group
@@ -34,7 +34,7 @@ Raises an exception. Use C<init_pmc()>.
 */
     void init() {
         Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_INVALID_OPERATION,
-                       "PhpResource init without pmc");
+                       "PippResource init without pmc");
     }
 
 /*