Update of /cvsroot/monetdb/pathfinder/compiler/algebra/map
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14645/compiler/algebra/map
Modified Files:
Tag: PF_ROX
intro_proxy.c intro_thetajoin.c map_ori_names.c
map_unq_names.c resolve_proxy.c
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the development trunk to the PF_ROX branch
Index: intro_proxy.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/intro_proxy.c,v
retrieving revision 1.31
retrieving revision 1.31.4.1
diff -u -d -r1.31 -r1.31.4.1
--- intro_proxy.c 11 Jan 2008 10:46:57 -0000 1.31
+++ intro_proxy.c 18 Feb 2008 16:57:18 -0000 1.31.4.1
@@ -49,16 +49,8 @@
#include "alg_dag.h"
#include "algopt.h"
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) ((p)->child[0])
-/** starting from p, make a step right */
-#define R(p) ((p)->child[1])
-/** ... and so on */
-#define LL(p) (L(L(p)))
-#define RL(p) (L(R(p)))
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
#define SEEN(p) ((p)->bit_dag)
#define pfIN(p) ((p)->bit_in)
@@ -1663,8 +1655,7 @@
PFla_step_join (
L(step),
proxy_exit,
- step->sem.step.axis,
- step->sem.step.ty,
+ step->sem.step.spec,
step->sem.step.level,
item,
item_res),
@@ -1675,8 +1666,7 @@
PFla_guide_step_join (
L(step),
proxy_exit,
- step->sem.step.axis,
- step->sem.step.ty,
+ step->sem.step.spec,
step->sem.step.guide_count,
step->sem.step.guides,
step->sem.step.level,
Index: intro_thetajoin.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/intro_thetajoin.c,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -d -r1.12.4.1 -r1.12.4.2
--- intro_thetajoin.c 9 Feb 2008 08:40:16 -0000 1.12.4.1
+++ intro_thetajoin.c 18 Feb 2008 16:57:18 -0000 1.12.4.2
@@ -59,13 +59,8 @@
#include "oops.h"
#include "alg_dag.h"
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) ((p)->child[0])
-/** starting from p, make a step right */
-#define R(p) ((p)->child[1])
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
#define SEEN(n) (n)->bit_dag
#define EDGE(n) (n)->state_label
Index: map_ori_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/map_ori_names.c,v
retrieving revision 1.26.4.1
retrieving revision 1.26.4.2
diff -u -d -r1.26.4.1 -r1.26.4.2
--- map_ori_names.c 9 Feb 2008 08:40:16 -0000 1.26.4.1
+++ map_ori_names.c 18 Feb 2008 16:57:18 -0000 1.26.4.2
@@ -43,13 +43,8 @@
/** mnemonic algebra constructors */
#include "logical_mnemonic.h"
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) ((p)->child[0])
-/** starting from p, make a step right */
-#define R(p) ((p)->child[1])
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
#define SEEN(p) ((p)->bit_dag)
@@ -594,16 +589,14 @@
project (PROJ(RIGHT, p),
proj (iter, iter),
proj (item_out, item_in)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
iter,
item_out,
item_out);
} else
res = step (O(L(p)), PROJ(RIGHT, p),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
ONAME(p, p->sem.step.iter),
ONAME(p, p->sem.step.item),
@@ -613,8 +606,7 @@
case la_step_join:
res = step_join (O(L(p)),
SEC_PROJ(RIGHT, p, p->sem.step.item_res),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
ONAME(p, p->sem.step.item),
ONAME(p, p->sem.step.item_res));
@@ -639,8 +631,7 @@
project (PROJ(RIGHT, p),
proj (iter, iter),
proj (item_out, item_in)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
@@ -649,8 +640,7 @@
item_out);
} else
res = guide_step (O(L(p)), PROJ(RIGHT, p),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
@@ -662,8 +652,7 @@
case la_guide_step_join:
res = guide_step_join (O(L(p)),
SEC_PROJ(RIGHT, p, p->sem.step.item_res),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
Index: map_unq_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/map_unq_names.c,v
retrieving revision 1.25.4.1
retrieving revision 1.25.4.2
diff -u -d -r1.25.4.1 -r1.25.4.2
--- map_unq_names.c 9 Feb 2008 08:40:17 -0000 1.25.4.1
+++ map_unq_names.c 18 Feb 2008 16:57:18 -0000 1.25.4.2
@@ -44,13 +44,8 @@
/** mnemonic algebra constructors */
#include "logical_mnemonic.h"
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) ((p)->child[0])
-/** starting from p, make a step right */
-#define R(p) ((p)->child[1])
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
#define SEEN(p) ((p)->bit_dag)
@@ -586,8 +581,7 @@
case la_step:
res = step (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
UNAME(p, p->sem.step.iter),
/* unique name of input attribute item is
@@ -598,8 +592,7 @@
case la_step_join:
res = step_join (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
UNAME(p, p->sem.step.item),
UNAME(p, p->sem.step.item_res));
@@ -607,8 +600,7 @@
case la_guide_step:
res = guide_step (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
@@ -621,8 +613,7 @@
case la_guide_step_join:
res = guide_step_join (U(L(p)), U(R(p)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
Index: resolve_proxy.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/resolve_proxy.c,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -d -r1.10 -r1.10.4.1
--- resolve_proxy.c 11 Jan 2008 10:46:57 -0000 1.10
+++ resolve_proxy.c 18 Feb 2008 16:57:18 -0000 1.10.4.1
@@ -39,15 +39,10 @@
#include "properties.h"
#include "mem.h"
-#define SEEN(p) ((p)->bit_dag)
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) ((p)->child[0])
-/** starting from p, make a step right */
-#define R(p) ((p)->child[1])
+#define SEEN(p) ((p)->bit_dag)
static void
resolve_proxies (PFla_op_t *p)
@@ -120,8 +115,7 @@
PFalg_proj (join_att1, join_att2),
PFalg_proj (p->sem.step.item_res,
p->sem.step.item)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.level,
join_att1,
p->sem.step.item_res,
@@ -134,8 +128,7 @@
PFalg_proj (join_att1, join_att2),
PFalg_proj (p->sem.step.item_res,
p->sem.step.item)),
- p->sem.step.axis,
- p->sem.step.ty,
+ p->sem.step.spec,
p->sem.step.guide_count,
p->sem.step.guides,
p->sem.step.level,
-------------------------------------------------------------------------
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
