[svn:parrot] r42108 - in branches/context_unify: include/parrot src/call

bacek at svn.parrot.org bacek at svn.parrot.org
Mon Oct 26 11:07:14 UTC 2009


Author: bacek
Date: Mon Oct 26 11:07:14 2009
New Revision: 42108
URL: https://trac.parrot.org/parrot/changeset/42108

Log:
Remove duplicated field "current_results" vs "results"

Modified:
   branches/context_unify/include/parrot/context.h
   branches/context_unify/src/call/context_accessors.c

Modified: branches/context_unify/include/parrot/context.h
==============================================================================
--- branches/context_unify/include/parrot/context.h	Mon Oct 26 11:06:49 2009	(r42107)
+++ branches/context_unify/include/parrot/context.h	Mon Oct 26 11:07:14 2009	(r42108)
@@ -59,7 +59,7 @@
     PMC      *current_namespace;     /* The namespace we're currently in */
     PMC      *results_signature;     /* non-const results signature PMC */
     opcode_t *current_pc;            /* program counter of Sub invocation */
-    opcode_t *current_results;       /* ptr into code with get_results opcode */
+
     PMC      *current_sig;           /* temporary CallSignature PMC for active call */
 
     /* deref the constants - we need it all the time */
@@ -290,12 +290,6 @@
 
 PARROT_EXPORT
 PARROT_CAN_RETURN_NULL
-opcode_t* Parrot_pcc_get_results(PARROT_INTERP, ARGIN(PMC *ctx))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
-
-PARROT_EXPORT
-PARROT_CAN_RETURN_NULL
 PMC* Parrot_pcc_get_results(PARROT_INTERP, ARGIN(PMC *ctx))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
@@ -433,13 +427,6 @@
 PARROT_EXPORT
 void Parrot_pcc_set_results(PARROT_INTERP,
     ARGIN(PMC *ctx),
-    ARGIN_NULLOK(opcode_t *pc))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
-
-PARROT_EXPORT
-void Parrot_pcc_set_results(PARROT_INTERP,
-    ARGIN(PMC *ctx),
     ARGIN_NULLOK(PMC *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
@@ -586,9 +573,6 @@
 #define ASSERT_ARGS_Parrot_pcc_get_results __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(ctx))
-#define ASSERT_ARGS_Parrot_pcc_get_results __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(ctx))
 #define ASSERT_ARGS_Parrot_pcc_get_results_signature \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
@@ -656,9 +640,6 @@
 #define ASSERT_ARGS_Parrot_pcc_set_results __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(ctx))
-#define ASSERT_ARGS_Parrot_pcc_set_results __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(ctx))
 #define ASSERT_ARGS_Parrot_pcc_set_results_signature \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \

Modified: branches/context_unify/src/call/context_accessors.c
==============================================================================
--- branches/context_unify/src/call/context_accessors.c	Mon Oct 26 11:06:49 2009	(r42107)
+++ branches/context_unify/src/call/context_accessors.c	Mon Oct 26 11:07:14 2009	(r42108)
@@ -467,37 +467,6 @@
 
 /*
 
-=item C<PMC* Parrot_pcc_get_results(PARROT_INTERP, PMC *ctx)>
-
-=item C<void Parrot_pcc_set_results(PARROT_INTERP, PMC *ctx, PMC *value)>
-
-Get/set ptr into code with get_results opcode.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-PARROT_CAN_RETURN_NULL
-opcode_t*
-Parrot_pcc_get_results(PARROT_INTERP, ARGIN(PMC *ctx))
-{
-    ASSERT_ARGS(Parrot_pcc_get_results)
-    Parrot_Context const *c = get_context_struct_fast(interp, ctx);
-    return c->current_results;
-}
-
-PARROT_EXPORT
-void
-Parrot_pcc_set_results(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(opcode_t *pc))
-{
-    ASSERT_ARGS(Parrot_pcc_set_results)
-    Parrot_Context *c = get_context_struct_fast(interp, ctx);
-    c->current_results = pc;
-}
-
-/*
-
 =item C<PMC* Parrot_pcc_get_results_signature(PARROT_INTERP, PMC *ctx)>
 
 =item C<void Parrot_pcc_set_results_signature(PARROT_INTERP, PMC *ctx, PMC
@@ -533,8 +502,7 @@
 
 =item C<PMC* Parrot_pcc_get_results(PARROT_INTERP, PMC *ctx)>
 
-=item C<void Parrot_pcc_set_results(PARROT_INTERP, PMC *ctx, PMC
-*value)>
+=item C<void Parrot_pcc_set_results(PARROT_INTERP, PMC *ctx, PMC *value)>
 
 TODO
 


More information about the parrot-commits mailing list