aboutsummaryrefslogtreecommitdiff
path: root/src/check_expr.cpp
diff options
context:
space:
mode:
authorDaniel Gavin <danielgavin5@hotmail.com>2022-01-24 16:58:39 +0100
committerDaniel Gavin <danielgavin5@hotmail.com>2022-01-24 16:58:39 +0100
commit6a7d821fcc42e58bb90b78f484c70dfa42a56c91 (patch)
tree1d5eede5f6831754489e9ed9677fa9d0006c40df /src/check_expr.cpp
parent01e29bf27ef0204f586b856363f7a3bf5138052d (diff)
parent42ab882db4a6d5765c68021ade010b468ff4531e (diff)
Merge remote-tracking branch 'upstream/master' into parser-fix
Diffstat (limited to 'src/check_expr.cpp')
-rw-r--r--src/check_expr.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index 8667d8734..1742ef2d8 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -3419,7 +3419,6 @@ void convert_untyped_error(CheckerContext *c, Operand *operand, Type *target_typ
if (operand->value.kind == ExactValue_String) {
String key = operand->value.value_string;
if (is_type_string(operand->type) && is_type_enum(target_type)) {
- gb_printf_err("HERE!\n");
Type *et = base_type(target_type);
check_did_you_mean_type(key, et->Enum.fields, ".");
}
@@ -6085,7 +6084,8 @@ CallArgumentError check_polymorphic_record_type(CheckerContext *c, Operand *oper
}
// NOTE(bill): Add type info the parameters
- add_type_info_type(c, o->type);
+ // TODO(bill, 2022-01-23): why was this line added in the first place? I'm commenting it out for the time being
+ // add_type_info_type(c, o->type);
}
{
@@ -9114,18 +9114,7 @@ gbString string_append_string(gbString str, String string) {
gbString string_append_token(gbString str, Token token) {
- if (token.kind == Token_String) {
- str = gb_string_append_rune(str, '"');
- } else if (token.kind == Token_Rune) {
- str = gb_string_append_rune(str, '\'');
- }
str = string_append_string(str, token.string);
- if (token.kind == Token_String) {
- str = gb_string_append_rune(str, '"');
- } else if (token.kind == Token_Rune) {
- str = gb_string_append_rune(str, '\'');
- }
-
return str;
}