[svn:parrot] r36513 - trunk/ext/Parrot-Embed/lib/Parrot

chromatic at svn.parrot.org chromatic at svn.parrot.org
Tue Feb 10 00:34:19 UTC 2009


Author: chromatic
Date: Tue Feb 10 00:34:19 2009
New Revision: 36513
URL: https://trac.parrot.org/parrot/changeset/36513

Log:
[Parrot::Embed] Tidied code; no functional changes.

Modified:
   trunk/ext/Parrot-Embed/lib/Parrot/Embed.xs

Modified: trunk/ext/Parrot-Embed/lib/Parrot/Embed.xs
==============================================================================
--- trunk/ext/Parrot-Embed/lib/Parrot/Embed.xs	Mon Feb  9 23:59:06 2009	(r36512)
+++ trunk/ext/Parrot-Embed/lib/Parrot/Embed.xs	Tue Feb 10 00:34:19 2009	(r36513)
@@ -12,202 +12,209 @@
 
 typedef struct Interpreter_struct
 {
-	SV            *parent;
-	Parrot_Interp  interp;
+    SV            *parent;
+    Parrot_Interp  interp;
 } Interpreter_struct;
 
 typedef struct PMC_struct
 {
-	SV         *interp;
-	Parrot_PMC  pmc;
+    SV         *interp;
+    Parrot_PMC  pmc;
 } PMC_struct;
 
+
 Interpreter_struct*
 make_interp( pTHX_ SV *parent, PARROT_INTERP )
 {
-	Interpreter_struct *interp_struct;
-	if (interp == NULL)
-		return NULL;
+    Interpreter_struct *interp_struct;
+
+    if (!interp)
+        return NULL;
 
-	New( 0, interp_struct, 1, Interpreter_struct );
+    New( 0, interp_struct, 1, Interpreter_struct );
 
-	SvREFCNT_inc( parent );
-	interp_struct->parent = parent;
-	interp_struct->interp = interp;
+    SvREFCNT_inc( parent );
+    interp_struct->parent = parent;
+    interp_struct->interp = interp;
 
-	return interp_struct;
+    return interp_struct;
 }
 
+
 PMC_struct*
 make_pmc( pTHX_ SV *interp, Parrot_PMC pmc )
 {
-	PMC_struct *pmc_struct;
-	if (pmc == NULL)
-		return NULL;
+    PMC_struct *pmc_struct;
 
-	New( 0, pmc_struct, 1, PMC_struct );
+    if (!pmc)
+        return NULL;
 
-	SvREFCNT_inc( interp );
-	pmc_struct->interp = interp;
-	pmc_struct->pmc    = pmc;
+    New( 0, pmc_struct, 1, PMC_struct );
 
-	Parrot_register_pmc( get_interp( interp ), pmc );
+    SvREFCNT_inc( interp );
+    pmc_struct->interp = interp;
+    pmc_struct->pmc    = pmc;
 
-	return pmc_struct;
+    Parrot_register_pmc( get_interp( interp ), pmc );
+
+    return pmc_struct;
 }
 
+
 MODULE = Parrot::Embed PACKAGE = Parrot::Interpreter
 
 Parrot_Interp
 new( class, ... )
-	char *class
+    char *class
 PREINIT:
