Update of /cvsroot/monetdb/pathfinder/compiler/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14645/compiler/core
Modified Files:
Tag: PF_ROX
coreopt.brg fs.brg simplify.brg
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the development trunk to the PF_ROX branch
Index: simplify.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/simplify.brg,v
retrieving revision 1.36
retrieving revision 1.36.4.1
diff -u -d -r1.36 -r1.36.4.1
--- simplify.brg 11 Jan 2008 10:47:00 -0000 1.36
+++ simplify.brg 18 Feb 2008 16:57:25 -0000 1.36.4.1
@@ -54,6 +54,9 @@
#include "qname.h"
#include "mem.h"
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
+
/*
* Accessors for the burg matcher
*/
@@ -365,34 +368,6 @@
%%
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) (LEFT_CHILD(p))
-/** starting from p, make a step right */
-#define R(p) (RIGHT_CHILD(p))
-/** starting from p, make two steps left */
-#define LL(p) L(L(p))
-/** starting from p, make a step left, then a step right */
-#define LR(p) R(L(p))
-/** starting from p, make a step right, then a step left */
-#define RL(p) L(R(p))
-/** starting from p, make two steps right */
-#define RR(p) R(R(p))
-/* ... and so on ... */
-#define RRL(p) L(R(R(p)))
-#define RRRL(p) L(R(R(R(p))))
-#define RRRRL(p) L(R(R(R(R(p)))))
-#define RRRRRL(p) L(R(R(R(R(R(p))))))
-#define RRRRRR(p) R(R(R(R(R(R(p))))))
-#define LLL(p) L(L(L(p)))
-#define LLR(p) R(L(L(p)))
-#define LRR(p) R(R(L(p)))
-#define LRLL(p) L(L(R(L(p))))
-#define LRLR(p) R(L(R(L(p))))
-#define LRL(p) L(R(L(p)))
-
/** Maximum number of pattern leaves */
#define MAX_KIDS 10
Index: coreopt.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/coreopt.brg,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -d -r1.56.2.1 -r1.56.2.2
--- coreopt.brg 9 Feb 2008 08:40:28 -0000 1.56.2.1
+++ coreopt.brg 18 Feb 2008 16:57:24 -0000 1.56.2.2
@@ -45,6 +45,9 @@
#include "subtyping.h"
#include "typecheck.h"
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
+
/*
* Accessors for the burg matcher
*/
@@ -374,42 +377,6 @@
%%
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) (LEFT_CHILD(p))
-/** starting from p, make a step right */
-#define R(p) (RIGHT_CHILD(p))
-/** starting from p, make two steps left */
-#define LL(p) L(L(p))
-/** starting from p, make a step left, then a step right */
-#define LR(p) R(L(p))
-/** starting from p, make a step right, then a step left */
-#define RL(p) L(R(p))
-/** starting from p, make two steps right */
-#define RR(p) R(R(p))
-/* ... and so on ... */
-#define LRL(p) L(R(L(p)))
-#define RRL(p) L(R(R(p)))
-#define RRR(p) R(R(R(p)))
-#define RRRL(p) L(R(R(R(p))))
-#define RRRRL(p) L(R(R(R(R(p)))))
-#define RRRRRL(p) L(R(R(R(R(R(p))))))
-#define RRRRRR(p) R(R(R(R(R(R(p))))))
-#define LLL(p) L(L(L(p)))
-#define LLR(p) R(L(L(p)))
-#define LRR(p) R(R(L(p)))
-#define LLLL(p) L(L(L(L(p))))
-#define LLLR(p) R(L(L(L(p))))
-#define LLRL(p) L(R(L(L(p))))
-#define LRLL(p) L(L(R(L(p))))
-#define RLLL(p) L(L(L(R(p))))
-#define LRLR(p) R(L(R(L(p))))
-#define LLRR(p) R(R(L(L(p))))
-#define RLR(p) R(L(R(p)))
-#define RLL(p) L(L(R(p)))
-
/** Type of a core tree node */
#define TY(p) ((p)->type)
Index: fs.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/core/fs.brg,v
retrieving revision 1.64
retrieving revision 1.64.4.1
diff -u -d -r1.64 -r1.64.4.1
--- fs.brg 11 Jan 2008 10:47:00 -0000 1.64
+++ fs.brg 18 Feb 2008 16:57:24 -0000 1.64.4.1
@@ -54,6 +54,9 @@
/* PFvar_t */
#include "variable.h"
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
+
/*
* Accessors for the burg matcher
*/
@@ -627,40 +630,6 @@
%%
-/*
- * Easily access subtree-parts.
- */
-/** starting from p, make a step left */
-#define L(p) (LEFT_CHILD(p))
-/** starting from p, make a step right */
-#define R(p) (RIGHT_CHILD(p))
-/** starting from p, make two steps left */
-#define LL(p) L(L(p))
-/** starting from p, make a step left, then a step right */
-#define LR(p) R(L(p))
-/** starting from p, make a step right, then a step left */
-#define RL(p) L(R(p))
-/** starting from p, make two steps right */
-#define RR(p) R(R(p))
-/* ... and so on ... */
-#define RRL(p) L(R(R(p)))
-#define RRRL(p) L(R(R(R(p))))
-#define RRRRL(p) L(R(R(R(R(p)))))
-#define RRRRRL(p) L(R(R(R(R(R(p))))))
-#define RRRRRR(p) R(R(R(R(R(R(p))))))
-#define LLR(p) R(L(L(p)))
-#define RRR(p) R(R(R(p)))
-#define LLL(p) L(L(L(p)))
-#define LLLL(p) L(L(L(L(p))))
-#define LLLLL(p) L(L(L(L(L(p)))))
-#define LLLLR(p) R(L(L(L(L(p)))))
-#define LLLR(p) R(L(L(L(p))))
-#define RLLR(p) R(L(L(R(p))))
-#define RLLL(p) L(L(L(R(p))))
-#define RLR(p) R(L(R(p)))
-#define RRLL(p) L(L(R(R(p))))
-#define RRLR(p) R(L(R(R(p))))
-
/** Access the Core representation of any node */
#define C(p) ((p)->core)
-------------------------------------------------------------------------
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
