diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compile.c | 2 | ||||
| -rw-r--r-- | src/typecheck.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/compile.c b/src/compile.c index c7e02b3f..688901ac 100644 --- a/src/compile.c +++ b/src/compile.c @@ -4098,7 +4098,7 @@ CORD compile_top_level_code(env_t *env, ast_t *ast) auto decl = Match(ast, Declare); const char *decl_name = Match(decl->var, Var)->name; CORD full_name = CORD_all(namespace_prefix(env, env->namespace), decl_name); - type_t *t = get_type(env, decl->value); + type_t *t = decl->type ? parse_type_ast(env, decl->type) : get_type(env, decl->value); if (t->tag == AbortType || t->tag == VoidType || t->tag == ReturnType) code_err(ast, "You can't declare a variable with a ", type_to_str(t), " value"); diff --git a/src/typecheck.c b/src/typecheck.c index 7b86ec63..bc9ae071 100644 --- a/src/typecheck.c +++ b/src/typecheck.c @@ -892,7 +892,9 @@ type_t *get_type(env_t *env, ast_t *ast) if (streq(call->name, "serialized")) // Data serialization return Type(ArrayType, Type(ByteType)); - type_t *self_value_t = value_type(get_type(env, call->self)); + type_t *self_value_t = get_type(env, call->self); + if (!self_value_t) code_err(call->self, "Couldn't get the type of this value"); + self_value_t = value_type(self_value_t); switch (self_value_t->tag) { case ArrayType: { type_t *item_type = Match(self_value_t, ArrayType)->item_type; |