feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Check for undefined types.

Browse Source
This commit is contained in:
Roberto Raggi
2010-11-26 12:20:53 +01:00
parent 6cb72f0634
commit beea3ed556
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/glsl/glslsemantic.cpp
View File

@@ -514,7 +514,7 @@ bool Semantic::visit(BasicTypeAST *ast)
break; break;
default: default:
qDebug() << "unknown type:" << GLSLParserTable::spell[ast->token]; _engine->error(ast->lineno, QString("Unknown type `%1'").arg(QLatin1String(GLSLParserTable::spell[ast->token])));
} }
return false; return false;
@@ -522,7 +522,17 @@ bool Semantic::visit(BasicTypeAST *ast)
bool Semantic::visit(NamedTypeAST *ast) bool Semantic::visit(NamedTypeAST *ast)
{ {
Q_UNUSED(ast); if (ast->name) {
if (Symbol *s = _scope->lookup(*ast->name)) {
if (Struct *ty = s->asStruct()) {
_expr.type = ty;
_expr.isConstant = false;
return false;
}
}
_engine->error(ast->lineno, QString("Undefined type `%1'").arg(*ast->name));
}
return false; return false;
} }
@@ -539,6 +549,8 @@ bool Semantic::visit(StructTypeAST *ast)
Struct *s = _engine->newStruct(_scope); Struct *s = _engine->newStruct(_scope);
if (ast->name) if (ast->name)
s->setName(*ast->name); s->setName(*ast->name);
if (Scope *e = s->scope())
e->add(s);
Scope *previousScope = switchScope(s); Scope *previousScope = switchScope(s);
for (List<StructTypeAST::Field *> *it = ast->fields; it; it = it->next) { for (List<StructTypeAST::Field *> *it = ast->fields; it; it = it->next) {
StructTypeAST::Field *f = it->value; StructTypeAST::Field *f = it->value;