MonetDB: default - Avoid exposing internal type numbering scheme.

[Martin Kersten]

Changeset: 8fc3d232b277 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8fc3d232b277
Modified Files:
        monetdb5/modules/mal/inspect.c
        monetdb5/modules/mal/inspect.h
        monetdb5/modules/mal/inspect.mal
Branch: default
Log Message:

Avoid exposing internal type numbering scheme.


diffs (80 lines):

diff --git a/monetdb5/modules/mal/inspect.c b/monetdb5/modules/mal/inspect.c
--- a/monetdb5/modules/mal/inspect.c
+++ b/monetdb5/modules/mal/inspect.c
@@ -593,29 +593,6 @@ INSPECTshowFunction3(Client cntxt, MalBl
 }
 
 str
-INSPECTtypename(str *ret, int *tpe)
-{
-       *ret = getTypeName(*tpe);
-       return MAL_SUCCEED;
-}
-str
-INSPECTtypeIndex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
-       int *ret;
-
-       (void) cntxt;
-       if( pci->retc== 2){
-               ret = (int *) getArgReference(stk, pci, 0);
-               *ret = getHeadType(getArgType(mb, pci, 2));
-               ret = (int *) getArgReference(stk, pci, 1);
-               *ret = getTailType(getArgType(mb, pci, 2));
-       }else {
-               ret = (int *) getArgReference(stk, pci, 0);
-               *ret = getTailType(getArgType(mb, pci, 1));
-       }
-       return MAL_SUCCEED;
-}
-str
 INSPECTequalType(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        bit *ret;
@@ -650,5 +627,3 @@ INSPECTtypeName(Client cntxt, MalBlkPtr 
                *hn = getTypeName(getArgType(mb, pci, 1));
        return MAL_SUCCEED;
 }
-
-
diff --git a/monetdb5/modules/mal/inspect.h b/monetdb5/modules/mal/inspect.h
--- a/monetdb5/modules/mal/inspect.h
+++ b/monetdb5/modules/mal/inspect.h
@@ -62,9 +62,6 @@ inspect_export str INSPECTatom_sup_names
 inspect_export str INSPECTatom_sizes(int *ret);
 inspect_export str INSPECTshowFunction(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr p);
 inspect_export str INSPECTshowFunction3(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr p);
-inspect_export str INSPECTtypename(str *ret, int *tpe);
-inspect_export str INSPECTtype(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 inspect_export str INSPECTtypeName(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-inspect_export str INSPECTtypeIndex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 inspect_export str INSPECTequalType(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 #endif /* _INSPECT_H */
diff --git a/monetdb5/modules/mal/inspect.mal b/monetdb5/modules/mal/inspect.mal
--- a/monetdb5/modules/mal/inspect.mal
+++ b/monetdb5/modules/mal/inspect.mal
@@ -62,23 +62,10 @@ pattern getSize(mod:str,fcn:str):lng
 address INSPECTgetFunctionSize
 comment "Return the storage size for a function (in bytes).";
 
+
 pattern getType(v:any_1) :str 
 address INSPECTtypeName
 comment "Return the concrete type of a variable (expression).";
-pattern getType(v:bat[:oid,:any_2]) (ht:str, tt:str)
-address INSPECTtypeName
-comment "Return the concrete type of a variable (expression).";
-
-command getTypeName(v:int):str 
-address INSPECTtypename
-comment "Get the type name associated with a type id.";
-pattern getTypeIndex(v:bat[:oid,:any_2]) (ht:int, tt:int)
-address INSPECTtypeIndex
-comment "Return the type index of a BAT head and tail.";
-pattern getTypeIndex(v:any_1):int 
-address INSPECTtypeIndex
-comment "Return the type index of a variable. For BATs, return
-the type index for its tail.";
 
 pattern equalType(l:any, r:any):bit
 address INSPECTequalType
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list