Validate some aspects of type declarations

[libs/gl.git] / source / glsl / validate.cpp

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 6f0869ea141897813c4e4f3190a81082457ceed1..8e5e996cb1f430ce1fe7c4103807c31a96f60a33 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -23,6 +23,57 @@ void Validator::diagnose(Node &node, Diagnostic::Severity severity, const string
 }
 
 
+TypeValidator::TypeValidator():
+       in_struct(false)
+{ }
+
+void TypeValidator::visit(BasicTypeDeclaration &type)
+{
+       if(type.kind==BasicTypeDeclaration::VECTOR)
+       {
+               BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID;
+               if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+                       base_kind = basic_base->kind;
+               if(base_kind!=BasicTypeDeclaration::BOOL && base_kind!=BasicTypeDeclaration::INT && base_kind!=BasicTypeDeclaration::FLOAT)
+                       error(type, format("Invalid base type '%s' for vector type '%s'", type.base, type.name));
+       }
+       else if(type.kind==BasicTypeDeclaration::ARRAY)
+       {
+               if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+                       if(basic_base->kind==BasicTypeDeclaration::VOID)
+                               error(type, format("Invalid base type '%s' for array type '%s'", type.base, type.name));
+       }
+}
+
+void TypeValidator::visit(ImageTypeDeclaration &type)
+{
+       BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID;
+       if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+               base_kind = basic_base->kind;
+       if(base_kind!=BasicTypeDeclaration::INT && base_kind!=BasicTypeDeclaration::FLOAT)
+               error(type, format("Invalid base type '%s' for image type '%s'", type.base, type.name));
+}
+
+void TypeValidator::visit(StructDeclaration &strct)
+{
+       SetFlag set_struct(in_struct);
+       TraversingVisitor::visit(strct);
+}
+
+void TypeValidator::visit(VariableDeclaration &var)
+{
+       if(in_struct)
+       {
+               if(var.layout)
+                       error(var, "Struct members can't have layouts");
+               if(var.init_expression)
+                       error(var, "Struct members can't have initializers");
+       }
+
+       TraversingVisitor::visit(var);
+}
+
+
 DeclarationValidator::DeclarationValidator():
        anonymous_block(false)
 { }
@@ -113,6 +164,18 @@ void DeclarationValidator::visit(FunctionDeclaration &func)
 }
 
 
+void ReferenceValidator::visit(BasicTypeDeclaration &type)
+{
+       if(!type.base.empty() && !type.base_type)
+               error(type, format("Use of undeclared type '%s'", type.base));
+}
+
+void ReferenceValidator::visit(ImageTypeDeclaration &type)
+{
+       if(!type.base.empty() && !type.base_type)
+               error(type, format("Use of undeclared type '%s'", type.base));
+}
+
 void ReferenceValidator::visit(VariableReference &var)
 {
        if(!var.declaration)