From e4c168836e2a1c0b4f0908552dd4718064085a70 Mon Sep 17 00:00:00 2001
From: Johanna Amann <johanna@icir.org>
Date: Wed, 30 Nov 2016 10:18:23 -0800
Subject: [PATCH] binpac: Allow more than one &require attribute on a field.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by François Pennaneach <francois.pennaneach@free.fr>.

BIT-1753 #close
---
 tools/binpac/src/pac_type.cc | 13 ++++++++-----
 tools/binpac/src/pac_type.h  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/binpac/src/pac_type.cc b/tools/binpac/src/pac_type.cc
index a30295aa0e..4023da920d 100644
--- a/tools/binpac/src/pac_type.cc
+++ b/tools/binpac/src/pac_type.cc
@@ -60,7 +60,7 @@ Type::Type(TypeType tot)
 	attr_multiline_end_ = 0;
 	attr_oneline_ = false;
 	attr_refcount_ = false;
-	attr_requires_ = 0;
+	attr_requires_ = new ExprList();
 	attr_restofdata_ = false;
 	attr_restofflow_ = false;
 	attr_transient_ = false;
@@ -80,7 +80,7 @@ Type::~Type()
 	delete attr_if_expr_;
 	delete attr_length_expr_;
 	delete_list(ExprList, attr_checks_);
-	delete attr_requires_;
+	delete_list(ExprList, attr_requires_);
 	}
 
 Type *Type::Clone() const
@@ -203,7 +203,7 @@ void Type::ProcessAttr(Attr* a)
 			break;
 
 		case ATTR_REQUIRES:
-			attr_requires_ = a->expr();
+			attr_requires_->push_back(a->expr());
 			break;
 
 		case ATTR_TRANSIENT:
@@ -723,8 +723,11 @@ void Type::GenParseCode2(Output* out_cc, Env* env,
 
 void Type::GenParseCode3(Output* out_cc, Env* env, const DataPtr& data, int flags)
 	{
-	if ( attr_requires_ )
-		attr_requires_->EvalExpr(out_cc, env);
+	foreach(i, ExprList, attr_requires_)
+		{
+		Expr *req = *i;
+		req->EvalExpr(out_cc, env);
+		}
 
 	foreach(i, FieldList, fields_)
 		{
diff --git a/tools/binpac/src/pac_type.h b/tools/binpac/src/pac_type.h
index 08252cf637..6e9f548600 100644
--- a/tools/binpac/src/pac_type.h
+++ b/tools/binpac/src/pac_type.h
@@ -290,7 +290,7 @@ protected:
 	Expr *attr_multiline_end_;
 	bool attr_oneline_;
 	bool attr_refcount_;
-	Expr *attr_requires_;
+	ExprList *attr_requires_;
 	bool attr_restofdata_;
 	bool attr_restofflow_;
 	bool attr_transient_;