Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6885/compiler/include
Modified Files:
logical.h logical_mnemonic.h physical.h physical_mnemonic.h
Log Message:
* Added the correct mil implementation for the error operator.
Basically it checks at runtime if the BAT with the error message strings is
empty or not. If it is not empty, only one error is produced by fetching
the first row of the BAT.
* Added semantics for the error operator. That actually changed the signature
of the PFla_error and PFpa_error functions so alot of files had to adjust
to these changes. We use the same semantics structure as the cond_err
operator but disregard the sem.err.str part.
Index: physical_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/physical_mnemonic.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- physical_mnemonic.h 14 Dec 2007 12:02:35 -0000 1.26
+++ physical_mnemonic.h 19 Dec 2007 22:39:10 -0000 1.27
@@ -178,7 +178,7 @@
/** empty fragment list */
#define empty_frag() PFpa_empty_frag ()
-#define error(a) PFpa_error ((a))
+#define error(a,b) PFpa_error ((a), (b))
#define cond_err(a,b,c,d) PFpa_cond_err ((a), (b), (c), (d))
#define nil() PFpa_nil ()
#define trace(a,b,c,d) PFpa_trace ((a),(b),(c),(d))
Index: logical_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/logical_mnemonic.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- logical_mnemonic.h 17 Dec 2007 14:15:22 -0000 1.32
+++ logical_mnemonic.h 19 Dec 2007 22:39:09 -0000 1.33
@@ -201,7 +201,7 @@
#define empty_frag() PFla_empty_frag ()
/* error operator */
-#define error(a) PFla_error ((a))
+#define error(a, b) PFla_error ((a), (b))
/* conditional error operator */
#define cond_err(a,b,c,d) PFla_cond_err ((a),(b),(c),(d))
Index: physical.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/physical.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- physical.h 14 Dec 2007 12:02:35 -0000 1.34
+++ physical.h 19 Dec 2007 22:39:09 -0000 1.35
@@ -341,10 +341,12 @@
PFalg_att_t item2; /**< name of the second item column */
} iter_item1_item2;
- /* semantic content for conditional error */
+ /* semantic content for error and conditional error */
struct {
- PFalg_att_t att; /**< name of the boolean attribute */
- char * str; /**< error message */
+ /* error: column of error message
+ * cond_error: name of the boolean attribute */
+ PFalg_att_t att;
+ char * str; /**< error message, only used by cond_err */
} err;
/* semantic content for debug relation map operator */
@@ -869,7 +871,7 @@
/**
* Constructor for error
*/
-PFpa_op_t * PFpa_error (const PFpa_op_t *n);
+PFpa_op_t * PFpa_error (const PFpa_op_t *n, PFalg_att_t att);
/**
* Constructor for conditional error
Index: logical.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/logical.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- logical.h 19 Dec 2007 16:06:35 -0000 1.49
+++ logical.h 19 Dec 2007 22:39:09 -0000 1.50
@@ -418,15 +418,12 @@
PFalg_att_t item_res; /**< item column of result relation */
} merge_adjacent;
- /* semantic content for error */
- struct {
- PFalg_att_t att; /**< column with the error msg */
- } error;
-
- /* semantic content for conditional error */
+ /* semantic content for error and conditional error */
struct {
- PFalg_att_t att; /**< name of the boolean attribute */
- char * str; /**< error message */
+ /* error: column of error message
+ * cond_error: name of the boolean attribute */
+ PFalg_att_t att;
+ char * str; /**< error message, only used by cond_err */
} err;
/* semantic content for debug relation map operator */
@@ -1105,7 +1102,7 @@
/**
* Constructor for error
*/
-PFla_op_t * PFla_error (const PFla_op_t *n);
+PFla_op_t * PFla_error (const PFla_op_t *n, PFalg_att_t att);
/**
* Constructor for conditional error
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
