Changeset 2821

Timestamp:

06/21/10 20:14:00 (20 months ago)

Author:

karpet

Message:

switch signatures for int and ptr sizes

Location:

Search-Tools/trunk

Files:

• search-tools.c (modified) (6 diffs)
• search-tools.h (modified) (2 diffs)
• typemap (modified) (1 diff)

Search-Tools/trunk/search-tools.c

@@ -136 +136 @@
 }
 
-static IV
+static void * 
 st_av_fetch_ptr( AV* a, I32 index ) {
     dTHX;
     SV** ok;
-    IV ptr;
+    void * ptr;
     ok = av_fetch(a, index, 0);
     if (ok == NULL) {
@@ -343 +343 @@
 /* make a Perl blessed object from a C pointer */
 static SV* 
-st_bless_ptr( const char *class, IV c_ptr ) {
-    dTHX;
-    SV* obj = newSViv(c_ptr);
-    sv_setref_pv(obj, class, (void*)c_ptr);
+st_bless_ptr( const char *class, void * c_ptr ) {
+    dTHX;
+    SV* obj = newSViv( PTR2IV( c_ptr ) ); // use instead of sv_newmortal().
+    sv_setref_pv(obj, class, c_ptr);
     return obj;
 }
 
 /* return the C pointer from a Perl blessed O_OBJECT */
-static IV 
+static void * 
 st_extract_ptr( SV* object ) {
     dTHX;
-    return SvIV((SV*)SvRV( object ));
+    return INT2PTR( void*, SvIV(SvRV( object )) );
 }
 
@@ -675 +675 @@
             }
             
-            tok = st_bless_ptr(ST_CLASS_TOKEN, (IV)token);
+            tok = st_bless_ptr(ST_CLASS_TOKEN, token);
             av_push(tokens, tok);
             if (token->is_sentence_start) {
@@ -703 +703 @@
         }
         
-        tok = st_bless_ptr(ST_CLASS_TOKEN, (IV)token);
+        tok = st_bless_ptr(ST_CLASS_TOKEN, token);
         if (heat_seeker != NULL) {
             if (heat_seeker_is_CV) {
@@ -755 +755 @@
         }
 
-        tok = st_bless_ptr(ST_CLASS_TOKEN, (IV)token);
+        tok = st_bless_ptr(ST_CLASS_TOKEN, token);
         av_push(tokens, tok);
     }
@@ -761 +761 @@
     return st_bless_ptr(
             ST_CLASS_TOKENLIST, 
-            (IV)st_new_token_list(tokens, heat, sentence_starts, num_tokens)
+            st_new_token_list(tokens, heat, sentence_starts, num_tokens)
            );
 }

Search-Tools/trunk/search-tools.h

@@ -67 +67 @@
 */
 static SV*      st_av_fetch( AV* a, I32 index );
-static IV       st_av_fetch_ptr( AV* a, I32 index );
+static void*    st_av_fetch_ptr( AV* a, I32 index );
 static SV*      st_hv_fetch( HV* h, const char* key );
 static SV*      st_hvref_fetch( SV* h, const char* key );
@@ -87 +87 @@
 static SV*      st_new_hash_object(const char *class);
 */
-static SV*      st_bless_ptr( const char* class, IV c_ptr );
-static IV       st_extract_ptr( SV* object );
+static SV*      st_bless_ptr( const char* class, void * c_ptr );
+static void*    st_extract_ptr( SV* object );
 static void*    st_malloc(size_t size);
 static void     st_free_token(st_token *tok);

Search-Tools/trunk/typemap

@@ -7 +7 @@
 O_OBJECT
     if( sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVMG) )
-            $var = ($type)SvIV((SV*)SvRV( $arg ));
+            $var = INT2PTR ($type, SvIV (SvRV ($arg)));
     else{
             warn( \"${Package}::$func_name() -- $var is not a blessed SV reference\" );