-	SV *parent_sv = NULL;
-	Parrot_Interp parent;
-	Parrot_Interp interp;
-	Parrot_PackFile pf;
-CODE:
-	if (items == 1)
-	{
-		parent = 0;
-	}
-	else if ( items == 2 && sv_derived_from( ST(1), "Parrot::Interpreter" ))
-	{
-		parent_sv = ST(1);
-		parent    = get_interp( parent_sv );
-	}
-	else
-	{
-		Perl_croak( aTHX_ "Usage: Parrot::Interpreter->new( [ parent ] )" );
-	}
-	interp = Parrot_new( (Parrot_Interp)parent );
-	pf     = PackFile_new( interp, 0 );
-	Parrot_loadbc( interp, pf );
-
-	/* Can't use RETVAL/OUTPUT here because typemap loses class variable */
-	ST(0)  = sv_newmortal();
-	sv_setref_pv( ST(0), class, (void*)make_interp( aTHX_ parent_sv, interp ) );
+    SV             *parent_sv = NULL;
+    Parrot_Interp   parent;
+    Parrot_Interp   interp;
+    Parrot_PackFile pf;
+CODE:
+    if (items == 1)
+        parent = 0;
+    else if ( items == 2 && sv_derived_from( ST(1), "Parrot::Interpreter" ))
+    {
+        parent_sv = ST(1);
+        parent    = get_interp( parent_sv );
+    }
+    else
+        Perl_croak( aTHX_ "Usage: Parrot::Interpreter->new( [ parent ] )" );
+
+    interp = Parrot_new( (Parrot_Interp)parent );
+    pf     = PackFile_new( interp, 0 );
+    Parrot_loadbc( interp, pf );
+
+    /* Can't use RETVAL/OUTPUT here because typemap loses class variable */
+    ST(0)  = sv_newmortal();
+    sv_setref_pv( ST(0), class, (void*)make_interp( aTHX_ parent_sv, interp ) );
+
 
 bool
 load_file( interp, filename )
-	Interpreter_struct *interp
-	char *filename
+    Interpreter_struct *interp
+    char               *filename
 PREINIT:
-	Parrot_Interp real_interp;
-	Parrot_PackFile pf;
+    Parrot_Interp   real_interp;
+    Parrot_PackFile pf;
 CODE:
-	real_interp = interp->interp;
-	pf = Parrot_readbc( real_interp, filename );
-	if (pf == NULL)
-		Perl_croak( aTHX_ \
-		"File '%s' not found in $parrot_interpreter->load_file()", filename );
+    real_interp = interp->interp;
+    pf          = Parrot_readbc( real_interp, filename );
 
-	Parrot_loadbc( real_interp, pf );
-	RETVAL = 1;
+    if (!pf)
+        Perl_croak( aTHX_
+        "File '%s' not found in $parrot_interpreter->load_file()", filename );
+
+    Parrot_loadbc( real_interp, pf );
+    RETVAL = 1;
 OUTPUT:
-	RETVAL
+    RETVAL
+
 
 PMC_struct*
 find_global( interp, global, ... )
-	Interpreter_struct *interp
-	char *global
+    Interpreter_struct *interp
+    char               *global
 PREINIT:
-	Parrot_Interp  real_interp;
-	SV            *namespace;
-	Parrot_String  p_namespace;
-	Parrot_String  p_global;
-	Parrot_PMC     pmc;
-CODE:
-	if ( items < 2 || items > 3 )
-	{
-		Perl_croak( aTHX_
-			"Usage: $parrot_interpreter->find_global( name, [ namespace ] )");
-	}
-
-	real_interp     = interp->interp;
-	p_global        = Parrot_str_new_constant( real_interp, global );
-
-	if ( items == 3 )
-		namespace   = ST(2);
-	else
-		namespace   = &PL_sv_undef;
-
-	if (namespace  != &PL_sv_undef )
-	{
-		p_namespace = Parrot_str_new_constant( real_interp, SvPVX( namespace ) );
-		pmc         = Parrot_find_global_s(real_interp, p_namespace, p_global);
-	}
-	else
-		pmc         = Parrot_find_global_cur( real_interp, p_global );
+    SV            *namespace;
+    Parrot_Interp  real_interp;
+    Parrot_String  p_namespace;
+    Parrot_String  p_global;
+    Parrot_PMC     pmc;
+CODE:
+    if ( items < 2 || items > 3 )
+        Perl_croak( aTHX_
+            "Usage: $parrot_interpreter->find_global( name, [ namespace ] )");
+
+    real_interp     = interp->interp;
+    p_global        = Parrot_str_new_constant( real_interp, global );
+
+    if ( items == 3 )
+        namespace   = ST(2);
+    else
+        namespace   = &PL_sv_undef;
+
+    if (namespace  != &PL_sv_undef )
+    {
+        p_namespace = Parrot_str_new_constant( real_interp, SvPVX(namespace) );
+        pmc         = Parrot_find_global_s(real_interp, p_namespace, p_global);
+    }
+    else
+        pmc         = Parrot_find_global_cur( real_interp, p_global );
 
