MonetDB: default - Macro fixes

[Martin Kersten]

Changeset: e6e4dd4e13cb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6e4dd4e13cb
Modified Files:
        geom/monetdb5/geom.mal
        monetdb5/mal/Tests/tst201.malC
Branch: default
Log Message:

Macro fixes


diffs (58 lines):

diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -396,11 +396,11 @@ function MakeEnvelope(xmin:dbl, ymin:dbl
 end MakeEnvelope;
 
 function MakePolygon(external:wkb) :wkb;
-       x := Polygon(external, nil:bat, 0);
+       x := Polygon(external, nil:bat[:wkb], 0);
        return x;
 end MakePolygon;
 function MakePolygon(external:wkb, srid:int) :wkb;
-       x := Polygon(external, nil:bat, srid);
+       x := Polygon(external, nil:bat[:wkb], srid);
        return x;
 end MakePolygon;
 #function MakePolygon(external:wkb, internal:bat[:wkb]) :wkb;
@@ -614,15 +614,15 @@ end GeometryType2;
 command MakePointXYZM(x:bat[:dbl], y:bat[:dbl], z:bat[:dbl], m:bat[:dbl], 
zmFlag:int) :bat[:wkb] address wkbMakePoint_bat
 comment "creates a point using the coordinates";
 function MakePoint(x:bat[:dbl], y:bat[:dbl]) :bat[:wkb];
-       p := MakePointXYZM(x, y, nil:bat, nil:bat, 0);
+       p := MakePointXYZM(x, y, nil:bat[:dbl], nil:bat, 0);
        return p;
 end MakePoint;
 function MakePoint(x:bat[:dbl], y:bat[:dbl], z:bat[:dbl]) :bat[:wkb];
-       p := MakePointXYZM(x, y, z, nil:bat, 10);
+       p := MakePointXYZM(x, y, z, nil:bat[:dbl], 10);
        return p;
 end MakePoint;
 function MakePointM(x:bat[:dbl], y:bat[:dbl], m:bat[:dbl]) :bat[:wkb];
-       p := MakePointXYZM(x, y, nil:bat, m, 1);
+       p := MakePointXYZM(x, y, nil:bat[:dbl], m, 1);
        return p;
 end MakePointM;
 function MakePoint(x:bat[:dbl], y:bat[:dbl], z:bat[:dbl], m:bat[:dbl]) 
:bat[:wkb];
diff --git a/monetdb5/mal/Tests/tst201.malC b/monetdb5/mal/Tests/tst201.malC
--- a/monetdb5/mal/Tests/tst201.malC
+++ b/monetdb5/mal/Tests/tst201.malC
@@ -63,14 +63,14 @@ exit  MALException;
        v45:= algebra.slice(b,v43,v44);
        v46:= io.print(v45);
 
-       v75:= algebra.likesubselect(b, nil:bat, "ox", nil:str, false, false);
+       v75:= algebra.likesubselect(b, nil:bat[:oid], "ox", nil:str, false, 
false);
        v76:= io.print(v75);
 
-       v78:= algebra.likesubselect(b, nil:bat, "fo", nil:str, false, false);
+       v78:= algebra.likesubselect(b, nil:bat[:oid], "fo", nil:str, false, 
false);
        v79:= io.print(v78);
 
-       v81:= algebra.likesubselect(b, nil:bat, "fox", nil:str, false, false);
+       v81:= algebra.likesubselect(b, nil:bat[:oid], "fox", nil:str, false, 
false);
        v82:= io.print(v81);
 
-       v84:= algebra.likesubselect(b, nil:bat, " fox", nil:str, false, false);
+       v84:= algebra.likesubselect(b, nil:bat[:oid], " fox", nil:str, false, 
false);
        v85:= io.print(v84);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list