Changeset: 4885db4269cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4885db4269cf
Added Files:
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/01_batcalc.mal.sh
monetdb5/modules/mal/01_calc.mal
monetdb5/modules/mal/01_calc.mal.sh
Removed Files:
monetdb5/modules/mal/batcalc.mal
monetdb5/modules/mal/batcalc.mal.sh
monetdb5/modules/mal/calc.mal
monetdb5/modules/mal/calc.mal.sh
Modified Files:
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/mal_init.mal
Branch: int128
Log Message:
rename {,bat}calc.mal{,.sh} to 01_{,bat}calc.mal{,.sh}
and install 01_{,bat}calc.mal in PREFIX/lib/monetdb5/autoload/
in order to define <= 64-bit (<=lng) and 128-bit (hge) signatures
in the proper order to not mess-up MAL function resolution
diffs (88 lines):
diff --git a/monetdb5/modules/mal/batcalc.mal
b/monetdb5/modules/mal/01_batcalc.mal
rename from monetdb5/modules/mal/batcalc.mal
rename to monetdb5/modules/mal/01_batcalc.mal
--- a/monetdb5/modules/mal/batcalc.mal
+++ b/monetdb5/modules/mal/01_batcalc.mal
@@ -15,7 +15,7 @@
# Copyright August 2008-2013 MonetDB B.V.
# All Rights Reserved.
-# This file was generated by using the script batcalc.mal.sh.
+# This file was generated by using the script 01_batcalc.mal.sh.
module batcalc;
diff --git a/monetdb5/modules/mal/batcalc.mal.sh
b/monetdb5/modules/mal/01_batcalc.mal.sh
rename from monetdb5/modules/mal/batcalc.mal.sh
rename to monetdb5/modules/mal/01_batcalc.mal.sh
diff --git a/monetdb5/modules/mal/calc.mal b/monetdb5/modules/mal/01_calc.mal
rename from monetdb5/modules/mal/calc.mal
rename to monetdb5/modules/mal/01_calc.mal
--- a/monetdb5/modules/mal/calc.mal
+++ b/monetdb5/modules/mal/01_calc.mal
@@ -15,7 +15,7 @@
# Copyright August 2008-2013 MonetDB B.V.
# All Rights Reserved.
-# This file was generated by using the script calc.mal.sh.
+# This file was generated by using the script 01_calc.mal.sh.
module calc;
diff --git a/monetdb5/modules/mal/calc.mal.sh
b/monetdb5/modules/mal/01_calc.mal.sh
rename from monetdb5/modules/mal/calc.mal.sh
rename to monetdb5/modules/mal/01_calc.mal.sh
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -81,14 +81,15 @@ headers_mal = {
txtsim.mal recycle.mal \
cluster.mal trader.mal \
tokenizer.mal zorder.mal sample.mal json_util.mal \
- calc.mal batcalc.mal batmtime.mal querylog.mal sysmon.mal
+ batmtime.mal querylog.mal sysmon.mal
}
headers_hge = {
COND = HAVE_HGE
HEADERS = mal
DIR = libdir/monetdb5/autoload
- SOURCES = 00_calc_hge.mal 00_batcalc_hge.mal \
+ SOURCES = 01_calc.mal 01_batcalc.mal \
+ 00_calc_hge.mal 00_batcalc_hge.mal \
00_cluster_hge.mal 00_iterator_hge.mal 00_language_hge.mal \
00_mal_mapi_hge.mal 00_mkey_hge.mal 00_pqueue_hge.mal
}
@@ -97,8 +98,9 @@ EXTRA_DIST = batExtensions.mal iterator.
groupby.mal mal_init.mal manual.mal mkey.mal pcre.mal \
profiler.mal recycle.mal remote.mal sabaoth.mal trader.mal \
transaction.mal txtsim.mal tablet.mal tablet.h sample.mal json_util.mal
\
- mal_mapi.mal mat.mal tokenizer.mal pqueue.mal calc.mal \
- batcalc.mal batmtime.mal querylog.mal sysmon.mal \
+ mal_mapi.mal mat.mal tokenizer.mal pqueue.mal \
+ batmtime.mal querylog.mal sysmon.mal \
+ 01_calc.mal 01_batcalc.mal \
00_calc_hge.mal 00_batcalc_hge.mal \
00_cluster_hge.mal 00_iterator_hge.mal 00_language_hge.mal \
00_mal_mapi_hge.mal 00_mkey_hge.mal 00_pqueue_hge.mal
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -47,7 +47,7 @@ include streams;
include bat5;
include batExtensions;
include algebra;
-include calc;
+#include calc; --- moved to autoload/01_calc
include status;
include group;
include aggr;
@@ -74,7 +74,7 @@ include batxml;
# @-
# The hardwired multiplex extensions
include batmmath;
-include batcalc;
+#include batcalc; -- moved to autoload/01_batcalc
include batmtime;
include batstr;
include batcolor;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
