Update of /cvsroot/monetdb/pathfinder/compiler/algebra/map
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31425/compiler/algebra/map
Modified Files:
Tag: xquery-decomposition
intro_proxy.c intro_thetajoin.c map_ori_names.c
map_unq_names.c resolve_proxy.c
Log Message:
propagated changes of Monday Feb 11 2008 - Saturday Feb 16 2008
from the development trunk to the xquery-decomposition 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.2.1
diff -u -d -r1.31 -r1.31.2.1
--- intro_proxy.c 11 Jan 2008 10:46:57 -0000 1.31
+++ intro_proxy.c 16 Feb 2008 01:02:09 -0000 1.31.2.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)
Index: intro_thetajoin.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/intro_thetajoin.c,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- intro_thetajoin.c 8 Feb 2008 22:59:14 -0000 1.12.2.1
+++ intro_thetajoin.c 16 Feb 2008 01:02:09 -0000 1.12.2.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.2.1
retrieving revision 1.26.2.2
diff -u -d -r1.26.2.1 -r1.26.2.2
--- map_ori_names.c 8 Feb 2008 22:59:14 -0000 1.26.2.1
+++ map_ori_names.c 16 Feb 2008 01:02:09 -0000 1.26.2.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)
Index: map_unq_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/map_unq_names.c,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- map_unq_names.c 8 Feb 2008 22:59:14 -0000 1.25.2.1
+++ map_unq_names.c 16 Feb 2008 01:02:09 -0000 1.25.2.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)
Index: resolve_proxy.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/resolve_proxy.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- resolve_proxy.c 11 Jan 2008 10:46:57 -0000 1.10
+++ resolve_proxy.c 16 Feb 2008 01:02:09 -0000 1.10.2.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)
-------------------------------------------------------------------------
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
