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

Modified Files:
        sql.h sql_mnemonic.h 
Log Message:
-- operator conderr added
-- operator boot_not added
-- refactoring some structures



Index: sql.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/sql.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sql.h       9 Feb 2007 08:08:58 -0000       1.11
+++ sql.h       13 Feb 2007 11:58:11 -0000      1.12
@@ -182,7 +182,6 @@
     } type;
     struct {
         PFsql_ident_t ident;
-        struct PFsql_t    *clmn_list;
     } tablename;
     struct {
         char *str;
@@ -196,10 +195,6 @@
     struct {
         bool distinct;                  /**< No equal tuples in result
                                              relation */
-        struct PFsql_t   *select_list;  /**< Select list. */
-        struct PFsql_t   *from_list;    /**< Select from list. */
-        struct PFsql_t   *where_list;   /**< Select where list. */
-        struct PFsql_t   *grpby_list;   /**< Select group by list. */
     } select;
     struct {
          bool distinct;
@@ -226,7 +221,7 @@
 typedef union PFsql_sem_t PFsql_sem_t; 
 
 /** Each node has at most for childs */
-#define PFSQL_OP_MAXCHILD  3 
+#define PFSQL_OP_MAXCHILD  4 
 
 /**
  * SQL operator node.

Index: sql_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/sql_mnemonic.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sql_mnemonic.h      9 Feb 2007 08:08:58 -0000       1.10
+++ sql_mnemonic.h      13 Feb 2007 11:58:11 -0000      1.11
@@ -171,10 +171,10 @@
 /** Construct boolean `equal' operator.  */
 #define eq( a, b )                  PFsql_eq( a, b )
 /** Construct boolean `not' operator. */
-#define not( a, b )                 PFsql_not( a, b )
+#define not_( a )                 PFsql_not( a )
 /** Construct a boolean `and' operator. */
-#define and( a, b )                 PFsql_and( a, b )
+#define and_( a, b )                 PFsql_and( a, b )
 /** Construct a boolean `or' operator. */
-#define or( a, b )                  PFsql_or( a, b )
+#define or_( a, b )                  PFsql_or( a, b )
 
 #endif /* __SQL_MNEMONIC_H__ */


-------------------------------------------------------------------------
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

Reply via email to