X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=025af2710bb55da807fb686b6876eaef41d4ce22;hb=6dcf74922f46b086ad394c19fd6ce083a635b290;hp=957b49cea61a149fc213f9dbe71ecc9fa9774d1b;hpb=947bb7477205c038aa1804b84452cddd2108550a;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 957b49ce..025af271 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include "syntax.h"
 #include "visitor.h"
 
@@ -10,7 +11,7 @@ namespace SL {
 const Operator Operator::operators[] =
 {
 	{ "[", 2, BINARY, LEFT_TO_RIGHT },
-	{ "(", 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 },
@@ -20,10 +21,10 @@ const Operator Operator::operators[] =
 	{ "-", 3, PREFIX, RIGHT_TO_LEFT },
 	{ "~", 3, PREFIX, RIGHT_TO_LEFT },
 	{ "!", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "*", 4, BINARY, LEFT_TO_RIGHT },
+	{ "*", 4, BINARY, ASSOCIATIVE },
 	{ "/", 4, BINARY, LEFT_TO_RIGHT },
 	{ "%", 4, BINARY, LEFT_TO_RIGHT },
-	{ "+", 5, BINARY, LEFT_TO_RIGHT },
+	{ "+", 5, BINARY, ASSOCIATIVE },
 	{ "-", 5, BINARY, LEFT_TO_RIGHT },
 	{ "<<", 6, BINARY, LEFT_TO_RIGHT },
 	{ ">>", 6, BINARY, LEFT_TO_RIGHT },
@@ -33,14 +34,14 @@ const Operator Operator::operators[] =
 	{ ">=", 7, BINARY, LEFT_TO_RIGHT },
 	{ "==", 8, BINARY, LEFT_TO_RIGHT },
 	{ "!=", 8, BINARY, LEFT_TO_RIGHT },
-	{ "&", 9, BINARY, LEFT_TO_RIGHT },
-	{ "^", 10, BINARY, LEFT_TO_RIGHT },
-	{ "|", 11, BINARY, LEFT_TO_RIGHT },
-	{ "&&", 12, BINARY, LEFT_TO_RIGHT },
-	{ "^^", 13, BINARY, LEFT_TO_RIGHT },
-	{ "||", 14, BINARY, LEFT_TO_RIGHT },
-	{ "?", 15, BINARY, RIGHT_TO_LEFT },
-	{ ":", 15, BINARY, RIGHT_TO_LEFT },
+	{ "&", 9, BINARY, ASSOCIATIVE },
+	{ "^", 10, BINARY, ASSOCIATIVE },
+	{ "|", 11, BINARY, ASSOCIATIVE },
+	{ "&&", 12, BINARY, ASSOCIATIVE },
+	{ "^^", 13, BINARY, ASSOCIATIVE },
+	{ "||", 14, BINARY, ASSOCIATIVE },
+	{ "?", 15, TERNARY, RIGHT_TO_LEFT },
+	{ ":", 15, TERNARY, RIGHT_TO_LEFT },
 	{ "=", 16, BINARY, RIGHT_TO_LEFT },
 	{ "+=", 16, BINARY, RIGHT_TO_LEFT },
 	{ "-=", 16, BINARY, RIGHT_TO_LEFT },
@@ -56,6 +57,14 @@ const Operator Operator::operators[] =
 	{ { 0 }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
 };
 
+const Operator &Operator::get_operator(const string &token, Type type)
+{
+	for(const Operator *i=operators; i->type; ++i)
+		if(i->type==type && i->token==token)
+			return *i;
+	throw key_error(token);
+}
+
 
 template<typename C>
 NodeContainer<C>::NodeContainer(const NodeContainer &c):
@@ -66,14 +75,16 @@ NodeContainer<C>::NodeContainer(const NodeContainer &c):
 }
 
 
-Statement::Statement():
-	source(0),
-	line(1)
+Block::Block():
+	use_braces(false),
+	parent(0)
 { }
 
-
-Block::Block():
-	use_braces(false)
+Block::Block(const Block &other):
+	Node(other),
+	body(other.body),
+	use_braces(other.use_braces),
+	parent(0)
 { }
 
 void Block::visit(NodeVisitor &visitor)
@@ -82,6 +93,13 @@ void Block::visit(NodeVisitor &visitor)
 }
 
 
+Expression::Expression():
+	oper(0),
+	type(0),
+	lvalue(false)
+{ }
+
+
 void Literal::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -99,6 +117,7 @@ VariableReference::VariableReference():
 { }
 
 VariableReference::VariableReference(const VariableReference &other):
+	Expression(other),
 	name(other.name),
 	declaration(0)
 { }
@@ -109,11 +128,28 @@ void VariableReference::visit(NodeVisitor &visitor)
 }
 
 
+InterfaceBlockReference::InterfaceBlockReference():
+	declaration(0)
+{ }
+
+InterfaceBlockReference::InterfaceBlockReference(const InterfaceBlockReference &other):
+	Expression(other),
+	name(other.name),
+	declaration(0)
+{ }
+
+void InterfaceBlockReference::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
 MemberAccess::MemberAccess():
 	declaration(0)
 { }
 
 MemberAccess::MemberAccess(const MemberAccess &other):
