merge from upstream and convert to ^File types

1 files changed, 6 insertions, 3 deletions

diff --git a/src/exact_value.cpp b/src/exact_value.cpp
index f6df48951..175cb61f6 100644
--- a/src/exact_value.cpp
+++ b/src/exact_value.cpp
@@ -177,7 +177,11 @@ ExactValue exact_value_typeid(Type *type) {
 
 ExactValue exact_value_integer_from_string(String const &string) {
 	ExactValue result = {ExactValue_Integer};
-	big_int_from_string(&result.value_integer, string);
+	bool success;
+	big_int_from_string(&result.value_integer, string, &success);
+	if (!success) {
+		result = {ExactValue_Invalid};
+	}
 	return result;
 }
 
@@ -591,6 +595,7 @@ failure:
 i32 exact_value_order(ExactValue const &v) {
 	switch (v.kind) {
 	case ExactValue_Invalid:
+	case ExactValue_Compound:
 		return 0;
 	case ExactValue_Bool:
 	case ExactValue_String:
@@ -607,8 +612,6 @@ i32 exact_value_order(ExactValue const &v) {
 		return 6;
 	case ExactValue_Procedure:
 		return 7;
-	// case ExactValue_Compound:
-		// return 8;
 
 	default:
 		GB_PANIC("How'd you get here? Invalid Value.kind %d", v.kind);