X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=dff52639b0e2c835d43a4f622f4d4b590d8b13cf;hp=85d805d1b67aeea72ee41bcec1855222732dc5ef;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=f526938b407e061c7424adedc34af4d1ff687f90

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 85d805d1..dff52639 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"
@@ -10,51 +11,50 @@ namespace SL {
 
 const Operator Operator::operators[] =
 {
-	{ "[", 2, BINARY, LEFT_TO_RIGHT },
-	{ "(", 2, POSTFIX, LEFT_TO_RIGHT },
-	{ ".", 2, BINARY, LEFT_TO_RIGHT },
-	{ "++", 2, POSTFIX, LEFT_TO_RIGHT },
-	{ "--", 2, POSTFIX, LEFT_TO_RIGHT },
-	{ "++", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "--", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "+", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "-", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "~", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "!", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "*", 4, BINARY, ASSOCIATIVE },
-	{ "/", 4, BINARY, LEFT_TO_RIGHT },
-	{ "%", 4, BINARY, LEFT_TO_RIGHT },
-	{ "+", 5, BINARY, ASSOCIATIVE },
-	{ "-", 5, BINARY, LEFT_TO_RIGHT },
-	{ "<<", 6, BINARY, LEFT_TO_RIGHT },
-	{ ">>", 6, BINARY, LEFT_TO_RIGHT },
-	{ "<", 7, BINARY, LEFT_TO_RIGHT },
-	{ ">", 7, BINARY, LEFT_TO_RIGHT },
-	{ "<=", 7, BINARY, LEFT_TO_RIGHT },
-	{ ">=", 7, BINARY, LEFT_TO_RIGHT },
-	{ "==", 8, BINARY, LEFT_TO_RIGHT },
-	{ "!=", 8, BINARY, LEFT_TO_RIGHT },
-	{ "&", 9, BINARY, ASSOCIATIVE },
-	{ "^", 10, BINARY, ASSOCIATIVE },
-	{ "|", 11, BINARY, ASSOCIATIVE },
-	{ "&&", 12, BINARY, ASSOCIATIVE },
-	{ "^^", 13, BINARY, ASSOCIATIVE },
-	{ "||", 14, BINARY, ASSOCIATIVE },
-	{ "?", 15, BINARY, RIGHT_TO_LEFT },
-	{ ":", 15, BINARY, RIGHT_TO_LEFT },
-	{ "=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "+=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "-=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "*=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "/=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "%=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "<<=", 16, BINARY, RIGHT_TO_LEFT },
-	{ ">>=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "&=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "^=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "|=", 16, BINARY, RIGHT_TO_LEFT },
-	{ ",", 17, BINARY, LEFT_TO_RIGHT },
-	{ { 0 }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
+	{ "[", "]", 2, BINARY, LEFT_TO_RIGHT },
+	{ "(", ")", 2, POSTFIX, LEFT_TO_RIGHT },
+	{ ".", { }, 2, POSTFIX, LEFT_TO_RIGHT },
+	{ "++", { }, 2, POSTFIX, LEFT_TO_RIGHT },
+	{ "--", { }, 2, POSTFIX, LEFT_TO_RIGHT },
+	{ "++", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "--", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "+", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "-", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "~", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "!", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "*", { }, 4, BINARY, ASSOCIATIVE },
+	{ "/", { }, 4, BINARY, LEFT_TO_RIGHT },
+	{ "%", { }, 4, BINARY, LEFT_TO_RIGHT },
+	{ "+", { }, 5, BINARY, ASSOCIATIVE },
+	{ "-", { }, 5, BINARY, LEFT_TO_RIGHT },
+	{ "<<", { }, 6, BINARY, LEFT_TO_RIGHT },
+	{ ">>", { }, 6, BINARY, LEFT_TO_RIGHT },
+	{ "<", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ ">", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ "<=", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ ">=", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ "==", { }, 8, BINARY, LEFT_TO_RIGHT },
+	{ "!=", { }, 8, BINARY, LEFT_TO_RIGHT },
+	{ "&", { }, 9, BINARY, ASSOCIATIVE },
+	{ "^", { }, 10, BINARY, ASSOCIATIVE },
+	{ "|", { }, 11, BINARY, ASSOCIATIVE },
+	{ "&&", { }, 12, BINARY, ASSOCIATIVE },
+	{ "^^", { }, 13, BINARY, ASSOCIATIVE },
+	{ "||", { }, 14, BINARY, ASSOCIATIVE },
+	{ "?", ":", 15, TERNARY, RIGHT_TO_LEFT },
+	{ "=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "+=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "-=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "*=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "/=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "%=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "<<=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ ">>=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "&=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "^=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "|=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ ",", { }, 17, BINARY, LEFT_TO_RIGHT },
+	{ { 0 }, { }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
 };
 
 const Operator &Operator::get_operator(const string &token, Type type)
@@ -70,16 +70,11 @@ 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();
 }
 
 
-Block::Block():
-	use_braces(false),
-	parent(0)
-{ }
-
 Block::Block(const Block &other):
 	Node(other),
 	body(other.body),
@@ -93,33 +88,15 @@ void Block::visit(NodeVisitor &visitor)
 }
 
 
-Expression::Expression():
-	oper(0),
-	type(0),
-	lvalue(false)
-{ }
-
-
 void Literal::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
 }
 
 
-void ParenthesizedExpression::visit(NodeVisitor &visitor)
-{
-	visitor.visit(*this);
-}
-
-
-VariableReference::VariableReference():
-	declaration(0)
-{ }
-
 VariableReference::VariableReference(const VariableReference &other):
 	Expression(other),
-	name(other.name),
-	declaration(0)
+	name(other.name)
 { }
 
 void VariableReference::visit(NodeVisitor &visitor)
@@ -128,14 +105,9 @@ void VariableReference::visit(NodeVisitor &visitor)
 }
 
 
-InterfaceBlockReference::InterfaceBlockReference():
-	declaration(0)
-{ }
-
 InterfaceBlockReference::InterfaceBlockReference(const InterfaceBlockReference &other):
 	Expression(other),
-	name(other.name),
-	declaration(0)
+	name(other.name)
 { }
 
 void InterfaceBlockReference::visit(NodeVisitor &visitor)
@@ -144,15 +116,11 @@ void InterfaceBlockReference::visit(NodeVisitor &visitor)
 }
 
 
