From e6e38a176f08637099befaec8a46912bb9682c9f Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 22 Apr 2012 16:17:10 +0200 Subject: [PATCH] Add int boxing. --- src/Makefile | 1 + src/int.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/int.h | 36 +++++++++++++++++++++++++++++++++ tests/tests.c | 17 ++++++++++++---- 4 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 src/int.c create mode 100644 src/int.h diff --git a/src/Makefile b/src/Makefile index d378f47..ba8fc99 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,6 +4,7 @@ LIB_MINOR = 0 SRCS = array.c \ class.c \ + int.c \ map.c \ object.c \ range.c \ diff --git a/src/int.c b/src/int.c new file mode 100644 index 0000000..03a649e --- /dev/null +++ b/src/int.c @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2012, Jonathan Schleifer + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "object.h" +#include "int.h" + +struct CFWInt { + CFWObject obj; + intmax_t value; +}; + +static bool +ctor(void *ptr, va_list args) +{ + CFWInt *integer = ptr; + + integer->value = va_arg(args, intmax_t); + + return true; +} + +intmax_t +cfw_int_value(CFWInt *integer) +{ + return integer->value; +} + +static CFWClass class = { + .name = "CFWInt", + .size = sizeof(CFWInt), + .ctor = ctor +}; +CFWClass *cfw_int = &class; diff --git a/src/int.h b/src/int.h new file mode 100644 index 0000000..43175fa --- /dev/null +++ b/src/int.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2012, Jonathan Schleifer + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __COREFW_INT_H__ +#define __COREFW_INT_H__ + +#include "class.h" + +typedef struct CFWInt CFWInt; +extern CFWClass *cfw_int; +extern intmax_t cfw_int_value(CFWInt*); + +#endif diff --git a/tests/tests.c b/tests/tests.c index 75c3359..f9a4262 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -29,6 +29,7 @@ #include "object.h" #include "refpool.h" #include "string.h" +#include "int.h" #include "array.h" #include "map.h" @@ -42,9 +43,15 @@ print_map(CFWMap *map) fputs("{\n", stdout); while (iter.key != NULL) { - printf("\t%s = %s\n", - cfw_string_c(iter.key), - cfw_string_c(iter.obj)); + if (cfw_is(iter.obj, cfw_string)) { + printf("\t%s = %s\n", + cfw_string_c(iter.key), + cfw_string_c(iter.obj)); + } else if (cfw_is(iter.obj, cfw_int)) { + printf("\t%s = %jd\n", + cfw_string_c(iter.key), + cfw_int_value(iter.obj)); + } cfw_map_iter_next(&iter); } @@ -90,7 +97,9 @@ main() cfw_new_p(cfw_string, "Hallo"), cfw_new_p(cfw_string, "Welt!"), cfw_new_p(cfw_string, "Test"), - cfw_new_p(cfw_string, "success!"), NULL); + cfw_new_p(cfw_string, "success!"), + cfw_new_p(cfw_string, "int"), + cfw_new_p(cfw_int, INTMAX_C(1234)), NULL); print_map(m);