Changeset: aa29a070b9fe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa29a070b9fe
Removed Files:
monetdb5/modules/mal/language.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/language.c
Branch: oscar
Log Message:
Unexport functions.
diffs (277 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -897,9 +897,6 @@ str CMDbbpbind(Client cntxt, MalBlkPtr m
str CMDbbpgetIndex(int *res, bat *bid);
str CMDcalcavg(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcalcavg(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcleanupTraces(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcloseProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDconvert_bit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -944,7 +941,6 @@ str CMDconvertsignal_str(Client cntxt, M
str CMDconvertsignal_str(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDcpuloadPercentage(int *cycles, int *io, lng *user, lng *nice, lng *sys,
lng *idle, lng *iowait);
str CMDcpustats(lng *user, lng *nice, lng *sys, lng *idle, lng *iowait);
-str CMDevalFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetBATlrefcnt(int *res, bat *bid);
str CMDgetBATrefcnt(int *res, bat *bid);
str CMDgetDiskReads(lng *ret);
@@ -960,8 +956,6 @@ str CMDnoopProfiler(void *res);
str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDqgramnormalize(str *res, str *input);
str CMDqgramselfjoin(bat *res1, bat *res2, bat *qid, bat *bid, bat *pid, bat
*lid, flt *c, int *k);
-str CMDraise(str *ret, str *msg);
-str CMDregisterFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDscience_bat_acos(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDscience_bat_asin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDscience_bat_atan(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
@@ -1110,27 +1104,16 @@ str MACROprocessor(Client cntxt, MalBlkP
int MAL_MAXCLIENTS;
int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, lng argclaim);
void MALadmission_release(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, lng argclaim);
-str MALassertBit(void *ret, bit *val, str *msg);
-str MALassertHge(void *ret, hge *val, str *msg);
-str MALassertInt(void *ret, int *val, str *msg);
-str MALassertLng(void *ret, lng *val, str *msg);
-str MALassertOid(void *ret, oid *val, str *msg);
-str MALassertSht(void *ret, sht *val, str *msg);
-str MALassertStr(void *ret, str *val, str *msg);
-str MALassertTriple(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MALcallback(Client c, str msg);
int MALcommentsOnly(MalBlkPtr mb);
lng MALdebug;
str MALengine(Client c);
str MALexitClient(Client c);
-str MALgarbagesink(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MALinitClient(Client c);
str MALoptimizer(Client c);
str MALparser(Client c);
-str MALpass(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MALpipeline(Client c);
str MALreader(Client c);
-str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
MALfcn MANIFOLDtypecheck(Client cntxt, MalBlkPtr mb, InstrPtr pci, int
checkprops);
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(malmodules OBJECT)
target_sources(malmodules
PRIVATE
- language.c language.h
+ language.c
bbp.c bbp.h
profiler.c profiler.h
batExtensions.c
diff --git a/monetdb5/modules/mal/language.c b/monetdb5/modules/mal/language.c
--- a/monetdb5/modules/mal/language.c
+++ b/monetdb5/modules/mal/language.c
@@ -24,9 +24,15 @@
*/
#include "monetdb_config.h"
-#include "language.h"
+#include "mal.h"
+#include "mal_module.h"
+#include "mal_session.h"
+#include "mal_resolve.h"
+#include "mal_client.h"
+#include "mal_interpreter.h"
+#include "mal_dataflow.h"
-str
+static str
CMDraise(str *ret, str *msg)
{
str res;
@@ -39,21 +45,21 @@ CMDraise(str *ret, str *msg)
return res;
}
-str
+static str
MALassertBit(void *ret, bit *val, str *msg){
(void) ret;
if( *val == 0 || is_bit_nil(*val))
throw(MAL, "mal.assert", "%s", *msg);
return MAL_SUCCEED;
}
-str
+static str
MALassertInt(void *ret, int *val, str *msg){
(void) ret;
if( *val == 0 || is_int_nil(*val))
throw(MAL, "mal.assert", "%s", *msg);
return MAL_SUCCEED;
}
-str
+static str
MALassertLng(void *ret, lng *val, str *msg){
(void) ret;
if( *val == 0 || is_lng_nil(*val))
@@ -61,7 +67,7 @@ MALassertLng(void *ret, lng *val, str *m
return MAL_SUCCEED;
}
#ifdef HAVE_HGE
-str
+static str
MALassertHge(void *ret, hge *val, str *msg){
(void) ret;
if( *val == 0 || is_hge_nil(*val))
@@ -69,21 +75,21 @@ MALassertHge(void *ret, hge *val, str *m
return MAL_SUCCEED;
}
#endif
-str
+static str
MALassertSht(void *ret, sht *val, str *msg){
(void) ret;
if( *val == 0 || is_sht_nil(*val))
throw(MAL, "mal.assert", "%s", *msg);
return MAL_SUCCEED;
}
-str
+static str
MALassertOid(void *ret, oid *val, str *msg){
(void) ret;
if( is_oid_nil(*val))
throw(MAL, "mal.assert", "%s", *msg);
return MAL_SUCCEED;
}
-str
+static str
MALassertStr(void *ret, str *val, str *msg){
(void) ret;
if( *val == str_nil)
@@ -91,7 +97,7 @@ MALassertStr(void *ret, str *val, str *m
return MAL_SUCCEED;
}
-str
+static str
MALassertTriple(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
(void) cntxt;
(void) mb;
@@ -112,7 +118,7 @@ MALassertTriple(Client cntxt, MalBlkPtr
*
* Input redirectionrs
*/
-str
+static str
CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str *s;
@@ -124,7 +130,7 @@ CMDcallString(Client cntxt, MalBlkPtr mb
return callString(cntxt, *s, FALSE);
}
-str
+static str
CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str mod = *getArgReference_str(stk,pci,1);
@@ -139,7 +145,7 @@ CMDcallFunction(Client cntxt, MalBlkPtr
return callString(cntxt, buf, FALSE);
}
-str
+static str
MALstartDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
bit *ret = getArgReference_bit(stk,pci,0);
@@ -155,7 +161,7 @@ MALstartDataflow( Client cntxt, MalBlkPt
* Garbage collection over variables can be postponed by grouping
* all dependent ones in a single sink() instruction.
*/
-str
+static str
MALgarbagesink( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
@@ -165,7 +171,7 @@ MALgarbagesink( Client cntxt, MalBlkPtr
return MAL_SUCCEED;
}
-str
+static str
MALpass( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
@@ -175,7 +181,7 @@ MALpass( Client cntxt, MalBlkPtr mb, Mal
return MAL_SUCCEED;
}
-str
+static str
CMDregisterFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
Symbol sym= NULL;
@@ -209,7 +215,7 @@ CMDregisterFunction(Client cntxt, MalBlk
}
return msg;
}
-str
+static str
CMDevalFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str s = *getArgReference_str(stk,pci,1);
@@ -236,7 +242,7 @@ CMDevalFile(Client cntxt, MalBlkPtr mb,
* Calling a BAT is simply translated into a concatenation of
* all the unquoted strings and then passing it to the callEval.
*/
-str
+static str
CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
diff --git a/monetdb5/modules/mal/language.h b/monetdb5/modules/mal/language.h
deleted file mode 100644
--- a/monetdb5/modules/mal/language.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
- */
-
-/*
- * @+ Dummy code
- */
-#ifndef _LANGUAGE_H
-#define _LANGUAGE_H
-#include "mal.h"
-#include "mal_module.h"
-#include "mal_session.h"
-#include "mal_resolve.h"
-#include "mal_client.h"
-#include "mal_interpreter.h"
-#include "mal_dataflow.h"
-
-mal_export str CMDraise(str *ret, str *msg);
-mal_export str MALassertBit(void *ret, bit *val, str *msg);
-mal_export str MALassertStr(void *ret, str *val, str *msg);
-mal_export str MALassertOid(void *ret, oid *val, str *msg);
-mal_export str MALassertSht(void *ret, sht *val, str *msg);
-mal_export str MALassertInt(void *ret, int *val, str *msg);
-mal_export str MALassertLng(void *ret, lng *val, str *msg);
-#ifdef HAVE_HGE
-mal_export str MALassertHge(void *ret, hge *val, str *msg);
-#endif
-mal_export str MALstartDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-mal_export str MALpass( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-mal_export str MALgarbagesink( Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-mal_export str CMDregisterFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-mal_export str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-mal_export str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-mal_export str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-mal_export str CMDevalFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-mal_export str MALassertTriple(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-#endif /* _LANGUAGE_H */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
