Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19598/algebra/prop
Modified Files:
prop_trace_names.c
Log Message:
-- Fix two more occurrences of the bug introduced 1 hour ago :|
Index: prop_trace_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_trace_names.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- prop_trace_names.c 19 Mar 2008 13:27:21 -0000 1.20
+++ prop_trace_names.c 19 Mar 2008 14:44:06 -0000 1.21
@@ -43,10 +43,6 @@
/* Easily access subtree-parts */
#include "child_mnemonic.h"
-/* store the number of incoming edges for each operator
- in the refctr field */
-#define EDGE(n) ((n)->refctr)
-
#define CUR_AT(n,i) (((name_pair_t *) PFarray_at ((n), (i)))->unq)
#define ORI_AT(n,i) (((name_pair_t *) PFarray_at ((n), (i)))->ori)
@@ -131,8 +127,8 @@
/* nothing to do if we haven't collected
all incoming name pair lists of that node */
- EDGE(n)++;
- if (EDGE(n) < PFprop_refctr (n))
+ PFprop_refctr (n) = PFprop_refctr (n) - 1;
+ if (PFprop_refctr (n) > 0)
return;
/* If we reached our goal we can return.
@@ -475,8 +471,6 @@
static void
reset_fun (PFla_op_t *n)
{
- EDGE(n) = 0;
-
/* reset the name mapping structure */
if (n->prop->name_pairs)
PFarray_last (n->prop->name_pairs) = 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
