Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14645/compiler/mil
Modified Files:
Tag: PF_ROX
mil.c milgen.brg milprint.c milprint_summer.c
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the development trunk to the PF_ROX branch
Index: milprint.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint.c,v
retrieving revision 1.62.2.1
retrieving revision 1.62.2.2
diff -u -d -r1.62.2.1 -r1.62.2.2
--- milprint.c 9 Feb 2008 08:40:34 -0000 1.62.2.1
+++ milprint.c 18 Feb 2008 16:57:32 -0000 1.62.2.2
@@ -526,12 +526,12 @@
#endif
/**
- * Implementation of the grammar rules for `statements'.
+ * @brief Implementation of the grammar rules for `statements'.
*
* @param n MIL tree node
*/
static void
-print_statements (PFmil_t * n)
+print_statements (PFmil_t *n)
{
switch (n->kind) {
Index: mil.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/mil.c,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -d -r1.49.2.1 -r1.49.2.2
--- mil.c 9 Feb 2008 08:40:33 -0000 1.49.2.1
+++ mil.c 18 Feb 2008 16:57:31 -0000 1.49.2.2
@@ -198,7 +198,7 @@
* (The result will be a MIL leaf node, with kind #m_lit_lng and
* semantic value @a i.)
*
- * @param i The integer value to represent in MIL
+ * @param l The long integer value to represent in MIL
*/
PFmil_t *
PFmil_lit_lng (long long int l)
@@ -300,6 +300,8 @@
case PF_MIL_VAR_KIND_PI: return "PI";
case PF_MIL_VAR_KIND_REF: return "REFERENCE";
+ case PF_MIL_VAR_GENTYPE: return "genType";
+
case PF_MIL_VAR_ATTR: return "ATTR";
case PF_MIL_VAR_ELEM: return "ELEM";
@@ -323,6 +325,7 @@
case PF_MIL_VAR_ATTR_CONT: return "ATTR_CONT";
case PF_MIL_VAR_QN_LOC: return "QN_LOC";
case PF_MIL_VAR_QN_URI: return "QN_URI";
+ case PF_MIL_VAR_QN_URI_LOC: return "QN_URI_LOC";
case PF_MIL_VAR_QN_PREFIX: return "QN_PREFIX";
case PF_MIL_VAR_PROP_VAL: return "PROP_VAL";
case PF_MIL_VAR_PROP_TEXT: return "PROP_TEXT";
@@ -560,12 +563,14 @@
*
* Example:
*
- * void | int void | int void | int
- * ------+----- append ------+----- = ------+-----
- * [EMAIL PROTECTED] | 10 [EMAIL PROTECTED] | 20 [EMAIL
PROTECTED] | 10
- * [EMAIL PROTECTED] | 11 [EMAIL PROTECTED] | 21 [EMAIL
PROTECTED] | 11
- * [EMAIL PROTECTED] | 20
- * [EMAIL PROTECTED] | 21
+ * @verbatim
+ void | int void | int void | int
+ ------+----- append ------+----- = ------+-----
+ [EMAIL PROTECTED] | 10 [EMAIL PROTECTED] | 20 [EMAIL
PROTECTED] | 10
+ [EMAIL PROTECTED] | 11 [EMAIL PROTECTED] | 21 [EMAIL
PROTECTED] | 11
+ [EMAIL PROTECTED] | 20
+ [EMAIL PROTECTED] | 21
+ @endverbatim
*/
PFmil_t *
PFmil_bappend (const PFmil_t *dest, const PFmil_t *src)
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.103.2.1
retrieving revision 1.103.2.2
diff -u -d -r1.103.2.1 -r1.103.2.2
--- milgen.brg 9 Feb 2008 08:40:34 -0000 1.103.2.1
+++ milgen.brg 18 Feb 2008 16:57:31 -0000 1.103.2.2
@@ -1,9 +1,56 @@
/* -*- c-basic-offset:4; c-indentation-style:"k&r"; indent-tabs-mode:nil -*- */
-%{
-
-/*
- * Compile physical algebra tree into a MIL program.
+/**
+ * @file
*
+ * @brief Compile physical algebra tree into a MIL program
+ * (see also the @ref milgenDetail page).
+ *
[...10206 lines suppressed...]
var (PF_MIL_VAR_TIME_LOAD)),
lit_dbl (1000.0))),
assgn (var (PF_MIL_VAR_TIME_QUERY),
- div (
+ div_ (
cast (type (mty_dbl),
var (PF_MIL_VAR_TIME_QUERY)),
lit_dbl (1000.0))),
assgn (var (PF_MIL_VAR_TIME_PRINT),
- div (
+ div_ (
cast (type (mty_dbl),
var (PF_MIL_VAR_TIME_PRINT)),
lit_dbl (1000.0))));
@@ -9231,4 +8976,4 @@
return milprog;
}
-/* vim:set shiftwidth=4 expandtab filetype=c: */
+/* vim:set shiftwidth=4 expandtab filetype=c foldmarker=fold(,fold)
foldmethod=marker foldopen-=search: */
Index: milprint_summer.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint_summer.c,v
retrieving revision 1.409
retrieving revision 1.409.4.1
diff -u -d -r1.409 -r1.409.4.1
--- milprint_summer.c 11 Jan 2008 10:47:10 -0000 1.409
+++ milprint_summer.c 18 Feb 2008 16:57:34 -0000 1.409.4.1
@@ -79,38 +79,20 @@
/* accessor to the type of the node */
#define TY(p) ((p)->type)
+/* Easily access subtree-parts */
+#include "child_mnemonic.h"
+
/*
* 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 a step down */
#define D(p) (LEFT_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))
/** starting from p, make a step right, then a step down */
#define RD(p) D(R(p))
/** starting from p, make a step down, then a step left */
#define DL(p) L(L(p))
/* ... and so on ... */
#define DRL(p) L(R(L(p)))
-#define RLL(p) L(L(R(p)))
-#define RRL(p) L(R(R(p)))
-#define RLR(p) R(L(R(p)))
-#define LLR(p) R(L(L(p)))
-#define RRR(p) R(R(R(p)))
-#define LLL(p) L(L(L(p)))
-
-#define RRRL(p) L(R(R(R(p))))
-#define RRRRL(p) L(R(R(R(R(p)))))
/* starting level of user-defined functions */
#define UDF_LEV 1024
-------------------------------------------------------------------------
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
