Changeset: 7acb9494b207 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7acb9494b207
Modified Files:
Branch: sciql
Log Message:
Merge with default branch.
diffs (truncated from 4328 to 300 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -33,7 +33,7 @@
$(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)"
$(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if $(bits)==32 cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
*.vdproj
- if not exist "C:\Program Files (x86)\Microsoft Visual Studio 10.0" if
not exist "C:\Program Files\Microsoft Visual Studio 10.0" cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Format Version 11.00/Format Version
10.00/;s/Visual Studio 2010/Visual Studio 2008/;s/-vs10//;s/_VC100_/_VC90_/"
*.vdproj *.sln
+ if not exist "C:\Program Files (x86)\Microsoft Visual Studio 10.0" if
not exist "C:\Program Files\Microsoft Visual Studio 10.0" cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Format Version 11.00/Format Version
10.00/;s/Visual Studio 2010/Visual Studio
2008/;s/-vs10//;s/_VC100_CRT_x64/_VC90_CRT_x86_x64/;s/_VC100_/_VC90_/" *.vdproj
*.sln
$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
diff --git a/monetdb5/mal/Tests/tst013.stable.out
b/monetdb5/mal/Tests/tst013.stable.out
--- a/monetdb5/mal/Tests/tst013.stable.out
+++ b/monetdb5/mal/Tests/tst013.stable.out
@@ -34,7 +34,7 @@
function user.main():void;
# incomplete barrier blocks. Resolve them when unambigous
barrier z := true;
- leave _4;
+ leave X_4;
exit z;
barrier i := 1;
i := calc.+(i,1);
diff --git a/monetdb5/mal/Tests/tst021.stable.out
b/monetdb5/mal/Tests/tst021.stable.out
--- a/monetdb5/mal/Tests/tst021.stable.out
+++ b/monetdb5/mal/Tests/tst021.stable.out
@@ -23,7 +23,7 @@
# ADT management
d1 := mtime.date("1998-12-01");
io.print(d1);
- d2 := 1998-12-01:date;
+ d2 := "1998-12-01":date;
io.print(d2);
end main;
[ 1998-12-01 ]
diff --git a/monetdb5/mal/Tests/tst1200.stable.out
b/monetdb5/mal/Tests/tst1200.stable.out
--- a/monetdb5/mal/Tests/tst1200.stable.out
+++ b/monetdb5/mal/Tests/tst1200.stable.out
@@ -636,240 +636,240 @@
## test the operations on rules
ma_a := bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- _823 := bat.new(nil:str,nil:int);
-barrier (_827,_828,_829) := bat.newIterator(rule_bat);
- _831 := mtime.month(_829);
- bat.insert(_823,_828,_831);
- redo (_827,_828,_829) := bat.hasMoreElements(rule_bat);
-exit (_827,_828,_829);
- na_a:bat[:str,:int] := _823;
+ X_823 := bat.new(nil:str,nil:int);
+barrier (X_827,X_828,X_829) := bat.newIterator(rule_bat);
+ X_831 := mtime.month(X_829);
+ bat.insert(X_823,X_828,X_831);
+ redo (X_827,X_828,X_829) := bat.hasMoreElements(rule_bat);
+exit (X_827,X_828,X_829);
+ na_a:bat[:str,:int] := X_823;
oa_a := bat.setColumn(na_a,"month");
# [month](rule_bat).bat.setColumn("month"),
- _836 := bat.new(nil:str,nil:int);
-barrier (_838,_839,_840) := bat.newIterator(rule_bat);
- _842 := mtime.weekday(_840);
- bat.insert(_836,_839,_842);
- redo (_838,_839,_840) := bat.hasMoreElements(rule_bat);
-exit (_838,_839,_840);
- pa_a:bat[:str,:int] := _836;
+ X_836 := bat.new(nil:str,nil:int);
+barrier (X_838,X_839,X_840) := bat.newIterator(rule_bat);
+ X_842 := mtime.weekday(X_840);
+ bat.insert(X_836,X_839,X_842);
+ redo (X_838,X_839,X_840) := bat.hasMoreElements(rule_bat);
+exit (X_838,X_839,X_840);
+ pa_a:bat[:str,:int] := X_836;
qa_a := bat.setColumn(pa_a,"weekday");
# [weekday](rule_bat).bat.setColumn("weekday"),
- _847 := bat.new(nil:str,nil:int);
-barrier (_849,_850,_851) := bat.newIterator(rule_bat);
- _853 := mtime.day(_851);
- bat.insert(_847,_850,_853);
- redo (_849,_850,_851) := bat.hasMoreElements(rule_bat);
-exit (_849,_850,_851);
- ra_a:bat[:str,:int] := _847;
+ X_847 := bat.new(nil:str,nil:int);
+barrier (X_849,X_850,X_851) := bat.newIterator(rule_bat);
+ X_853 := mtime.day(X_851);
+ bat.insert(X_847,X_850,X_853);
+ redo (X_849,X_850,X_851) := bat.hasMoreElements(rule_bat);
+exit (X_849,X_850,X_851);
+ ra_a:bat[:str,:int] := X_847;
sa_a := bat.setColumn(ra_a,"day");
# [day](rule_bat).bat.setColumn("day"),
- _858 := bat.new(nil:str,nil:int);
-barrier (_862,_863,_864) := bat.newIterator(rule_bat);
- _866 := mtime.minutes(_864);
- bat.insert(_858,_863,_866);
- redo (_862,_863,_864) := bat.hasMoreElements(rule_bat);
-exit (_862,_863,_864);
- ta_a:bat[:str,:int] := _858;
+ X_858 := bat.new(nil:str,nil:int);
+barrier (X_862,X_863,X_864) := bat.newIterator(rule_bat);
+ X_866 := mtime.minutes(X_864);
+ bat.insert(X_858,X_863,X_866);
+ redo (X_862,X_863,X_864) := bat.hasMoreElements(rule_bat);
+exit (X_862,X_863,X_864);
+ ta_a:bat[:str,:int] := X_858;
ua_a := bat.setColumn(ta_a,"minutes");
io.print("rule_bat,na_a,pa_a,ra_a,ta_a");
va_a := io.print(rule_bat,na_a,pa_a,ra_a,ta_a);
# [minutes](rule_bat).bat.setColumn("minutes"));
bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- _871 := bat.new(nil:str,nil:date);
-barrier (_874,_875,_876) := bat.newIterator(rule_bat);
- _878 := mtime.compute(_876,2001);
- bat.insert(_871,_875,_878);
- redo (_874,_875,_876) := bat.hasMoreElements(rule_bat);
-exit (_874,_875,_876);
- xa_a:bat[:str,:date] := _871;
+ X_871 := bat.new(nil:str,nil:date);
+barrier (X_874,X_875,X_876) := bat.newIterator(rule_bat);
+ X_878 := mtime.compute(X_876,2001);
+ bat.insert(X_871,X_875,X_878);
+ redo (X_874,X_875,X_876) := bat.hasMoreElements(rule_bat);
+exit (X_874,X_875,X_876);
+ xa_a:bat[:str,:date] := X_871;
ya_a := bat.setColumn(xa_a,"2001");
# [compute](rule_bat, 2001).bat.setColumn("2001"),
- _883 := bat.new(nil:str,nil:date);
-barrier (_885,_886,_887) := bat.newIterator(rule_bat);
- _889 := mtime.compute(_887,2001);
- bat.insert(_883,_886,_889);
- redo (_885,_886,_887) := bat.hasMoreElements(rule_bat);
-exit (_885,_886,_887);
- ab_a:bat[:str,:date] := _883;
- _894 := bat.new(nil:str,nil:int);
-barrier (_898,_899,_900) := bat.newIterator(ab_a);
- _902 := mtime.dayofweek(_900);
- bat.insert(_894,_899,_902);
- redo (_898,_899,_900) := bat.hasMoreElements(ab_a);
-exit (_898,_899,_900);
- bb_a:bat[:str,:int] := _894;
- _907 := bat.new(nil:str,nil:str);
-barrier (_909,_910,_911) := bat.newIterator(bb_a);
- _913 := mtime.dayname(_911);
- bat.insert(_907,_910,_913);
- redo (_909,_910,_911) := bat.hasMoreElements(bb_a);
-exit (_909,_910,_911);
- cb_a:bat[:str,:str] := _907;
+ X_883 := bat.new(nil:str,nil:date);
+barrier (X_885,X_886,X_887) := bat.newIterator(rule_bat);
+ X_889 := mtime.compute(X_887,2001);
+ bat.insert(X_883,X_886,X_889);
+ redo (X_885,X_886,X_887) := bat.hasMoreElements(rule_bat);
+exit (X_885,X_886,X_887);
+ ab_a:bat[:str,:date] := X_883;
+ X_894 := bat.new(nil:str,nil:int);
+barrier (X_898,X_899,X_900) := bat.newIterator(ab_a);
+ X_902 := mtime.dayofweek(X_900);
+ bat.insert(X_894,X_899,X_902);
+ redo (X_898,X_899,X_900) := bat.hasMoreElements(ab_a);
+exit (X_898,X_899,X_900);
+ bb_a:bat[:str,:int] := X_894;
+ X_907 := bat.new(nil:str,nil:str);
+barrier (X_909,X_910,X_911) := bat.newIterator(bb_a);
+ X_913 := mtime.dayname(X_911);
+ bat.insert(X_907,X_910,X_913);
+ redo (X_909,X_910,X_911) := bat.hasMoreElements(bb_a);
+exit (X_909,X_910,X_911);
+ cb_a:bat[:str,:str] := X_907;
bat.setColumn(cb_a,"2001");
# [dayname]([dayofweek]([compute](rule_bat,
2001))).bat.setColumn("2001"),
- _918 := bat.new(nil:str,nil:date);
-barrier (_921,_922,_923) := bat.newIterator(rule_bat);
- _925 := mtime.compute(_923,1999);
- bat.insert(_918,_922,_925);
- redo (_921,_922,_923) := bat.hasMoreElements(rule_bat);
-exit (_921,_922,_923);
- eb_a:bat[:str,:date] := _918;
+ X_918 := bat.new(nil:str,nil:date);
+barrier (X_921,X_922,X_923) := bat.newIterator(rule_bat);
+ X_925 := mtime.compute(X_923,1999);
+ bat.insert(X_918,X_922,X_925);
+ redo (X_921,X_922,X_923) := bat.hasMoreElements(rule_bat);
+exit (X_921,X_922,X_923);
+ eb_a:bat[:str,:date] := X_918;
bat.setColumn(eb_a,"1999");
# [compute](rule_bat, 1999).bat.setColumn("1999"),
- _930 := bat.new(nil:str,nil:date);
-barrier (_933,_934,_935) := bat.newIterator(rule_bat);
- _937 := mtime.compute(_935,1999);
- bat.insert(_930,_934,_937);
- redo (_933,_934,_935) := bat.hasMoreElements(rule_bat);
-exit (_933,_934,_935);
- gb_a:bat[:str,:date] := _930;
- _942 := bat.new(nil:str,nil:int);
-barrier (_945,_946,_947) := bat.newIterator(gb_a);
- _949 := mtime.dayofweek(_947);
- bat.insert(_942,_946,_949);
- redo (_945,_946,_947) := bat.hasMoreElements(gb_a);
-exit (_945,_946,_947);
- hb_a:bat[:str,:int] := _942;
- _954 := bat.new(nil:str,nil:str);
-barrier (_956,_957,_958) := bat.newIterator(hb_a);
- _960 := mtime.dayname(_958);
- bat.insert(_954,_957,_960);
- redo (_956,_957,_958) := bat.hasMoreElements(hb_a);
-exit (_956,_957,_958);
- ib_a:bat[:str,:str] := _954;
+ X_930 := bat.new(nil:str,nil:date);
+barrier (X_933,X_934,X_935) := bat.newIterator(rule_bat);
+ X_937 := mtime.compute(X_935,1999);
+ bat.insert(X_930,X_934,X_937);
+ redo (X_933,X_934,X_935) := bat.hasMoreElements(rule_bat);
+exit (X_933,X_934,X_935);
+ gb_a:bat[:str,:date] := X_930;
+ X_942 := bat.new(nil:str,nil:int);
+barrier (X_945,X_946,X_947) := bat.newIterator(gb_a);
+ X_949 := mtime.dayofweek(X_947);
+ bat.insert(X_942,X_946,X_949);
+ redo (X_945,X_946,X_947) := bat.hasMoreElements(gb_a);
+exit (X_945,X_946,X_947);
+ hb_a:bat[:str,:int] := X_942;
+ X_954 := bat.new(nil:str,nil:str);
+barrier (X_956,X_957,X_958) := bat.newIterator(hb_a);
+ X_960 := mtime.dayname(X_958);
+ bat.insert(X_954,X_957,X_960);
+ redo (X_956,X_957,X_958) := bat.hasMoreElements(hb_a);
+exit (X_956,X_957,X_958);
+ ib_a:bat[:str,:str] := X_954;
bat.setColumn(ib_a,"1999");
# [dayname]([dayofweek]([compute](rule_bat,
1999))).bat.setColumn("1999"),
- _965 := bat.new(nil:str,nil:date);
-barrier (_969,_970,_971) := bat.newIterator(rule_bat);
- _973 := mtime.compute(_971,1992);
- bat.insert(_965,_970,_973);
- redo (_969,_970,_971) := bat.hasMoreElements(rule_bat);
-exit (_969,_970,_971);
- kb_a:bat[:str,:date] := _965;
+ X_965 := bat.new(nil:str,nil:date);
+barrier (X_969,X_970,X_971) := bat.newIterator(rule_bat);
+ X_973 := mtime.compute(X_971,1992);
+ bat.insert(X_965,X_970,X_973);
+ redo (X_969,X_970,X_971) := bat.hasMoreElements(rule_bat);
+exit (X_969,X_970,X_971);
+ kb_a:bat[:str,:date] := X_965;
bat.setColumn(kb_a,"1992");
# [compute](rule_bat, 1992).bat.setColumn("1992"),
- _978 := bat.new(nil:str,nil:date);
-barrier (_980,_981,_982) := bat.newIterator(rule_bat);
- _984 := mtime.compute(_982,1992);
- bat.insert(_978,_981,_984);
- redo (_980,_981,_982) := bat.hasMoreElements(rule_bat);
-exit (_980,_981,_982);
- mb_a:bat[:str,:date] := _978;
- _989 := bat.new(nil:str,nil:int);
-barrier (_992,_993,_994) := bat.newIterator(mb_a);
- _996 := mtime.dayofweek(_994);
- bat.insert(_989,_993,_996);
- redo (_992,_993,_994) := bat.hasMoreElements(mb_a);
-exit (_992,_993,_994);
- nb_a:bat[:str,:int] := _989;
- _1001 := bat.new(nil:str,nil:str);
-barrier (_1004,_1005,_1006) := bat.newIterator(nb_a);
- _1008 := mtime.dayname(_1006);
- bat.insert(_1001,_1005,_1008);
- redo (_1004,_1005,_1006) := bat.hasMoreElements(nb_a);
-exit (_1004,_1005,_1006);
- ob_a:bat[:str,:str] := _1001;
+ X_978 := bat.new(nil:str,nil:date);
+barrier (X_980,X_981,X_982) := bat.newIterator(rule_bat);
+ X_984 := mtime.compute(X_982,1992);
+ bat.insert(X_978,X_981,X_984);
+ redo (X_980,X_981,X_982) := bat.hasMoreElements(rule_bat);
+exit (X_980,X_981,X_982);
+ mb_a:bat[:str,:date] := X_978;
+ X_989 := bat.new(nil:str,nil:int);
+barrier (X_992,X_993,X_994) := bat.newIterator(mb_a);
+ X_996 := mtime.dayofweek(X_994);
+ bat.insert(X_989,X_993,X_996);
+ redo (X_992,X_993,X_994) := bat.hasMoreElements(mb_a);
+exit (X_992,X_993,X_994);
+ nb_a:bat[:str,:int] := X_989;
+ X_1001 := bat.new(nil:str,nil:str);
+barrier (X_1004,X_1005,X_1006) := bat.newIterator(nb_a);
+ X_1008 := mtime.dayname(X_1006);
+ bat.insert(X_1001,X_1005,X_1008);
+ redo (X_1004,X_1005,X_1006) := bat.hasMoreElements(nb_a);
+exit (X_1004,X_1005,X_1006);
+ ob_a:bat[:str,:str] := X_1001;
bat.setColumn(ob_a,"1992");
io.print("rule_bat,xa_a,cb_a,eb_a,ib_a,kb_a,ob_a");
qb_a := io.print(rule_bat,xa_a,cb_a,eb_a,ib_a,kb_a,ob_a);
# [dayname]([dayofweek]([compute](rule_bat,
1992))).bat.setColumn("1992"));
rb_a := bat.setColumn(rule_bat,"rule");
#io.print(rule_bat.bat.setColumn("rule"),
- _1013 := bat.new(nil:str,nil:date);
-barrier (_1016,_1017,_1018) := bat.newIterator(rule_bat);
- _1020 := mtime.compute(_1018,1572);
- bat.insert(_1013,_1017,_1020);
- redo (_1016,_1017,_1018) := bat.hasMoreElements(rule_bat);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