-MemberAccess::MemberAccess():
-	declaration(0)
-{ }
-
 MemberAccess::MemberAccess(const MemberAccess &other):
 	Expression(other),
 	left(other.left),
-	member(other.member),
-	declaration(0)
+	member(other.member)
+	// Do not copy declaration
 { }
 
 void MemberAccess::visit(NodeVisitor &visitor)
@@ -161,12 +129,6 @@ void MemberAccess::visit(NodeVisitor &visitor)
 }
 
 
-Swizzle::Swizzle():
-	count(0)
-{
-	fill(components, components+4, 0);
-}
-
 void Swizzle::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -185,15 +147,10 @@ void BinaryExpression::visit(NodeVisitor &visitor)
 }
 
 
-Assignment::Assignment():
-	self_referencing(false),
-	target_declaration(0)
-{ }
-
 Assignment::Assignment(const Assignment &other):
 	BinaryExpression(other),
-	self_referencing(other.self_referencing),
-	target_declaration(0)
+	self_referencing(other.self_referencing)
+	// Do not copy target
 { }
 
 void Assignment::visit(NodeVisitor &visitor)
@@ -202,17 +159,29 @@ void Assignment::visit(NodeVisitor &visitor)
 }
 
 
-FunctionCall::FunctionCall():
-	constructor(false),
-	declaration(0)
-{ }
+bool Assignment::Target::operator<(const Target &other) const
+{
+	if(declaration!=other.declaration)
+		return declaration<other.declaration;
+	for(unsigned i=0; (i<7 && i<chain_len && i<other.chain_len); ++i)
+		if(chain[i]!=other.chain[i])
+			return chain[i]<other.chain[i];
+	return chain_len<other.chain_len;
+}
+
+
+void TernaryExpression::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
 
 FunctionCall::FunctionCall(const FunctionCall &other):
 	Expression(other),
 	name(other.name),
 	constructor(other.constructor),
-	arguments(other.arguments),
-	declaration(0)
+	arguments(other.arguments)
+	// Do not copy declaration
 { }
 
 void FunctionCall::visit(NodeVisitor &visitor)
@@ -251,18 +220,13 @@ void InterfaceLayout::visit(NodeVisitor &visitor)
 }
 
 
