Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2554/mil

Modified Files:
        milgen.brg 
Log Message:
-- Type related fixes that broke the MIL generation for updates.


U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- milgen.brg  4 Apr 2008 15:11:06 -0000       1.129
+++ milgen.brg  5 Apr 2008 13:41:43 -0000       1.130
@@ -433,7 +433,7 @@
 /* fold( TYPE_MASK() / type_bit_check() / impl_types() / implty() definition */
 
 /** @brief ``mask out'' the flags identifying non-attribute nodes */
-#define TYPE_MASK(t)  ((t) & ~(aat_nkind))
+#define TYPE_MASK(t)  ((t) & ~(aat_nkind | aat_nkind1))
 
 /**
  * @brief Check if the algebra type represents only a single type bit
@@ -2455,7 +2455,7 @@
                 );
 
                 /* consider node tgt */
-                if (ty & aat_pnode1)
+                if (ty & aat_nkind)
                     execute (
                         assgn (var (pre_tgt->name),
                                VAR (L(p)->env, pa_item, aat_pre1)),
@@ -2471,7 +2471,7 @@
                                         cast (type (mty_oid), nil()))));
 
                 /* consider attribute tgt */
-                if (ty & aat_anode1)
+                if (ty & aat_attr)
                     execute (
                         assgn (var (attr_tgt->name),
                                VAR (L(p)->env, pa_item, aat_attr1)),
@@ -2526,7 +2526,7 @@
                                         cast (type (mty_str), nil()))));
 
                 /* consider node ins */
-                if (ty & aat_pnode)
+                if (ty & aat_nkind)
                     execute (
                         assgn (var (pre_ins->name),
                                VAR (L(p)->env, pa_item, aat_pre)),
@@ -2542,7 +2542,7 @@
                                         cast (type (mty_oid), nil()))));
 
                 /* consider attribute ins */
-                if (ty & aat_anode)
+                if (ty & aat_attr)
                     execute (
                         assgn (var (attr_ins->name),
                                VAR (L(p)->env, pa_item, aat_attr)),


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to