Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5567/modules/mal
Modified Files:
mdb.mx txtsim.mx
Log Message:
Approvals of the changes due to major code patch.
Index: txtsim.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/txtsim.mx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- txtsim.mx 18 Dec 2007 22:34:17 -0000 1.2
+++ txtsim.mx 2 Jan 2008 08:23:18 -0000 1.3
@@ -1034,6 +1034,8 @@
# if (b.count() > 32764) break; # ignore suffix of >32KB strings
# i :+= 1;
# }
+ cnt:= 0:int;
+ id := calc.oid(cnt);
barrier B:= i < len;
sstr := str.string(s,i,1);
bat.insert(b,sstr, nil:oid);
@@ -1053,7 +1055,6 @@
# var c0 := b.select([EMAIL PROTECTED], oid(b.count() - 3)).mark([EMAIL
PROTECTED]).reverse();
cnt := aggr.count(alg);
cnt := calc.-(cnt,3);
- id := calc.oid(cnt);
sel := algebra.select(b, [EMAIL PROTECTED], id);
mrk := algebra.markT(sel, [EMAIL PROTECTED]);
c0 := bat.reverse(mrk);
Index: mdb.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mdb.mx,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- mdb.mx 24 Dec 2007 12:28:24 -0000 1.65
+++ mdb.mx 2 Jan 2008 08:23:18 -0000 1.66
@@ -674,7 +674,7 @@
(void) p;
(void) stk;
- printStack(c->fdout, mb, stk,0);
+ printStack(c->fdout, mb, stk);
return MAL_SUCCEED;
}
@@ -690,7 +690,7 @@
if (s == NULL)
showException(MAL,"mdb.var","Could not find %s.%s", modnme,
fcnnme);
else
- printStack(c->fdout, s->def, (s->def == mb ? stk : 0),0);
+ printStack(c->fdout, s->def, (s->def == mb ? stk : 0));
(void) mb;
return NULL;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
