diff options
| author | Russ Cox <rsc@golang.org> | 2009-10-15 23:10:49 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-10-15 23:10:49 -0700 |
| commit | 22a5c78f4488cd226e746a50d2420746f6721bc5 (patch) | |
| tree | 2b917b03646327a48fef08173fc6522500888d78 /src/pkg/runtime/hashmap.c | |
| parent | 488ca3c7a67ecb1ce4068ab40da6003feac5e16c (diff) | |
| download | go-22a5c78f4488cd226e746a50d2420746f6721bc5.tar.xz | |
rename sys functions to runtime,
because they are in package runtime.
another step to enforcing package boundaries.
R=r
DELTA=732 (114 added, 93 deleted, 525 changed)
OCL=35811
CL=35824
Diffstat (limited to 'src/pkg/runtime/hashmap.c')
| -rw-r--r-- | src/pkg/runtime/hashmap.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/pkg/runtime/hashmap.c b/src/pkg/runtime/hashmap.c index b95941414f..870274ae91 100644 --- a/src/pkg/runtime/hashmap.c +++ b/src/pkg/runtime/hashmap.c @@ -679,12 +679,12 @@ makemap(Type *key, Type *val, uint32 hint) if(keyalg >= nelem(algarray) || algarray[keyalg].hash == nohash) { printf("map(keyalg=%d)\n", keyalg); - throw("sys·makemap: unsupported map key type"); + throw("runtime·makemap: unsupported map key type"); } if(valalg >= nelem(algarray)) { printf("map(valalg=%d)\n", valalg); - throw("sys·makemap: unsupported map value type"); + throw("runtime·makemap: unsupported map value type"); } h = mal(sizeof(*h)); @@ -733,7 +733,7 @@ makemap(Type *key, Type *val, uint32 hint) // makemap(key, val *Type, hint uint32) (hmap *map[any]any); void -sys·makemap(Type *key, Type *val, uint32 hint, Hmap *ret) +runtime·makemap(Type *key, Type *val, uint32 hint, Hmap *ret) { ret = makemap(key, val, hint); FLUSH(&ret); @@ -756,7 +756,7 @@ mapaccess(Hmap *h, byte *ak, byte *av, bool *pres) // mapaccess1(hmap *map[any]any, key any) (val any); void -sys·mapaccess1(Hmap *h, ...) +runtime·mapaccess1(Hmap *h, ...) { byte *ak, *av; bool pres; @@ -766,24 +766,24 @@ sys·mapaccess1(Hmap *h, ...) mapaccess(h, ak, av, &pres); if(!pres) - throw("sys·mapaccess1: key not in map"); + throw("runtime·mapaccess1: key not in map"); if(debug) { - prints("sys·mapaccess1: map="); - sys·printpointer(h); + prints("runtime·mapaccess1: map="); + runtime·printpointer(h); prints("; key="); h->keyalg->print(h->keysize, ak); prints("; val="); h->valalg->print(h->valsize, av); prints("; pres="); - sys·printbool(pres); + runtime·printbool(pres); prints("\n"); } } // mapaccess2(hmap *map[any]any, key any) (val any, pres bool); void -sys·mapaccess2(Hmap *h, ...) +runtime·mapaccess2(Hmap *h, ...) { byte *ak, *av, *ap; @@ -794,14 +794,14 @@ sys·mapaccess2(Hmap *h, ...) mapaccess(h, ak, av, ap); if(debug) { - prints("sys·mapaccess2: map="); - sys·printpointer(h); + prints("runtime·mapaccess2: map="); + runtime·printpointer(h); prints("; key="); h->keyalg->print(h->keysize, ak); prints("; val="); h->valalg->print(h->valsize, av); prints("; pres="); - sys·printbool(*ap); + runtime·printbool(*ap); prints("\n"); } } @@ -824,22 +824,22 @@ mapassign(Hmap *h, byte *ak, byte *av) if(debug) { prints("mapassign: map="); - sys·printpointer(h); + runtime·printpointer(h); prints("; key="); h->keyalg->print(h->keysize, ak); prints("; val="); h->valalg->print(h->valsize, av); prints("; hit="); - sys·printint(hit); + runtime·printint(hit); prints("; res="); - sys·printpointer(res); + runtime·printpointer(res); prints("\n"); } } // mapassign1(hmap *map[any]any, key any, val any); void -sys·mapassign1(Hmap *h, ...) +runtime·mapassign1(Hmap *h, ...) { byte *ak, *av; @@ -851,7 +851,7 @@ sys·mapassign1(Hmap *h, ...) // mapassign2(hmap *map[any]any, key any, val any, pres bool); void -sys·mapassign2(Hmap *h, ...) +runtime·mapassign2(Hmap *h, ...) { byte *ak, *av, *ap; @@ -866,7 +866,7 @@ sys·mapassign2(Hmap *h, ...) if(debug) { prints("mapassign2: map="); - sys·printpointer(h); + runtime·printpointer(h); prints("; key="); h->keyalg->print(h->keysize, ak); prints("\n"); @@ -875,7 +875,7 @@ sys·mapassign2(Hmap *h, ...) // mapiterinit(hmap *map[any]any, hiter *any); void -sys·mapiterinit(Hmap *h, struct hash_iter *it) +runtime·mapiterinit(Hmap *h, struct hash_iter *it) { if(h == nil) { it->data = nil; @@ -884,12 +884,12 @@ sys·mapiterinit(Hmap *h, struct hash_iter *it) hash_iter_init(h, it); it->data = hash_next(it); if(debug) { - prints("sys·mapiterinit: map="); - sys·printpointer(h); + prints("runtime·mapiterinit: map="); + runtime·printpointer(h); prints("; iter="); - sys·printpointer(it); + runtime·printpointer(it); prints("; data="); - sys·printpointer(it->data); + runtime·printpointer(it->data); prints("\n"); } } @@ -900,20 +900,20 @@ mapiterinit(Hmap *h) struct hash_iter *it; it = mal(sizeof *it); - sys·mapiterinit(h, it); + runtime·mapiterinit(h, it); return it; } // mapiternext(hiter *any); void -sys·mapiternext(struct hash_iter *it) +runtime·mapiternext(struct hash_iter *it) { it->data = hash_next(it); if(debug) { - prints("sys·mapiternext: iter="); - sys·printpointer(it); + prints("runtime·mapiternext: iter="); + runtime·printpointer(it); prints("; data="); - sys·printpointer(it->data); + runtime·printpointer(it->data); prints("\n"); } } @@ -921,12 +921,12 @@ sys·mapiternext(struct hash_iter *it) void mapiternext(struct hash_iter *it) { - sys·mapiternext(it); + runtime·mapiternext(it); } // mapiter1(hiter *any) (key any); void -sys·mapiter1(struct hash_iter *it, ...) +runtime·mapiter1(struct hash_iter *it, ...) { Hmap *h; byte *ak, *res; @@ -936,15 +936,15 @@ sys·mapiter1(struct hash_iter *it, ...) res = it->data; if(res == nil) - throw("sys·mapiter2: key:val nil pointer"); + throw("runtime·mapiter2: key:val nil pointer"); h->keyalg->copy(h->keysize, ak, res); if(debug) { prints("mapiter2: iter="); - sys·printpointer(it); + runtime·printpointer(it); prints("; map="); - sys·printpointer(h); + runtime·printpointer(h); prints("\n"); } } @@ -965,7 +965,7 @@ mapiterkey(struct hash_iter *it, void *ak) // mapiter2(hiter *any) (key any, val any); void -sys·mapiter2(struct hash_iter *it, ...) +runtime·mapiter2(struct hash_iter *it, ...) { Hmap *h; byte *ak, *av, *res; @@ -976,16 +976,16 @@ sys·mapiter2(struct hash_iter *it, ...) res = it->data; if(res == nil) - throw("sys·mapiter2: key:val nil pointer"); + throw("runtime·mapiter2: key:val nil pointer"); h->keyalg->copy(h->keysize, ak, res); h->valalg->copy(h->valsize, av, res+h->datavo); if(debug) { prints("mapiter2: iter="); - sys·printpointer(it); + runtime·printpointer(it); prints("; map="); - sys·printpointer(h); + runtime·printpointer(h); prints("\n"); } } |
