Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26776/compiler/include
Modified Files:
sql.h sql_mnemonic.h
Log Message:
coalesce operator and expressionlist added
Index: sql.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/sql.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sql.h 4 Feb 2007 12:15:06 -0000 1.10
+++ sql.h 9 Feb 2007 08:08:58 -0000 1.11
@@ -167,7 +167,9 @@
sql_outr_join = 62,
sql_rght_outr_join = 62,
sql_sum = 63,
- sql_lit_dec = 64
+ sql_lit_dec = 64,
+ sql_clsc = 65,
+ sql_expr_list = 66
};
typedef enum PFsql_kind_t PFsql_kind_t;
@@ -325,6 +327,8 @@
/*............ Aggregat Functions ............*/
+PFsql_t* PFsql_coalesce(PFsql_t *expr);
+
PFsql_t* PFsql_count(bool dist, const PFsql_t *expr);
PFsql_t* PFsql_max(const PFsql_t *clmn);
@@ -488,6 +492,12 @@
{__VA_ARGS__})
PFsql_t* PFsql_from_list_(unsigned int count, const PFsql_t **list);
+#define PFsql_expression_list(...) \
+PFsql_expression_list_(sizeof((PFsql_t *[]) {__VA_ARGS__}) / \
+ sizeof(PFsql_t*), (const PFsql_t *[]) \
+ {__VA_ARGS__})
+PFsql_t* PFsql_expression_list_(unsigned int count, const PFsql_t **list);
+
/**
* Create an empty from_list.
*/
Index: sql_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/sql_mnemonic.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sql_mnemonic.h 4 Feb 2007 12:15:06 -0000 1.9
+++ sql_mnemonic.h 9 Feb 2007 08:08:58 -0000 1.10
@@ -57,6 +57,7 @@
#define seq( si, ce ) PFsql_seq( si, ce )
/*............ SQL aggregat functions ............*/
+#define coalesce (e) PFsql_coalesce(e)
#define count(b, e) PFsql_count(b, e)
#define max( c ) PFsql_max( c )
#define sum( c ) PFsql_sum( c )
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
