From a080e36dac54b82beef63580f36cb0da9ad31788 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Wed, 13 Feb 2019 18:08:41 -0800
Subject: Fold constexpr function into intconstexpr

We usually only care about integer constant expressions, and when we
parse initializers, we need to handle non-constant expressions too,
so we call eval explicitly when emitting global data.
---
 expr.c | 8 +-------
 expr.h | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/expr.c b/expr.c
index a1834c5..6a28efb 100644
--- a/expr.c
+++ b/expr.c
@@ -782,18 +782,12 @@ condexpr(struct scope *s)
 	return e;
 }
 
-struct expression *
-constexpr(struct scope *s)
-{
-	return eval(condexpr(s));
-}
-
 uint64_t
 intconstexpr(struct scope *s)
 {
 	struct expression *e;
 
-	e = constexpr(s);
+	e = eval(condexpr(s));
 	if (e->kind != EXPRCONST || !(typeprop(e->type) & PROPINT))
 		error(&tok.loc, "not an integer constant expression");
 	return e->constant.i;
diff --git a/expr.h b/expr.h
index 5c8ef96..a6cac6d 100644
--- a/expr.h
+++ b/expr.h
@@ -92,7 +92,6 @@ struct scope;
 
 struct expression *expr(struct scope *);
 struct expression *assignexpr(struct scope *);
-struct expression *constexpr(struct scope *);
 uint64_t intconstexpr(struct scope *);
 void delexpr(struct expression *);
 
-- 
cgit v1.2.3