Skip to content
This repository has been archived by the owner on Mar 26, 2024. It is now read-only.

Commit

Permalink
struct pic_blob * -> pic_value
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyuichi
nyuichi committed Feb 19, 2016
1 parent 1e08a7f commit 064eaff
Show file tree
Hide file tree
Showing 10 changed files with 155 additions and 139 deletions.
12 changes: 3 additions & 9 deletions contrib/40.srfi/src/106.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@ pic_socket_socket_accept(pic_state *pic)
static pic_value
pic_socket_socket_send(pic_state *pic)
{
pic_value obj;
struct pic_blob *bv;
pic_value obj, bv;
const unsigned char *cursor;
int flags = 0, remain, written;
struct pic_socket_t *sock;
Expand Down Expand Up @@ -223,7 +222,6 @@ static pic_value
pic_socket_socket_recv(pic_state *pic)
{
pic_value obj;
struct pic_blob *bv;
void *buf;
int size;
int flags = 0;
Expand All @@ -239,7 +237,7 @@ pic_socket_socket_recv(pic_state *pic)
sock = pic_socket_data(pic, obj);
ensure_socket_is_open(pic, sock);

buf = malloc(size);
buf = pic_blob(pic, pic_blob_value(pic, NULL, size), NULL);
if (buf == NULL && size > 0) {
/* XXX: Is it really OK? */
pic_panic(pic, "memory exhausted");
Expand All @@ -251,14 +249,10 @@ pic_socket_socket_recv(pic_state *pic)
} while (len < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));

if (len < 0) {
free(buf);
pic_errorf(pic, "%s", strerror(errno));
}

bv = pic_blob_value(pic, buf, len);
free(buf);

return pic_obj_value(bv);
return pic_blob_value(pic, buf, len);
}

static pic_value
Expand Down
149 changes: 81 additions & 68 deletions extlib/benz/blob.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "picrin.h"
#include "picrin/object.h"

struct pic_blob *
pic_value
pic_blob_value(pic_state *pic, const unsigned char *buf, int len)
{
struct pic_blob *bv;
Expand All @@ -16,14 +16,16 @@ pic_blob_value(pic_state *pic, const unsigned char *buf, int len)
if (buf) {
memcpy(bv->data, buf, len);
}
return bv;
return pic_obj_value(bv);
}

unsigned char *
pic_blob(pic_state PIC_UNUSED(*pic), struct pic_blob *blob, int *len)
pic_blob(pic_state PIC_UNUSED(*pic), pic_value blob, int *len)
{
*len = blob->len;
return blob->data;
if (len) {
*len = pic_blob_ptr(pic, blob)->len;
}
return pic_blob_ptr(pic, blob)->data;
}

static pic_value
Expand All @@ -39,16 +41,15 @@ pic_blob_bytevector_p(pic_state *pic)
static pic_value
pic_blob_bytevector(pic_state *pic)
{
pic_value *argv;
pic_value *argv, blob;
int argc, i;
struct pic_blob *blob;
unsigned char *data;

pic_get_args(pic, "*", &argc, &argv);

blob = pic_blob_value(pic, 0, argc);

data = blob->data;
data = pic_blob(pic, blob, NULL);

for (i = 0; i < argc; ++i) {
pic_assert_type(pic, argv[i], int);
Expand All @@ -60,162 +61,171 @@ pic_blob_bytevector(pic_state *pic)
*data++ = (unsigned char)pic_int(pic, argv[i]);
}

return pic_obj_value(blob);
return blob;
}

