X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=38a7f003be8b239f360df2a143cf214ed50a43b8;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hp=2ab4d1b61a197b3ccee9ea849d60c990e8b2427b;hpb=efbce87192ce73ba577684369f759693dccec67c;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 2ab4d1b6..38a7f003 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -78,8 +78,7 @@ NodeContainer<C>::NodeContainer(const NodeContainer &c):
 Block::Block(const Block &other):
 	Node(other),
 	body(other.body),
-	use_braces(other.use_braces),
-	parent(0)
+	use_braces(other.use_braces)
 { }
 
 void Block::visit(NodeVisitor &visitor)
@@ -105,17 +104,6 @@ void VariableReference::visit(NodeVisitor &visitor)
 }
 
 
-InterfaceBlockReference::InterfaceBlockReference(const InterfaceBlockReference &other):
-	Expression(other),
-	name(other.name)
-{ }
-
-void InterfaceBlockReference::visit(NodeVisitor &visitor)
-{
-	visitor.visit(*this);
-}
-
-
 MemberAccess::MemberAccess(const MemberAccess &other):
 	Expression(other),
 	left(other.left),
@@ -225,6 +213,7 @@ BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other):
 	kind(other.kind),
 	size(other.size),
 	sign(other.sign),
+	extended_alignment(other.extended_alignment),
 	base(other.base)
 	// Do not copy base type
 { }
@@ -248,16 +237,12 @@ StructDeclaration::StructDeclaration()
 
 StructDeclaration::StructDeclaration(const StructDeclaration &other):
 	TypeDeclaration(other),
-	members(other.members)
-	// Do not copy interface block
+	members(other.members),
+	block_name(other.block_name),
+	extended_alignment(other.extended_alignment)
+	// Do not copy block declaration
 { }
 
-StructDeclaration::~StructDeclaration()
-{
-	if(interface_block && interface_block->struct_declaration==this)
-		interface_block->struct_declaration = 0;
-}
-
 void StructDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -277,7 +262,7 @@ VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
 	array(other.array),
 	array_size(other.array_size),
 	init_expression(other.init_expression)
-	// Do not copy type and linked declarations
+	// Do not copy pointers to other nodes
 { }
 
 VariableDeclaration::~VariableDeclaration()
@@ -292,31 +277,6 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
-	Statement(other),
-	layout(other.layout),
-	interface(other.interface),
-	block_name(other.block_name),
-	members(other.members),
-	instance_name(other.instance_name),
-	array(other.array)
-	// Do not copy pointers to other nodes
-{ }
-
-InterfaceBlock::~InterfaceBlock()
-{
-	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)
-{
-	visitor.visit(*this);
-}
-
-
 FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	Statement(other),
 	return_type(other.return_type),
@@ -402,7 +362,7 @@ string get_unused_variable_name(const Block &block, const string &base)
 	}
 }
 
-const TypeDeclaration *get_ultimate_base_type(const TypeDeclaration *type)
+TypeDeclaration *get_ultimate_base_type(TypeDeclaration *type)
 {
 	if(!type)
 		return 0;