Changeset: 228cc23f4c56 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=228cc23f4c56
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/language.c
monetdb5/modules/mal/language.h
monetdb5/modules/mal/language.mal
Branch: int128
Log Message:
added int128 / "hge" support in monetdb5/modules/mal/language.*
diffs (55 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
@@ -1514,6 +1514,7 @@ str MACROprocessor(Client cntxt, MalBlkP
int MAL_MAXCLIENTS;
int MALadmission(lng argclaim, lng hotclaim);
str MALassertBit(int *ret, bit *val, str *msg);
+str MALassertHge(int *ret, hge *val, str *msg);
str MALassertInt(int *ret, int *val, str *msg);
str MALassertLng(int *ret, lng *val, str *msg);
str MALassertOid(int *ret, oid *val, str *msg);
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
@@ -64,6 +64,15 @@ MALassertLng(int *ret, lng *val, str *ms
throw(MAL, "mal.assert", "%s", *msg);
return MAL_SUCCEED;
}
+#ifdef HAVE_HGE
+str
+MALassertHge(int *ret, hge *val, str *msg){
+ (void) ret;
+ if( *val == 0 || *val == hge_nil)
+ throw(MAL, "mal.assert", "%s", *msg);
+ return MAL_SUCCEED;
+}
+#endif
str
MALassertSht(int *ret, sht *val, str *msg){
(void) ret;
diff --git a/monetdb5/modules/mal/language.h b/monetdb5/modules/mal/language.h
--- a/monetdb5/modules/mal/language.h
+++ b/monetdb5/modules/mal/language.h
@@ -46,6 +46,9 @@ language_export str MALassertOid(int *re
language_export str MALassertSht(int *ret, sht *val, str *msg);
language_export str MALassertInt(int *ret, int *val, str *msg);
language_export str MALassertLng(int *ret, lng *val, str *msg);
+#ifdef HAVE_HGE
+language_export str MALassertHge(int *ret, hge *val, str *msg);
+#endif
language_export str MALstartDataflow( Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
language_export str MALpass( Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
language_export str MALgarbagesink( Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
diff --git a/monetdb5/modules/mal/language.mal
b/monetdb5/modules/mal/language.mal
--- a/monetdb5/modules/mal/language.mal
+++ b/monetdb5/modules/mal/language.mal
@@ -24,6 +24,8 @@ command assert(v:int,term:str):void
address MALassertInt;
command assert(v:lng,term:str):void
address MALassertLng;
+command assert(v:hge,term:str):void
+address MALassertHge;
command assert(v:str,term:str):void
address MALassertStr;
command assert(v:oid,term:str):void
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
