Update of /cvsroot/monetdb/MonetDB5/src/modules/atoms
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13981
Modified Files:
Tag: MonetDB_5-4
blob.mx inet.mx mtime.mx
Log Message:
more texi fixes
Index: inet.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/inet.mx,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -d -r1.26 -r1.26.2.1
--- inet.mx 11 Jan 2008 10:41:35 -0000 1.26
+++ inet.mx 5 Feb 2008 22:14:56 -0000 1.26.2.1
@@ -87,17 +87,19 @@
inet_export str INET_fromstr(inet *ret, str *s);
@c
[EMAIL PROTECTED]
#include "mal_config.h"
#include <gdk.h>
#include "mal.h"
#include "mal_exception.h"
#include "inet.h"
-
[EMAIL PROTECTED]
@mal
command fromstr()
address INETfromString
comment "Convert a string to an inet";
@c
[EMAIL PROTECTED]
/**
* Creates a new inet from the given string.
* Warning: GDK function, does NOT pass a string by reference, and wants
@@ -223,12 +225,13 @@
*len = 0; /* signal INETnew something went wrong */
return(i - 1);
}
-
[EMAIL PROTECTED]
@mal
command tostr()
address INETtoString
comment "Convert inet to string equivalent";
@c
[EMAIL PROTECTED]
/**
* Returns the string representation of the given inet value.
* Warning: GDK function
@@ -254,12 +257,13 @@
return(*len);
}
-
[EMAIL PROTECTED]
@mal
command new(s:str):inet
address INETnew
comment "Create an inet from a string literal";
@c
[EMAIL PROTECTED]
/**
* Returns a inet, parsed from a string. The fromStr function is used
* to parse the string.
@@ -279,12 +283,13 @@
/* === Operators === */
-
[EMAIL PROTECTED]
@mal
command isnil(v:inet):bit
address INET_isnil
comment "Nil test for inet value";
@c
[EMAIL PROTECTED]
/**
* Returns whether val represents a nil inet value
*/
@@ -295,12 +300,13 @@
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command =(v:inet,w:inet):bit
address INET_comp_EQ
comment "Equality of two inets";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 and val2 are equal.
*/
@@ -317,12 +323,13 @@
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command !=(v:inet,w:inet):bit
address INET_comp_NEQ
comment "Inequality of two inets";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 and val2 are not equal.
*/
@@ -339,12 +346,13 @@
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command <(v:inet,w:inet):bit
address INET_comp_LT
comment "Whether v is less than w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 is smaller than val2.
*/
@@ -377,12 +385,13 @@
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command >(v:inet,w:inet):bit
address INET_comp_GT
comment "Whether v is greater than w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 is greater than val2.
*/
@@ -391,12 +400,13 @@
{
return (INET_comp_LT(retval, val2, val1));
}
-
[EMAIL PROTECTED]
@mal
command <=(v:inet,w:inet):bit
address INET_comp_LE
comment "Whether v is less than or equal to w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 is smaller than or equal to val2.
*/
@@ -412,12 +422,13 @@
*retval = ret;
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command >=(v:inet,w:inet):bit
address INET_comp_GE
comment "Whether v is equal to or greater than w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 is smaller than or equal to val2.
*/
@@ -435,12 +446,13 @@
*retval = ret;
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command <<(v:inet,w:inet):bit
address INET_comp_CW
comment "Whether v is contained within w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 is contained within val2
*/
@@ -503,12 +515,13 @@
}
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command <<=(v:inet,w:inet):bit
address INET_comp_CWE
comment "Whether v is contained within or is equal to w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 is contained within or equal to val2
*/
@@ -525,12 +538,13 @@
*retval = ret;
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command >>(v:inet,w:inet):bit
address INET_comp_CS
comment "Whether v contains w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 is contains val2
*/
@@ -540,12 +554,13 @@
/* swap the input arguments and call the contained within function */
return (INET_comp_CW(retval, val2, val1));
}
-
[EMAIL PROTECTED]
@mal
command >>=(v:inet,w:inet):bit
address INET_comp_CSE
comment "Whether v contains or is equal to w";
@c
[EMAIL PROTECTED]
/**
* Returns whether val1 contains or is equal to val2
*/
@@ -558,12 +573,13 @@
/* === Functions === */
-
[EMAIL PROTECTED]
@mal
command broadcast(:inet):inet
address INETbroadcast
comment "Returns the broadcast address for network";
@c
[EMAIL PROTECTED]
/**
* Returns the broadcast address for the network the inet represents.
* If the subnet mask is 32, the given input inet is returned.
@@ -617,12 +633,13 @@
}
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command host(:inet):str
address INEThost
comment "Extract IP address as text";
@c
[EMAIL PROTECTED]
/**
* Extract only the IP address as text. Unlike the toString function,
* this function never returns the netmask length.
@@ -643,12 +660,13 @@
}
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command masklen(:inet):int
address INETmasklen
comment "Extract netmask length";
@c
[EMAIL PROTECTED]
/**
* Extract netmask length.
*/
@@ -662,12 +680,13 @@
}
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command setmasklen(:inet,:int):inet
address INETsetmasklen
comment "Set netmask length for inet value";
@c
[EMAIL PROTECTED]
/**
* Set netmask length for inet value.
*/
@@ -683,12 +702,13 @@
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command netmask(:inet):inet
address INETnetmask
comment "Construct netmask for network";
@c
[EMAIL PROTECTED]
/**
* Construct netmask for network.
*/
@@ -733,12 +753,13 @@
}
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command hostmask(:inet):inet
address INEThostmask
comment "Construct host mask for network";
@c
[EMAIL PROTECTED]
/**
* Construct host mask for network.
*/
@@ -763,12 +784,13 @@
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command network(:inet):inet
address INETnetwork
comment "Extract network part of address";
@c
[EMAIL PROTECTED]
/**
* Extract network part of address, returns the same inet if the netmask
* is equal to 32. This function basically zeros out values that are
@@ -816,12 +838,13 @@
}
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command text(:inet):str
address INETtext
comment "Extract IP address and netmask length as text";
@c
[EMAIL PROTECTED]
/**
* Extract IP address and netmask length as text. Unlike the toStr
* function, this function always prints the netmask length.
@@ -842,12 +865,13 @@
}
return (MAL_SUCCEED);
}
-
[EMAIL PROTECTED]
@mal
command abbrev(:inet):str
address INETabbrev
comment "Abbreviated display format as text";
@c
[EMAIL PROTECTED]
/**
* Abbreviated display format as text. The abbreviation is only made if
* the value has no bits set to right of mask. Otherwise the return of
@@ -913,9 +937,7 @@
}
return (MAL_SUCCEED);
}
-
@}
-
@mal
module calc;
@@ -923,6 +945,7 @@
address INET_inet
comment "Convert a inet to an inet";
[EMAIL PROTECTED]
@c
str
INET_inet(inet *d, inet *s)
@@ -930,12 +953,12 @@
*d = *s;
return MAL_SUCCEED;
}
-
[EMAIL PROTECTED]
@mal
command inet(s:str):inet
address INET_fromstr
comment "Convert a string to an inet";
-
[EMAIL PROTECTED]
@c
str
INET_fromstr(inet *ret, str *s)
@@ -944,7 +967,7 @@
INETfromString(*s, &len, &ret);
return MAL_SUCCEED;
}
-
[EMAIL PROTECTED]
@mal
command isnil(v:inet):bit
address INET_isnil
Index: blob.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/blob.mx,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- blob.mx 11 Jan 2008 10:41:34 -0000 1.39
+++ blob.mx 5 Feb 2008 22:14:56 -0000 1.39.2.1
@@ -758,6 +758,7 @@
section of the blob modules from MonetDB 4.3
@-
@c
[EMAIL PROTECTED]
int
BLOBnequal(blob *l, blob *r)
{
Index: mtime.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/mtime.mx,v
retrieving revision 1.106
retrieving revision 1.106.2.1
diff -u -d -r1.106 -r1.106.2.1
--- mtime.mx 27 Jan 2008 09:48:22 -0000 1.106
+++ mtime.mx 5 Feb 2008 22:14:56 -0000 1.106.2.1
@@ -19,7 +19,6 @@
@v 1.0
@* Temporal Module
[EMAIL PROTECTED]
The goal of this module is to provide adequate functionality for storing
and manipulated time-related data. The minimum requirement is that data
can easily be imported from all common commercial RDBMS products.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