+	Expression(other),
 	left(other.left),
 	member(other.member),
 	declaration(0)
@@ -125,9 +161,17 @@ void MemberAccess::visit(NodeVisitor &visitor)
 }
 
 
-UnaryExpression::UnaryExpression():
-	prefix(true)
-{ }
+Swizzle::Swizzle():
+	count(0)
+{
+	fill(components, components+4, 0);
+}
+
+void Swizzle::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
 
 void UnaryExpression::visit(NodeVisitor &visitor)
 {
@@ -142,13 +186,12 @@ void BinaryExpression::visit(NodeVisitor &visitor)
 
 
 Assignment::Assignment():
-	self_referencing(false),
-	target_declaration(0)
+	self_referencing(false)
 { }
 
 Assignment::Assignment(const Assignment &other):
-	self_referencing(other.self_referencing),
-	target_declaration(0)
+	BinaryExpression(other),
+	self_referencing(other.self_referencing)
 { }
 
 void Assignment::visit(NodeVisitor &visitor)
@@ -157,16 +200,41 @@ void Assignment::visit(NodeVisitor &visitor)
 }
 
 
+Assignment::Target::Target(Statement *d):
+	declaration(d),
+	chain_len(0)
+{
+	fill(chain, chain+7, 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():
-	declaration(0),
-	constructor(false)
+	constructor(false),
+	declaration(0)
 { }
 
 FunctionCall::FunctionCall(const FunctionCall &other):
+	Expression(other),
 	name(other.name),
-	declaration(0),
 	constructor(other.constructor),
-	arguments(other.arguments)
+	arguments(other.arguments),
+	declaration(0)
 { }
 
 void FunctionCall::visit(NodeVisitor &visitor)
@@ -205,11 +273,57 @@ void InterfaceLayout::visit(NodeVisitor &visitor)
 }
 
 
-StructDeclaration::StructDeclaration()
+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)
+{ }
+
+void BasicTypeDeclaration::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
+ImageTypeDeclaration::ImageTypeDeclaration():
+	dimensions(TWO),
+	array(false),
+	sampled(true),
+	shadow(false)
+{ }
+
+void ImageTypeDeclaration::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
+StructDeclaration::StructDeclaration():
+	interface_block(0)
 {
 	members.use_braces = true;
 }
 
+StructDeclaration::StructDeclaration(const StructDeclaration &other):
+	TypeDeclaration(other),
+	members(other.members),
+	interface_block(0)
+{ }
+
+StructDeclaration::~StructDeclaration()
+{
+	if(interface_block && interface_block->struct_declaration==this)
+		interface_block->struct_declaration = 0;
+}
+
 void StructDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -218,27 +332,34 @@ void StructDeclaration::visit(NodeVisitor &visitor)
 
 VariableDeclaration::VariableDeclaration():
 	constant(false),
-	type_declaration(0),
 	array(false),
+	type_declaration(0),
 	linked_declaration(0)
 { }
 
 VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
+	Statement(other),
+	layout(other.layout),
 	constant(other.constant),
 	sampling(other.sampling),
 	interpolation(other.interpolation),
 	interface(other.interface),
 	precision(other.precision),
 	type(other.type),
-	type_declaration(0),
 	name(other.name),
 	array(other.array),
 	array_size(other.array_size),
 	init_expression(other.init_expression),
-	linked_declaration(0),
-	layout(other.layout)
+	type_declaration(0),
+	linked_declaration(0)
 { }
 
+VariableDeclaration::~VariableDeclaration()
+{
+	if(linked_declaration && linked_declaration->linked_declaration==this)
+		linked_declaration->linked_declaration = 0;
+}
+
 void VariableDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -246,9 +367,30 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 
 
 InterfaceBlock::InterfaceBlock():
-	array(false)
+	array(false),
+	type_declaration(0),
+	struct_declaration(0),
+	linked_block(0)
+{ }
+
+InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
+	Statement(other),
+	interface(other.interface),
+	name(other.name),
+	members(other.members),
+	instance_name(other.instance_name),
+	array(other.array),
+	type_declaration(0),
+	struct_declaration(0),
+	linked_block(0)
+{ }
+
+InterfaceBlock::~InterfaceBlock()
 {
-	members.use_braces = true;
+	if(linked_block && linked_block->linked_block==this)
+		linked_block->linked_block = 0;
+	if(struct_declaration && struct_declaration->interface_block==this)
+		struct_declaration->interface_block = 0;
 }
 
 void InterfaceBlock::visit(NodeVisitor &visitor)
@@ -258,15 +400,23 @@ void InterfaceBlock::visit(NodeVisitor &visitor)
 
 
 FunctionDeclaration::FunctionDeclaration():
-	definition(0)
+	virtua(false),
+	overrd(false),
+	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),
+	signature(other.signature),
 	definition(other.definition==&other ? this : 0),
-	body(other.body)
+	return_type_declaration(0)
 { }
 
 void FunctionDeclaration::visit(NodeVisitor &visitor)