From 1394dbbd57e753fe5215bb045276076ebe81c4b7 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Tue, 5 Feb 2019 19:11:43 -0500 Subject: [PATCH] Update license to include contributors. Use 4 spaces for indentation. --- LICENSE | 2 +- examples/numarray/numarray.c | 148 +++++++++++++++++------------------ 2 files changed, 73 insertions(+), 77 deletions(-) diff --git a/LICENSE b/LICENSE index 5a0535c0..4a503dc1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2019 Calvin Rose +Copyright (c) 2019 Calvin Rose and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/examples/numarray/numarray.c b/examples/numarray/numarray.c index ff0b9324..8f60d680 100644 --- a/examples/numarray/numarray.c +++ b/examples/numarray/numarray.c @@ -2,32 +2,30 @@ #include typedef struct { - double * data; - size_t size; + double * data; + size_t size; } num_array; static num_array * num_array_init(num_array * array,size_t size) { - array->data=(double *)calloc(size,sizeof(double)); - array->size=size; - return array; + array->data=(double *)calloc(size,sizeof(double)); + array->size=size; + return array; } static void num_array_deinit(num_array * array) { - free(array->data); + free(array->data); } static int num_array_gc(void *p, size_t s) { - (void) s; - num_array * array=(num_array *)p; - num_array_deinit(array); - return 0; + (void) s; + num_array * array=(num_array *)p; + num_array_deinit(array); + return 0; } Janet num_array_get(void *p, Janet key); void num_array_put(void *p, Janet key, Janet value); - - static const JanetAbstractType num_array_type = { "numarray", num_array_gc, @@ -37,91 +35,89 @@ static const JanetAbstractType num_array_type = { }; static Janet num_array_new(int32_t argc, Janet *argv) { - janet_fixarity(argc, 1); - int32_t size=janet_getinteger(argv,0); - num_array * array = (num_array *)janet_abstract(&num_array_type,sizeof(num_array)); - num_array_init(array,size); - return janet_wrap_abstract(array); + janet_fixarity(argc, 1); + int32_t size=janet_getinteger(argv,0); + num_array * array = (num_array *)janet_abstract(&num_array_type,sizeof(num_array)); + num_array_init(array,size); + return janet_wrap_abstract(array); } static Janet num_array_scale(int32_t argc, Janet *argv) { - janet_fixarity(argc, 2); - num_array * array = (num_array *)janet_getabstract(argv,0,&num_array_type); - double factor = janet_getnumber(argv,1); - size_t i; - for (i=0;isize;i++) { - array->data[i]*=factor; - } - return argv[0]; + janet_fixarity(argc, 2); + num_array * array = (num_array *)janet_getabstract(argv,0,&num_array_type); + double factor = janet_getnumber(argv,1); + size_t i; + for (i=0;isize;i++) { + array->data[i]*=factor; + } + return argv[0]; } static Janet num_array_sum(int32_t argc, Janet *argv) { - janet_fixarity(argc, 1); - num_array * array = (num_array *)janet_getabstract(argv,0,&num_array_type); - double sum = 0; - for (size_t i=0;isize;i++) sum+=array->data[i]; - return janet_wrap_number(sum); + janet_fixarity(argc, 1); + num_array * array = (num_array *)janet_getabstract(argv,0,&num_array_type); + double sum = 0; + for (size_t i=0;isize;i++) sum+=array->data[i]; + return janet_wrap_number(sum); } void num_array_put(void *p, Janet key, Janet value) { - size_t index; - num_array * array=(num_array *)p; - if (!janet_checkint(key)) - janet_panic("expected integer key"); - if (!janet_checktype(value,JANET_NUMBER)) - janet_panic("expected number value"); + size_t index; + num_array * array=(num_array *)p; + if (!janet_checkint(key)) + janet_panic("expected integer key"); + if (!janet_checktype(value,JANET_NUMBER)) + janet_panic("expected number value"); - index = (size_t)janet_unwrap_integer(key); - if (index < array->size) { - array->data[index]=janet_unwrap_number(value); - } + index = (size_t)janet_unwrap_integer(key); + if (index < array->size) { + array->data[index]=janet_unwrap_number(value); + } } static const JanetReg methods[] = { - {"scale", num_array_scale,"(:scale numarray factor)"}, - {"sum", num_array_sum,"(:sum numarray)"} + {"scale", num_array_scale,"(:scale numarray factor)"}, + {"sum", num_array_sum,"(:sum numarray)"} }; Janet num_array_get(void *p, Janet key) { - size_t index; - Janet value; - num_array * array=(num_array *)p; - if (janet_checktype(key,JANET_KEYWORD)) { - const uint8_t *keyw = janet_unwrap_keyword(key); - const size_t nm = sizeof(methods)/sizeof(JanetReg); - size_t i; - for ( i=0 ; i= array->size) { - value = janet_wrap_nil(); - } else { - value = janet_wrap_number(array->data[index]); - } - return value; + if (!janet_checkint(key)) + janet_panic("expected integer key"); + index = (size_t)janet_unwrap_integer(key); + if (index >= array->size) { + value = janet_wrap_nil(); + } else { + value = janet_wrap_number(array->data[index]); + } + return value; } - - static const JanetReg cfuns[] = { - {"numarray/new", num_array_new, - "(numarray/new size)\n\n" - "Create new numarray" - }, - {"numarray/scale", num_array_scale, - "(numarray/scale numarray factor)\n\n" - "scale numarray by factor" - }, - {NULL,NULL,NULL} + {"numarray/new", num_array_new, + "(numarray/new size)\n\n" + "Create new numarray" + }, + {"numarray/scale", num_array_scale, + "(numarray/scale numarray factor)\n\n" + "scale numarray by factor" + }, + {NULL,NULL,NULL} }; JANET_MODULE_ENTRY(JanetTable *env) { - janet_cfuns(env, "numarray", cfuns); + janet_cfuns(env, "numarray", cfuns); }