Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25727

Modified Files:
        Makefile.ag sql.h sql_mnemonic.h 
Log Message:

-- Prettyprinting for sql added


Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/Makefile.ag,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile.ag 6 Feb 2007 21:09:08 -0000       1.35
+++ Makefile.ag 5 Mar 2007 18:58:27 -0000       1.36
@@ -85,8 +85,9 @@
        variable.h \
        varscope.h \
        xquery_fo.h \
-   sql.h \
-   sql_mnemonic.h \
-   lalg2sql.h \
-   sqlprint.h
+       sql.h \
+       sql_mnemonic.h \
+       lalg2sql.h \
+       sqlprint.h \
+       prettysql.h
    

Index: sql.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/sql.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sql.h       13 Feb 2007 11:58:11 -0000      1.12
+++ sql.h       5 Mar 2007 18:58:27 -0000       1.13
@@ -169,7 +169,11 @@
    sql_sum              = 63,
    sql_lit_dec          = 64,
    sql_clsc             = 65,
-   sql_expr_list        = 66
+   sql_expr_list        = 66,
+   sql_order           = 67,
+   sql_asc              = 68,
+   sql_desc             = 69,
+   sql_like             = 70
 };
 typedef enum PFsql_kind_t PFsql_kind_t;
 
@@ -362,6 +366,10 @@
 PFsql_t* PFsql_sortkey_expressions_add(const PFsql_t *list,
         const PFsql_t *item);
 
+PFsql_t* PFsql_order(PFsql_t *a, PFsql_t *sort);
+PFsql_t* PFsql_asc();
+PFsql_t* PFsql_desc();
+
 PFsql_t* PFsql_window_clause(const PFsql_t *partcls, const PFsql_t *ordercls);
 
 /*................. Tables ..................*/
@@ -581,6 +589,11 @@
  */
 PFsql_t* PFsql_div(const PFsql_t *a, const PFsql_t *b);
 
+/**
+ * Construct an like operator.
+ */
+PFsql_t* PFsql_like(const PFsql_t *a, const PFsql_t *b);
+
 /*.............. Boolean operator constructors ............ */
 
 /**

Index: sql_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/sql_mnemonic.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sql_mnemonic.h      13 Feb 2007 11:58:11 -0000      1.11
+++ sql_mnemonic.h      5 Mar 2007 18:58:27 -0000       1.12
@@ -73,6 +73,9 @@
 #define sortkey_expressions(...)       PFsql_sortkey_expressions( __VA_ARGS__ )
 #define sortkey_expressions_empty()    PFsql_sortkey_expressions_empty()
 #define sortkey_expressions_add(l, i)  PFsql_sortkey_expressions_add(l, i)
+#define order(a,s)                    PFsql_order(a,s)
+#define asc()                         PFsql_asc()
+#define desc()                        PFsql_desc()
 #define window_clause(p, o)            PFsql_window_clause(p, o)
 
 /*........... Tables .............*/
@@ -161,6 +164,8 @@
 #define mul( a, b )                 PFsql_mul( a, b )
 /** Construct arithmetic `division' operator. */
 #define div( a, b )                 PFsql_div( a, b )
+/** Construct a like operator. */
+#define like( a, b )               PFsql_like( a, b ) 
 
 /*......... Boolean operator constructors .......*/
 


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to