Changeset: 95ba35c72f68 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95ba35c72f68 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/modules/atoms/uuid.mal Branch: Jul2015 Log Message:
Fix regression introduced by changeset cba5bc5237d6, diffs (101 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -36038,10 +36038,6 @@ command calc.inet(s:inet):inet address INET_inet; comment Convert a inet to an inet -command calc.isaUUID(u:str):bit -address UUIDisaUUID; -comment Test a string for a UUID format - command calc.json(j:json):json address JSONstr2json; comment Convert JSON to JSON. Dealing with escape characters @@ -41657,6 +41653,10 @@ command uuid.#fromstr():void address UUIDfromString; command uuid.#hash():void address UUIDhash; +command uuid.isaUUID(u:str):bit +address UUIDisaUUID; +comment Test a string for a UUID format + command uuid.new():uuid address UUIDgenerateUuid; comment Generate a new uuid diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -46561,10 +46561,6 @@ command calc.inet(s:inet):inet address INET_inet; comment Convert a inet to an inet -command calc.isaUUID(u:str):bit -address UUIDisaUUID; -comment Test a string for a UUID format - command calc.json(j:json):json address JSONstr2json; comment Convert JSON to JSON. Dealing with escape characters @@ -52604,6 +52600,10 @@ command uuid.#fromstr():void address UUIDfromString; command uuid.#hash():void address UUIDhash; +command uuid.isaUUID(u:str):bit +address UUIDisaUUID; +comment Test a string for a UUID format + command uuid.new():uuid address UUIDgenerateUuid; comment Generate a new uuid 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 @@ -21,24 +21,28 @@ command uuid(s:str):uuid address UUIDstr2uuid comment "Coerce a string to a uuid, validating its format"; -command calc.uuid(s:str):uuid -address UUIDstr2uuid -comment "Coerce a string to a uuid, validating its format"; - command str(u:uuid):str address UUIDuuid2str comment "Coerce a uuid to its string type"; +command isaUUID(u:str):bit +address UUIDisaUUID +comment "Test a string for a UUID format"; + module calc; +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 str(s:uuid):str address UUIDuuid2str comment "Coerce a uuid to a string type"; -command isaUUID(u:str):bit -address UUIDisaUUID -comment "Test a string for a UUID format"; - pattern ==(l:uuid,r:uuid):bit address CMDvarEQ comment "Return V1 == V2"; @@ -63,10 +67,6 @@ pattern >=(l:uuid,r:uuid):bit address CMDvarGE comment "Return V1 >= V2"; -function uuid(u:uuid):uuid; - return u; -end uuid; - module batcalc; pattern ==(b1:bat[:oid,:uuid],b2:bat[:oid,:uuid]) :bat[:oid,:bit] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