-	RETVAL = make_pmc( aTHX_ ST(0), pmc );
+    RETVAL = make_pmc( aTHX_ ST(0), pmc );
 OUTPUT:
-	RETVAL
+    RETVAL
+
 
 PMC_struct*
 compile( interp, code )
-	Interpreter_struct *interp
-	char * code
+    Interpreter_struct *interp
+    char               *code
 PREINIT:
-	Parrot_Interp  real_interp;
-	STRING        *code_type;
-	STRING        *error;
-	Parrot_PMC     out_pmc;
-CODE:
-	real_interp = interp->interp;  
-	code_type   = Parrot_str_new_constant( real_interp, "PIR" );
-	out_pmc     = Parrot_compile_string( real_interp, code_type, code, &error );
-	RETVAL      = make_pmc( aTHX_ ST(0), out_pmc );
+    STRING        *code_type;
+    STRING        *error;
+    Parrot_Interp  real_interp;
+    Parrot_PMC     out_pmc;
+CODE:
+    real_interp = interp->interp;
+    code_type   = Parrot_str_new_constant( real_interp, "PIR" );
+    out_pmc     = Parrot_compile_string( real_interp, code_type, code, &error );
+    RETVAL      = make_pmc( aTHX_ ST(0), out_pmc );
 OUTPUT:
-	RETVAL
+    RETVAL
+
 
 void
 DESTROY( interp )
-	Interpreter_struct *interp
+    Interpreter_struct *interp
 CODE:
-	if ( interp->parent != NULL )
-		SvREFCNT_dec( interp->parent );
+    if (interp->parent)
+        SvREFCNT_dec( interp->parent );
 
-	Parrot_destroy( interp->interp );
+    Parrot_destroy( interp->interp );
 
 MODULE = Parrot::Embed PACKAGE = Parrot::PMC
 
+
 PMC_struct*
 invoke( pmc, signature, argument )
-	PMC_struct *pmc
-	const char *signature
-	const char *argument
-PREINIT:
-	Parrot_PMC    pmc_actual;
-	Parrot_PMC    out_pmc;
-	Parrot_Interp interp;
-	Parrot_String arg_string;
-CODE:
-	pmc_actual = pmc->pmc;
-	interp     = get_interp( pmc->interp );
-	arg_string = Parrot_str_new_constant( interp, argument );
-	out_pmc    = Parrot_call_sub( interp, pmc_actual, signature, arg_string );
-	RETVAL     = make_pmc( aTHX_ pmc->interp, out_pmc );
+    PMC_struct *pmc
+    const char *signature
+    const char *argument
+PREINIT:
+    Parrot_PMC    pmc_actual;
+    Parrot_PMC    out_pmc;
+    Parrot_Interp interp;
+    Parrot_String arg_string;
+CODE:
+    pmc_actual = pmc->pmc;
+    interp     = get_interp( pmc->interp );
+    arg_string = Parrot_str_new_constant( interp, argument );
+    out_pmc    = Parrot_call_sub( interp, pmc_actual, signature, arg_string );
+    RETVAL     = make_pmc( aTHX_ pmc->interp, out_pmc );
 OUTPUT:
-	RETVAL
+    RETVAL
+
 
 char *
 get_string( pmc )
-	PMC_struct *pmc
+    PMC_struct *pmc
 CODE:
-	RETVAL = Parrot_PMC_get_cstring( get_interp( pmc->interp ), pmc->pmc );
+    RETVAL = Parrot_PMC_get_cstring( get_interp( pmc->interp ), pmc->pmc );
 OUTPUT:
-	RETVAL
+    RETVAL
 
 void
 DESTROY( pmc )
-	PMC_struct *pmc
+    PMC_struct *pmc
 PREINIT:
-	Parrot_Interp interp;
+    Parrot_Interp interp;
 CODE:
-	interp = get_interp( pmc->interp );
+    interp = get_interp( pmc->interp );
 
-	if ( interp != NULL )
-		SvREFCNT_dec( interp );
+    if (interp)
+        SvREFCNT_dec( interp );
 
-	Parrot_unregister_pmc( interp, pmc->pmc );
+    Parrot_unregister_pmc( interp, pmc->pmc );


More information about the parrot-commits mailing list