From 4fc4d484122cdd92f0b6ad9785c691bb8d396ad2 Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Sat, 6 Aug 2016 18:10:31 -0600
Subject: [PATCH] fix how Identifiers are evaluated

---
 expr/build.go | 22 ++++++++++++++++------
 expr/expr.go  |  5 +++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/expr/build.go b/expr/build.go
index 0ed5de5..84ad460 100644
--- a/expr/build.go
+++ b/expr/build.go
@@ -29,11 +29,21 @@ func (bctx BuildCtx) BuildStmt(s Statement) Expr {
 		panicf("unknown macro: %q", m)
 	}
 
-	return fn(bctx, bctx.buildExpr(s.Arg))
+	return fn(bctx, s.Arg)
 }
 
 // may return nil if e is a Statement which has no return
 func (bctx BuildCtx) buildExpr(e Expr) Expr {
+	return bctx.buildExprTill(e, func(Expr) bool { return false })
+}
+
+// like buildExpr, but will stop short and stop recursing when the function
+// returns true
+func (bctx BuildCtx) buildExprTill(e Expr, fn func(e Expr) bool) Expr {
+	if fn(e) {
+		return e
+	}
+
 	switch ea := e.(type) {
 	case llvmVal:
 		return e
@@ -43,12 +53,12 @@ func (bctx BuildCtx) buildExpr(e Expr) Expr {
 		if v, ok := bctx.C.GetIdentifier(ea); ok {
 			return llvmVal(v)
 		}
-		return ea
+		panicf("identifier %q not found", ea)
 	case Statement:
 		return bctx.BuildStmt(ea)
 	case Tuple:
 		for i := range ea {
-			ea[i] = bctx.buildExpr(ea[i])
+			ea[i] = bctx.buildExprTill(ea[i], fn)
 		}
 		return ea
 	default:
@@ -66,15 +76,15 @@ func (bctx BuildCtx) buildVal(e Expr) llvm.Value {
 var globalCtx = &Ctx{
 	macros: map[Macro]MacroFn{
 		"add": func(bctx BuildCtx, e Expr) Expr {
-			tup := e.(Tuple)
+			tup := bctx.buildExpr(e).(Tuple)
 			a := bctx.buildVal(tup[0])
 			b := bctx.buildVal(tup[1])
 			return llvmVal(bctx.B.CreateAdd(a, b, ""))
 		},
 
 		"bind": func(bctx BuildCtx, e Expr) Expr {
-			tup := e.(Tuple)
-			id := bctx.buildExpr(tup[0]).(Identifier)
+			tup := bctx.buildExprTill(e, isIdentifier).(Tuple)
+			id := bctx.buildExprTill(tup[0], isIdentifier).(Identifier)
 			bctx.C.idents[id] = bctx.buildVal(tup[1])
 			return nil
 		},
diff --git a/expr/expr.go b/expr/expr.go
index f820ffb..dfb2869 100644
--- a/expr/expr.go
+++ b/expr/expr.go
@@ -95,6 +95,11 @@ func (id Identifier) equal(e equaler) bool {
 	return ok && idid == id
 }
 
+func isIdentifier(e Expr) bool {
+	_, ok := e.(Identifier)
+	return ok
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // Macro is an identifier for a macro which can be used to transform