Changeset: 5823970bd9ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5823970bd9ee
Modified Files:
geom/monetdb5/30_geom.mal
monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
monetdb5/extras/rapi/50_rapi.mal
monetdb5/extras/sphinx/30_sphinx.mal
monetdb5/mal/mal_parser.c
sql/backends/monet5/40_sql.mal
sql/backends/monet5/LSST/80_lsst.mal
sql/backends/monet5/generator/90_generator.mal
sql/backends/monet5/gsl/73_gsl.mal
sql/backends/monet5/vaults/bam/85_bam.mal
sql/backends/monet5/vaults/fits/72_fits.mal
sql/backends/monet5/vaults/lidar/75_lidar.mal
sql/backends/monet5/vaults/netcdf/74_netcdf.mal
sql/backends/monet5/vaults/shp/75_shp.mal
Branch: default
Log Message:
Remove obsolete Library command
Libraries were loaded both by an explicit library call
and using the include file name (which contains the MAL signatures).
The former option is removed.
diffs (165 lines):
diff --git a/geom/monetdb5/30_geom.mal b/geom/monetdb5/30_geom.mal
--- a/geom/monetdb5/30_geom.mal
+++ b/geom/monetdb5/30_geom.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/GIS module
-library geom;
include geom;
diff --git a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
--- a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
+++ b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the opt_sql_append optimizer module
-library opt_sql_append;
include opt_sql_append;
diff --git a/monetdb5/extras/rapi/50_rapi.mal b/monetdb5/extras/rapi/50_rapi.mal
--- a/monetdb5/extras/rapi/50_rapi.mal
+++ b/monetdb5/extras/rapi/50_rapi.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/RAPI module
-library rapi;
include rapi;
diff --git a/monetdb5/extras/sphinx/30_sphinx.mal
b/monetdb5/extras/sphinx/30_sphinx.mal
--- a/monetdb5/extras/sphinx/30_sphinx.mal
+++ b/monetdb5/extras/sphinx/30_sphinx.mal
@@ -4,5 +4,4 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-library sphinx;
include sphinx;
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -927,33 +927,6 @@ parseAtom(Client cntxt)
return "";
}
-static str
-parseLibrary(Client cntxt)
-{
- str libnme = 0, s;
- int l;
- char *nxt;
- ValRecord cst;
-
- nxt = CURRENT(cntxt);
- if ((l = idLength(cntxt)) <= 0) {
- if ((l = cstToken(cntxt, &cst)) && cst.vtype == TYPE_str) {
- advance(cntxt, l);
- libnme = putNameLen(nxt + 1, l - 2);
- } else
- return parseError(cntxt, "<library name> or <library
path> expected\n");
- } else
- libnme = putNameLen(nxt, l);
- s = loadLibrary(libnme, TRUE);
- (void) putNameLen(nxt, l);
- if (s){
- mnstr_printf(cntxt->fdout, "#WARNING: %s\n", s);
- GDKfree(s);
- }
- advance(cntxt, l);
- return "";
-}
-
/*
* It might be handy to clone a module.
* It gets a copy of all functions known at the point of creation.
@@ -1872,10 +1845,6 @@ parseMAL(Client cntxt, Symbol curPrg, in
continue;
goto allLeft;
case 'L': case 'l':
- if (MALkeyword(cntxt, "library", 7)) {
- parseLibrary(cntxt);
- continue;
- }
if (MALkeyword(cntxt, "leave", 5))
cntrl = LEAVEsymbol;
goto allLeft;
diff --git a/sql/backends/monet5/40_sql.mal b/sql/backends/monet5/40_sql.mal
--- a/sql/backends/monet5/40_sql.mal
+++ b/sql/backends/monet5/40_sql.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
-library sql;
include sql;
diff --git a/sql/backends/monet5/LSST/80_lsst.mal
b/sql/backends/monet5/LSST/80_lsst.mal
--- a/sql/backends/monet5/LSST/80_lsst.mal
+++ b/sql/backends/monet5/LSST/80_lsst.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
-library lsst;
include lsst;
diff --git a/sql/backends/monet5/generator/90_generator.mal
b/sql/backends/monet5/generator/90_generator.mal
--- a/sql/backends/monet5/generator/90_generator.mal
+++ b/sql/backends/monet5/generator/90_generator.mal
@@ -4,5 +4,4 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-library generator;
include generator;
diff --git a/sql/backends/monet5/gsl/73_gsl.mal
b/sql/backends/monet5/gsl/73_gsl.mal
--- a/sql/backends/monet5/gsl/73_gsl.mal
+++ b/sql/backends/monet5/gsl/73_gsl.mal
@@ -4,5 +4,4 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-library gsl;
include gsl;
diff --git a/sql/backends/monet5/vaults/bam/85_bam.mal
b/sql/backends/monet5/vaults/bam/85_bam.mal
--- a/sql/backends/monet5/vaults/bam/85_bam.mal
+++ b/sql/backends/monet5/vaults/bam/85_bam.mal
@@ -4,5 +4,4 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-library bam;
include bam;
diff --git a/sql/backends/monet5/vaults/fits/72_fits.mal
b/sql/backends/monet5/vaults/fits/72_fits.mal
--- a/sql/backends/monet5/vaults/fits/72_fits.mal
+++ b/sql/backends/monet5/vaults/fits/72_fits.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
-library fits;
include fits;
diff --git a/sql/backends/monet5/vaults/lidar/75_lidar.mal
b/sql/backends/monet5/vaults/lidar/75_lidar.mal
--- a/sql/backends/monet5/vaults/lidar/75_lidar.mal
+++ b/sql/backends/monet5/vaults/lidar/75_lidar.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
-library lidar;
include lidar;
diff --git a/sql/backends/monet5/vaults/netcdf/74_netcdf.mal
b/sql/backends/monet5/vaults/netcdf/74_netcdf.mal
--- a/sql/backends/monet5/vaults/netcdf/74_netcdf.mal
+++ b/sql/backends/monet5/vaults/netcdf/74_netcdf.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
-library netcdf;
include netcdf;
diff --git a/sql/backends/monet5/vaults/shp/75_shp.mal
b/sql/backends/monet5/vaults/shp/75_shp.mal
--- a/sql/backends/monet5/vaults/shp/75_shp.mal
+++ b/sql/backends/monet5/vaults/shp/75_shp.mal
@@ -5,5 +5,4 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the shapefile module
-library shp;
include shp;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
