Skip to content

Commit 7343d9a

Browse files
committed
Remove map_exists().
1 parent 78c11d5 commit 7343d9a

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

parse.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,20 @@ static Env *new_env(Env *next) {
2929
}
3030

3131
static Type *find_typedef(char *name) {
32-
for (Env *e = env; e; e = e->next)
33-
if (map_exists(e->typedefs, name))
34-
return map_get(e->typedefs, name);
32+
for (Env *e = env; e; e = e->next) {
33+
Type *ty = map_get(e->typedefs, name);
34+
if (ty)
35+
return ty;
36+
}
3537
return NULL;
3638
}
3739

3840
static Type *find_tag(char *name) {
39-
for (Env *e = env; e; e = e->next)
40-
if (map_exists(e->tags, name))
41-
return map_get(e->tags, name);
41+
for (Env *e = env; e; e = e->next) {
42+
Type *ty = map_get(e->tags, name);
43+
if (ty)
44+
return ty;
45+
}
4246
return NULL;
4347
}
4448

util.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ int map_geti(Map *map, char *key, int default_) {
6363
return default_;
6464
}
6565

66-
bool map_exists(Map *map, char *key) {
67-
for (int i = map->keys->len - 1; i >= 0; i--)
68-
if (!strcmp(map->keys->data[i], key))
69-
return true;
70-
return false;
71-
}
72-
7366
StringBuilder *new_sb(void) {
7467
StringBuilder *sb = malloc(sizeof(StringBuilder));
7568
sb->data = malloc(8);

util_test.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ static void map_test() {
4343

4444
map_put(map, "foo", (void *)6);
4545
expect(__LINE__, 6, (intptr_t)map_get(map, "foo"));
46-
47-
expect(__LINE__, true, map_exists(map, "foo"));
48-
expect(__LINE__, false, map_exists(map, "baz"));
4946
}
5047

5148
static void sb_test() {

0 commit comments

Comments
 (0)