Changeset: c4bd6a1c41c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4bd6a1c41c3
Modified Files:
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/uuid.mal
Branch: mbedded
Log Message:
no mal functions when we move over to c-structures, replaced by command
diffs (48 lines):
diff --git a/monetdb5/modules/atoms/uuid.c b/monetdb5/modules/atoms/uuid.c
--- a/monetdb5/modules/atoms/uuid.c
+++ b/monetdb5/modules/atoms/uuid.c
@@ -58,6 +58,7 @@ mal_export const uuid *UUIDnull(void);
mal_export uuid *UUIDread(uuid *u, stream *s, size_t cnt);
mal_export ssize_t UUIDtoString(str *retval, size_t *len, const uuid *value,
bool external);
mal_export gdk_return UUIDwrite(const uuid *u, stream *s, size_t cnt);
+mal_export str UUIDuuid2uuid(uuid *retval, uuid *s);
#ifdef HAVE_HGE
mal_export str UUIDgenerateUuid(uuid *retval);
@@ -271,6 +272,13 @@ UUIDisaUUID(bit *retval, str *s)
return MAL_SUCCEED;
}
+str
+UUIDuuid2uuid(uuid *retval, uuid *i)
+{
+ *retval = *i;
+ return MAL_SUCCEED;
+}
+
#ifdef HAVE_HGE
str
UUIDstr2uuid(uuid *retval, str *s)
diff --git a/monetdb5/modules/atoms/uuid.mal b/monetdb5/modules/atoms/uuid.mal
--- a/monetdb5/modules/atoms/uuid.mal
+++ b/monetdb5/modules/atoms/uuid.mal
@@ -45,9 +45,8 @@ command uuid(s:str):uuid
address UUIDstr2uuid
comment "Coerce a string to a uuid, validating its format";
-function uuid(u:uuid):uuid;
- return u;
-end uuid;
+command uuid(u:uuid):uuid
+address UUIDuuid2uuid;
command str(s:uuid):str
address UUIDuuid2str
@@ -118,7 +117,3 @@ comment "Return B1 > B2";
pattern >=(b1:bat[:uuid],b2:bat[:uuid]) :bat[:bit]
address CMDbatGE
comment "Return B1 >= B2";
-
-function uuid(u:bat[:uuid]):bat[:uuid];
- return u;
-end uuid;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