static pic_value
pic_blob_make_bytevector(pic_state *pic)
{
struct pic_blob *blob;
int k, i, b = 0;
pic_value blob;
int k, b = 0;

pic_get_args(pic, "i|i", &k, &b);

if (b < 0 || b > 255)
pic_errorf(pic, "byte out of range");

blob = pic_blob_value(pic, 0, k);
for (i = 0; i < k; ++i) {
blob->data[i] = (unsigned char)b;
if (k < 0) {
pic_errorf(pic, "make-bytevector: negative length given %d", k);
}

return pic_obj_value(blob);
blob = pic_blob_value(pic, 0, k);

memset(pic_blob(pic, blob, NULL), k, (unsigned char)b);

return blob;
}

static pic_value
pic_blob_bytevector_length(pic_state *pic)
{
struct pic_blob *bv;
pic_value bv;
int len;

pic_get_args(pic, "b", &bv);

return pic_int_value(pic, bv->len);
pic_blob(pic, bv, &len);

return pic_int_value(pic, len);
}

static pic_value
pic_blob_bytevector_u8_ref(pic_state *pic)
{
struct pic_blob *bv;
int k;
pic_value bv;
unsigned char *buf;
int k, len;

pic_get_args(pic, "bi", &bv, &k);

return pic_int_value(pic, bv->data[k]);
buf = pic_blob(pic, bv, &len);

VALID_INDEX(pic, len, k);

return pic_int_value(pic, buf[k]);
}

static pic_value
pic_blob_bytevector_u8_set(pic_state *pic)
{
struct pic_blob *bv;
int k, v;
pic_value bv;
unsigned char *buf;
int k, v, len;

pic_get_args(pic, "bii", &bv, &k, &v);

if (v < 0 || v > 255)
pic_errorf(pic, "byte out of range");

bv->data[k] = (unsigned char)v;
buf = pic_blob(pic, bv, &len);

VALID_INDEX(pic, len, k);

buf[k] = (unsigned char)v;

return pic_undef_value(pic);
}

static pic_value
pic_blob_bytevector_copy_i(pic_state *pic)
{
struct pic_blob *to, *from;
int n, at, start, end;
pic_value to, from;
unsigned char *tobuf, *frombuf;
int n, at, start, end, tolen, fromlen;

n = pic_get_args(pic, "bib|ii", &to, &at, &from, &start, &end);

tobuf = pic_blob(pic, to, &tolen);
frombuf = pic_blob(pic, from, &fromlen);

switch (n) {
case 3:
start = 0;
case 4:
end = from->len;
end = fromlen;
}

if (to == from && (start <= at && at < end)) {
/* copy in reversed order */
at += end - start;
while (start < end) {
to->data[--at] = from->data[--end];
}
return pic_undef_value(pic);
}
VALID_ATRANGE(pic, tolen, at, fromlen, start, end);

while (start < end) {
to->data[at++] = from->data[start++];
}
memmove(tobuf + at, frombuf + start, end - start);

return pic_undef_value(pic);
}

static pic_value
pic_blob_bytevector_copy(pic_state *pic)
{
struct pic_blob *from, *to;
int n, start, end, i = 0;
pic_value from;
unsigned char *buf;
int n, start, end, len;

n = pic_get_args(pic, "b|ii", &from, &start, &end);

buf = pic_blob(pic, from, &len);

switch (n) {
case 1:
start = 0;
case 2:
end = from->len;
end = len;
}

if (end < start) {
pic_errorf(pic, "make-bytevector: end index must not be less than start index");
}
VALID_RANGE(pic, len, start, end);

to = pic_blob_value(pic, 0, end - start);
while (start < end) {
to->data[i++] = from->data[start++];
}

return pic_obj_value(to);
return pic_blob_value(pic, buf + start, end - start);
}

static pic_value
pic_blob_bytevector_append(pic_state *pic)
{
int argc, i, j, len;
pic_value *argv;
struct pic_blob *blob;
int argc, i, l, len;
unsigned char *buf, *dst;
pic_value *argv, blob;

pic_get_args(pic, "*", &argc, &argv);

len = 0;
for (i = 0; i < argc; ++i) {
pic_assert_type(pic, argv[i], blob);
len += pic_blob_ptr(argv[i])->len;
pic_blob(pic, argv[i], &l);
len += l;
}

blob = pic_blob_value(pic, 0, len);
blob = pic_blob_value(pic, NULL, len);

dst = pic_blob(pic, blob, NULL);
len = 0;
for (i = 0; i < argc; ++i) {
for (j = 0; j < pic_blob_ptr(argv[i])->len; ++j) {
blob->data[len + j] = pic_blob_ptr(argv[i])->data[j];
}
len += pic_blob_ptr(argv[i])->len;
buf = pic_blob(pic, argv[i], &l);
memcpy(dst + len, buf, l);
len += l;
}

return pic_obj_value(blob);
return blob;
}

static pic_value
pic_blob_list_to_bytevector(pic_state *pic)
{
struct pic_blob *blob;
pic_value blob;
unsigned char *data;
pic_value list, e, it;

pic_get_args(pic, "o", &list);

blob = pic_blob_value(pic, 0, pic_length(pic, list));

data = blob->data;
data = pic_blob(pic, blob, NULL);

pic_for_each (e, list, it) {
pic_assert_type(pic, e, int);
Expand All @@ -225,29 +235,32 @@ pic_blob_list_to_bytevector(pic_state *pic)

*data++ = (unsigned char)pic_int(pic, e);
}
return pic_obj_value(blob);
return blob;
}

static pic_value
pic_blob_bytevector_to_list(pic_state *pic)
{
struct pic_blob *blob;
pic_value list;
int n, start, end, i;
pic_value blob, list;
unsigned char *buf;
int n, len, start, end, i;

n = pic_get_args(pic, "b|ii", &blob, &start, &end);

buf = pic_blob(pic, blob, &len);

switch (n) {
case 1:
start = 0;
case 2:
end = blob->len;
end = len;
}

list = pic_nil_value(pic);
VALID_RANGE(pic, len, start, end);

list = pic_nil_value(pic);
for (i = start; i < end; ++i) {
pic_push(pic, pic_int_value(pic, blob->data[i]), list);
pic_push(pic, pic_int_value(pic, buf[i]), list);
}
return pic_reverse(pic, list);
}
Expand Down
15 changes: 7 additions & 8 deletions extlib/benz/bool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,17 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, int depth, khash_t(m)
return pic_str_cmp(pic, pic_str_ptr(x), pic_str_ptr(y)) == 0;
}
case PIC_TYPE_BLOB: {
struct pic_blob *blob1, *blob2;
int i;
int xlen, ylen;
const unsigned char *xbuf, *ybuf;

blob1 = pic_blob_ptr(x);
blob2 = pic_blob_ptr(y);
xbuf = pic_blob(pic, x, &xlen);
ybuf = pic_blob(pic, y, &ylen);

if (blob1->len != blob2->len) {
if (xlen != ylen) {
return false;
}
for (i = 0; i < blob1->len; ++i) {
if (blob1->data[i] != blob2->data[i])
return false;
if (memcmp(xbuf, ybuf, xlen) != 0) {
return false;
}
return true;
}
Expand Down
Loading

0 comments on commit 064eaff

Please sign in to comment.