X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=502c274810074c00b488711e55cae6e15ae29c7c;hb=c4aeeced7b397d46772577775bd3a0d6c4706cba;hp=b224763248f26aa20f2d7e537ccbc6aa224acdb7;hpb=fdf2d162b21f55ad60bfeec2ad98c58356a083c0;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index b2247632..502c2748 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include "syntax.h"
 #include "visitor.h"
@@ -69,8 +70,8 @@ template<typename C>
 NodeContainer<C>::NodeContainer(const NodeContainer &c):
 	C(c)
 {
-	for(typename C::iterator i=this->begin(); i!=this->end(); ++i)
-		*i = (*i)->clone();
+	for(auto &i: *this)
+		i = i->clone();
 }
 
 
@@ -271,6 +272,7 @@ void InterfaceLayout::visit(NodeVisitor &visitor)
 BasicTypeDeclaration::BasicTypeDeclaration():
 	kind(ALIAS),
 	size(0),
+	sign(true),
 	base_type(0)
 { }
 
@@ -278,6 +280,7 @@ BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other):
 	TypeDeclaration(other),
 	kind(other.kind),
 	size(other.size),
+	sign(other.sign),
 	base(other.base),
 	base_type(0)
 { }
@@ -487,72 +490,10 @@ string get_unused_variable_name(const Block &block, const string &base)
 	}
 }
 
-bool is_same_type(const TypeDeclaration &type1, const TypeDeclaration &type2)
-{
-	if(const BasicTypeDeclaration *basic1 = dynamic_cast<const BasicTypeDeclaration *>(&type1))
-	{
-		const BasicTypeDeclaration *basic2 = dynamic_cast<const BasicTypeDeclaration *>(&type2);
-		if(!basic2)
-			return false;
-
-		if(basic1->kind!=basic2->kind || basic1->size!=basic2->size)
-			return false;
-
-		if(basic1->base_type && basic2->base_type)
-			return is_same_type(*basic1->base_type, *basic2->base_type);
-		else
-			return (!basic1->base_type && !basic2->base_type);
-	}
-	else if(const ImageTypeDeclaration *image1 = dynamic_cast<const ImageTypeDeclaration *>(&type1))
-	{
-		const ImageTypeDeclaration *image2 = dynamic_cast<const ImageTypeDeclaration *>(&type2);
-		if(!image2)
-			return false;
-
-		if(image1->dimensions!=image2->dimensions || image1->array!=image2->array)
-			return false;
-		if(image1->sampled!=image2->sampled || image1->shadow!=image2->shadow)
-			return false;
-
-		if(image1->base_type && image2->base_type)
-			return is_same_type(*image1->base_type, *image2->base_type);
-		else
-			return (!image1->base_type && !image2->base_type);
-	}
-	else if(const StructDeclaration *strct1 = dynamic_cast<const StructDeclaration *>(&type1))
-	{
-		const StructDeclaration *strct2 = dynamic_cast<const StructDeclaration *>(&type2);
-		if(!strct2)
-			return false;
-
-		NodeList<Statement>::const_iterator i = strct1->members.body.begin();
-		NodeList<Statement>::const_iterator j = strct2->members.body.begin();
-		for(; (i!=strct1->members.body.end() && j!=strct2->members.body.end()); ++i, ++j)
-		{
-			const VariableDeclaration *var1 = dynamic_cast<const VariableDeclaration *>(i->get());
-			const VariableDeclaration *var2 = dynamic_cast<const VariableDeclaration *>(j->get());
-			if(!var1 || !var1->type_declaration || !var2 || !var2->type_declaration)
-				return false;
-			if(!is_same_type(*var1->type_declaration, *var2->type_declaration))
-				return false;
-			if(var1->name!=var2->name || var1->array!=var2->array)
-				return false;
-			// TODO Compare array sizes
-			// TODO Compare layout qualifiers for interface block members
-		}
-
-		return (i==strct1->members.body.end() && j==strct2->members.body.end());
-	}
-	else
-		return false;
-}
-
 int get_layout_value(const Layout &layout, const string &name, int def_value)
 {
-	for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
-		if(i->name==name)
-			return i->value;
-	return def_value;
+	auto i = find_member(layout.qualifiers, name, &Layout::Qualifier::name);
+	return (i!=layout.qualifiers.end() ? i->value : def_value);
 }
 
 void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type, unsigned index)