Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25725/compiler/mil
Modified Files:
milgen.brg
Log Message:
propagated changes of Wednesday Mar 18 2009
from the Feb2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/03/18 - jflokstra: compiler/mil/milgen.brg,1.201.2.10
try to fix [ monetdb-Bugs-2690141 ] tokenize() fails when applied to the result
of concat()
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- milgen.brg 13 Mar 2009 17:48:41 -0000 1.210
+++ milgen.brg 18 Mar 2009 09:45:00 -0000 1.211
@@ -10315,13 +10315,25 @@
lit_int(4)) ) ) );
env_add (p->env, fc_item_a, aat_int, new_item);
}
-
- /* copy the pos bat */
PFalg_simple_type_t postype = op1->schema.items[1].type;
- mvar_t *p_pos = env_mvar (
+ /* now copy the pos bat */
+ mvar_t *p_pos = env_mvar_unsafe (
+ op1->env,
+ op1->schema.items[1].name /* pos */,
+ postype);
+ if ( !p_pos && (postype & aat_pre) ) {
+ /* it must be a polymorpic pos, try it with only
aat_pre as type */
+ p_pos = env_mvar (
+ op1->env,
+ op1->schema.items[1].name /* pos */,
+ aat_pre);
+ } else {
+ /* make it generate the original error */
+ p_pos = env_mvar(
op1->env,
op1->schema.items[1].name /* pos */,
postype);
+ }
pin(p_pos,1);
env_add (p->env, fc_pos_a, aat_nat, p_pos);
} else if (strcmp(fcname,PFT_INFO) == 0 ) {
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
