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

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index bb8d7dab..dff52639 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -75,11 +75,6 @@ NodeContainer<C>::NodeContainer(const NodeContainer &c):
 }
 
 
-Block::Block():
-	use_braces(false),
-	parent(0)
-{ }
-
 Block::Block(const Block &other):
 	Node(other),
 	body(other.body),
@@ -93,27 +88,15 @@ void Block::visit(NodeVisitor &visitor)
 }
 
 
-Expression::Expression():
-	oper(0),
-	type(0),
-	lvalue(false)
-{ }
-
-
 void Literal::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)
@@ -122,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)
@@ -138,17 +116,11 @@ void InterfaceBlockReference::visit(NodeVisitor &visitor)
 }
 
 
-MemberAccess::MemberAccess():
-	declaration(0),
-	index(-1)
-{ }
-
 MemberAccess::MemberAccess(const MemberAccess &other):
 	Expression(other),
 	left(other.left),
-	member(other.member),
-	declaration(0),
-	index(-1)
+	member(other.member)
+	// Do not copy declaration
 { }
 
 void MemberAccess::visit(NodeVisitor &visitor)
@@ -157,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);
@@ -181,13 +147,10 @@ void BinaryExpression::visit(NodeVisitor &visitor)
 }
 
 
-Assignment::Assignment():
-	self_referencing(false)
-{ }
-
 Assignment::Assignment(const Assignment &other):
 	BinaryExpression(other),
 	self_referencing(other.self_referencing)
+	// Do not copy target
 { }
 
 void Assignment::visit(NodeVisitor &visitor)
@@ -196,13 +159,6 @@ 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)
@@ -220,17 +176,12 @@ void TernaryExpression::visit(NodeVisitor &visitor)
 }
 
 
-FunctionCall::FunctionCall():
-	constructor(false),
-	declaration(0)
-{ }
-
 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)
@@ -269,20 +220,13 @@ void InterfaceLayout::visit(NodeVisitor &visitor)
 }
 
 
-BasicTypeDeclaration::BasicTypeDeclaration():
-	kind(ALIAS),
-	size(0),
-	sign(true),
-	base_type(0)
-{ }
-
 BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other):
 	TypeDeclaration(other),
 	kind(other.kind),
 	size(other.size),
 	sign(other.sign),
-	base(other.base),
-	base_type(0)
+	base(other.base)
+	// Do not copy base type
 { }
 
 void BasicTypeDeclaration::visit(NodeVisitor &visitor)
@@ -291,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()
@@ -328,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),
@@ -347,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()
@@ -364,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),
 	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()
@@ -397,13 +316,6 @@ void InterfaceBlock::visit(NodeVisitor &visitor)
 }
 
 
-FunctionDeclaration::FunctionDeclaration():
-	virtua(false),
-	overrd(false),
-	definition(0),
-	return_type_declaration(0)
-{ }
-
 FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	Statement(other),
 	return_type(other.return_type),
@@ -413,8 +325,8 @@ FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	overrd(other.overrd),
 	body(other.body),
 	signature(other.signature),
-	definition(other.definition==&other ? this : 0),
-	return_type_declaration(0)
+	definition(other.definition==&other ? this : 0)
+	// Do not copy return type declaration
 { }
 
 void FunctionDeclaration::visit(NodeVisitor &visitor)