X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Fsyntax.cpp;h=6c766fd758161283006de48f0cdbc09666e8d305;hb=64d98b0b4fb3214a3ca67ab1b239c120748e8e35;hp=e7a5c155e851e2ef179ebc59ef8324ec8b0580c8;hpb=d3ceb2186dc79130508093b3d0c944771a53534f;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index e7a5c155..6c766fd7 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -1,4 +1,5 @@
 #include "syntax.h"
+#include "visitor.h"
 
 using namespace std;
 
@@ -72,7 +73,15 @@ Statement::Statement():
 
 
 Block::Block():
-	use_braces(false)
+	use_braces(false),
+	parent(0)
+{ }
+
+Block::Block(const Block &other):
+	Node(other),
+	body(other.body),
+	use_braces(other.use_braces),
+	parent(0)
 { }
 
 void Block::visit(NodeVisitor &visitor)
@@ -97,12 +106,42 @@ VariableReference::VariableReference():
 	declaration(0)
 { }
 
+VariableReference::VariableReference(const VariableReference &other):
+	name(other.name),
+	declaration(0)
+{ }
+
 void VariableReference::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
 }
 
 
+InterfaceBlockReference::InterfaceBlockReference():
+	declaration(0)
+{ }
+
+InterfaceBlockReference::InterfaceBlockReference(const InterfaceBlockReference &other):
+	name(other.name),
+	declaration(0)
+{ }
+
+void InterfaceBlockReference::visit(NodeVisitor &visitor)
+{
+	visitor.visit(*this);
+}
+
+
+MemberAccess::MemberAccess():
+	declaration(0)
+{ }
+
+MemberAccess::MemberAccess(const MemberAccess &other):
+	left(other.left),
+	member(other.member),
+	declaration(0)
+{ }
+
 void MemberAccess::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -130,6 +169,11 @@ Assignment::Assignment():
 	target_declaration(0)
 { }
 
+Assignment::Assignment(const Assignment &other):
+	self_referencing(other.self_referencing),
+	target_declaration(0)
+{ }
+
 void Assignment::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -141,6 +185,13 @@ FunctionCall::FunctionCall():
 	constructor(false)
 { }
 
+FunctionCall::FunctionCall(const FunctionCall &other):
+	name(other.name),
+	declaration(0),
+	constructor(other.constructor),
+	arguments(other.arguments)
+{ }
+
 void FunctionCall::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -195,6 +246,22 @@ VariableDeclaration::VariableDeclaration():
 	linked_declaration(0)
 { }
 
+VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
+	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)
+{ }
+
 void VariableDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -202,11 +269,21 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 
 
 InterfaceBlock::InterfaceBlock():
-	array(false)
+	array(false),
+	linked_block(0)
 {
 	members.use_braces = true;
 }
 
+InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
+	interface(other.interface),
+	name(other.name),
+	members(other.members),
+	instance_name(other.instance_name),
+	array(other.array),
+	linked_block(0)
+{ }
+
 void InterfaceBlock::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -221,7 +298,7 @@ FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	return_type(other.return_type),
 	name(other.name),
 	parameters(other.parameters),
-	definition(other.definition==&other ? this : other.definition),
+	definition(other.definition==&other ? this : 0),
 	body(other.body)
 { }
 
@@ -261,121 +338,20 @@ void Jump::visit(NodeVisitor &visitor)
 }
 
 
-void NodeVisitor::visit(Assignment &assign)
-{
-	visit(static_cast<BinaryExpression &>(assign));
-}
-
-
-void TraversingVisitor::visit(Block &block)
-{
-	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
-		(*i)->visit(*this);
-}
-
-void TraversingVisitor::visit(ParenthesizedExpression &parexpr)
-{
-	parexpr.expression->visit(*this);
-}
-
-void TraversingVisitor::visit(MemberAccess &memacc)
-{
-	memacc.left->visit(*this);
-}
-
-void TraversingVisitor::visit(UnaryExpression &unary)
-{
-	unary.expression->visit(*this);
-}
-
-void TraversingVisitor::visit(BinaryExpression &binary)
-{
-	binary.left->visit(*this);
-	binary.right->visit(*this);
-}
-
-void TraversingVisitor::visit(FunctionCall &call)
-{
-	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-		(*i)->visit(*this);
-}
-
-void TraversingVisitor::visit(ExpressionStatement &expr)
-{
-	expr.expression->visit(*this);
-}
-
-void TraversingVisitor::visit(InterfaceLayout &layout)
-{
-	layout.layout.visit(*this);
-}
-
-void TraversingVisitor::visit(StructDeclaration &strct)
-{
-	strct.members.visit(*this);
-}
-
-void TraversingVisitor::visit(VariableDeclaration &var)
-{
-	if(var.layout)
-		var.layout->visit(*this);
-	if(var.init_expression)
-		var.init_expression->visit(*this);
-	if(var.array_size)
-		var.array_size->visit(*this);
-}
-
-void TraversingVisitor::visit(InterfaceBlock &iface)
-{
-	iface.members.visit(*this);
-}
-
-void TraversingVisitor::visit(FunctionDeclaration &func)
-{
-	for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
-		(*i)->visit(*this);
-	func.body.visit(*this);
-}
-
-void TraversingVisitor::visit(Conditional &cond)
-{
-	cond.condition->visit(*this);
-	cond.body.visit(*this);
-	cond.else_body.visit(*this);
-}
-
-void TraversingVisitor::visit(Iteration &iter)
-{
-	if(iter.init_statement)
-		iter.init_statement->visit(*this);
-	if(iter.condition)
-		iter.condition->visit(*this);
-	if(iter.loop_expression)
-		iter.loop_expression->visit(*this);
-	iter.body.visit(*this);
-}
-
-void TraversingVisitor::visit(Passthrough &pass)
-{
-	if(pass.subscript)
-		pass.subscript->visit(*this);
-}
-
-void TraversingVisitor::visit(Return &ret)
-{
-	if(ret.expression)
-		ret.expression->visit(*this);
-}
-
-
-Stage::Stage(StageType t):
+Stage::Stage(Stage::Type t):
 	type(t),
 	previous(0)
 { }
 
+const char *Stage::get_stage_name(Type type)
+{
+	static const char *names[] = { "shared", "vertex", "geometry", "fragment" };
+	return names[type];
+}
+
 
 Module::Module():
-	shared(SHARED)
+	shared(Stage::SHARED)
 { }
 
 } // namespace SL