harec

commit 1e1c5bd379f93b673372f60c168c492db12f3cd4
parent c5cdb1df0719262e16c64e7efd8d41fbd97bec75
Author: Eyal Sawady <ecs@d2evs.net>
Date:   Sun,  2 May 2021 15:52:03 -0400

check: implement flexible rune constants

Signed-off-by: Eyal Sawady <ecs@d2evs.net>

Diffstat:
M
src/check.c
 | 
27
+++++++++++++++++++++++++--

1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/check.c b/src/check.c
@@ -1184,7 +1184,16 @@ lower_constant(const struct type *type, struct expression *expr)
 					continue;
 				}
 				// Ambiguous
-				return lower_constant(&builtin_type_int, expr);
+				switch (expr->result->storage) {
+				case STORAGE_ICONST:
+					return lower_constant(&builtin_type_int, expr);
+				case STORAGE_FCONST:
+					return lower_constant(&builtin_type_f64, expr);
+				case STORAGE_RUNE:
+					return lower_constant(&builtin_type_rune, expr);
+				default:
+					assert(0);
+				}
 			}
 		}
 		return tag;
@@ -1192,7 +1201,7 @@ lower_constant(const struct type *type, struct expression *expr)
 	if (type_is_float(type) && type_is_float(expr->result)) {
 		return type;
 	}
-	if (!type_is_integer(type)) {
+	if (!type_is_integer(type) && type->storage != STORAGE_RUNE) {
 		return NULL;
 	}
 	if (type_is_signed(type)) {
@@ -1283,6 +1292,20 @@ check_expr_constant(struct context *ctx,
 		expr->result = type;
 	}
 
+	if (expr->result && expr->result->storage == STORAGE_RUNE) {
+		if (hint == NULL) {
+			hint = builtin_type_for_storage(STORAGE_RUNE, false);
+		}
+		expr->constant.uval = aexpr->constant.uval;
+		const struct type *type = lower_constant(hint, expr);
+		if (!type) {
+			// TODO: This error message is awful
+			return error(aexpr->loc, expr, errors,
+				"Rune constant out of range");
+		}
+		expr->result = type;
+	}
+
 	switch (aexpr->constant.storage) {
 	case STORAGE_I8:
 	case STORAGE_I16: