Allow more than one &require attribute on a field.

Patch by François Pennaneach <[email protected]>.

BIT-1753 #close

CHANGES

@@ -1,4 +1,8 @@
 
+0.46-1 | 2016-11-30 10:18:23 -0800
+
+  * Allow more than one &require attribute on a field. (François Pennaneach)
+
 0.46 | 2016-10-27 14:41:38 -0700
 
   * Release 0.46.

README

@@ -1,7 +1,7 @@
 ..	-*- mode: rst-mode -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.46
+.. |version| replace:: 0.46-1
 
 ======
 BinPAC

VERSION

@@ -1 +1 @@
-0.46
+0.46-1

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_)
 		{

src/pac_type.h

@@ -290,7 +290,7 @@ class Type : public Object, public DataDepElement
 	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_;