-BasicTypeDeclaration::BasicTypeDeclaration():
-	kind(ALIAS),
-	size(0),
-	base_type(0)
-{ }
-
 BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other):
 	TypeDeclaration(other),
 	kind(other.kind),
 	size(other.size),
-	base(other.base),
-	base_type(0)
+	sign(other.sign),
+	base(other.base)
+	// Do not copy base type
 { }
 
 void BasicTypeDeclaration::visit(NodeVisitor &visitor)
@@ -271,29 +235,21 @@ void BasicTypeDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-ImageTypeDeclaration::ImageTypeDeclaration():
-	dimensions(TWO),
-	array(false),
-	sampled(true),
-	shadow(false)
-{ }
-
 void ImageTypeDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
 }
 
 
-StructDeclaration::StructDeclaration():
-	interface_block(0)
+StructDeclaration::StructDeclaration()
 {
 	members.use_braces = true;
 }
 
 StructDeclaration::StructDeclaration(const StructDeclaration &other):
 	TypeDeclaration(other),
-	members(other.members),
-	interface_block(0)
+	members(other.members)
+	// Do not copy interface block
 { }
 
 StructDeclaration::~StructDeclaration()
@@ -308,13 +264,6 @@ void StructDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-VariableDeclaration::VariableDeclaration():
-	constant(false),
-	array(false),
-	type_declaration(0),
-	linked_declaration(0)
-{ }
-
 VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
 	Statement(other),
 	layout(other.layout),
@@ -327,9 +276,8 @@ VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
 	name(other.name),
 	array(other.array),
 	array_size(other.array_size),
-	init_expression(other.init_expression),
-	type_declaration(0),
-	linked_declaration(0)
+	init_expression(other.init_expression)
+	// Do not copy type and linked declarations
 { }
 
 VariableDeclaration::~VariableDeclaration()
@@ -344,23 +292,14 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-InterfaceBlock::InterfaceBlock():
-	array(false),
-	type_declaration(0),
-	struct_declaration(0),
-	linked_block(0)
-{ }
-
 InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
 	Statement(other),
 	interface(other.interface),
-	name(other.name),
+	block_name(other.block_name),
 	members(other.members),
 	instance_name(other.instance_name),
-	array(other.array),
-	type_declaration(0),
-	struct_declaration(0),
-	linked_block(0)
+	array(other.array)
+	// Do not copy pointers to other nodes
 { }
 
 InterfaceBlock::~InterfaceBlock()
@@ -377,19 +316,17 @@ void InterfaceBlock::visit(NodeVisitor &visitor)
 }
 
 
-FunctionDeclaration::FunctionDeclaration():
-	definition(0),
-	return_type_declaration(0)
-{ }
-
 FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	Statement(other),
 	return_type(other.return_type),
 	name(other.name),
 	parameters(other.parameters),
+	virtua(other.virtua),
+	overrd(other.overrd),
 	body(other.body),
-	definition(other.definition==&other ? this : 0),
-	return_type_declaration(0)
+	signature(other.signature),
+	definition(other.definition==&other ? this : 0)
+	// Do not copy return type declaration
 { }
 
 void FunctionDeclaration::visit(NodeVisitor &visitor)
@@ -435,7 +372,7 @@ Stage::Stage(Stage::Type t):
 
 const char *Stage::get_stage_name(Type type)
 {
-	static const char *names[] = { "shared", "vertex", "geometry", "fragment" };
+	static const char *const names[] = { "shared", "vertex", "geometry", "fragment" };
 	return names[type];
 }
 
@@ -444,6 +381,40 @@ Module::Module():
 	shared(Stage::SHARED)
 { }
 
+
+string get_unused_variable_name(const Block &block, const string &base)
+{
+	string name = base;
+
+	unsigned number = 1;
+	unsigned base_size = name.size();
+	while(1)
+	{
+		bool unused = true;
+		for(const Block *b=&block; (unused && b); b=b->parent)
+			unused = !b->variables.count(name);
+		if(unused)
+			return name;
+
+		name.erase(base_size);
+		name += format("_%d", number);
+		++number;
+	}
+}
+
+int get_layout_value(const Layout &layout, const string &name, int 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)
+{
+	if(target.chain_len<7)
+		target.chain[target.chain_len] = type | min<unsigned>(index, 0x3F);
+	++target.chain_len;
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp