Assorted refactoring and fixes

[libs/gl.git] / source / programsyntax.cpp

diff --git a/source/programsyntax.cpp b/source/programsyntax.cpp
index 299e23b4e6e984ea7d10d66c250588cd9631e7ae..4341f06b72c4542393c052d62c39acccb80fe53e 100644 (file)
--- a/source/programsyntax.cpp
+++ b/source/programsyntax.cpp
@@ -137,19 +137,19 @@ void Conditional::visit(NodeVisitor &visitor)
 }
 
 
-void Passthrough::visit(NodeVisitor &visitor)
+void Iteration::visit(NodeVisitor &visitor)
 {
        visitor.visit(*this);
 }
 
 
-void Return::visit(NodeVisitor &visitor)
+void Passthrough::visit(NodeVisitor &visitor)
 {
        visitor.visit(*this);
 }
 
 
-void Iteration::visit(NodeVisitor &visitor)
+void Return::visit(NodeVisitor &visitor)
 {
        visitor.visit(*this);
 }
@@ -248,18 +248,14 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-Context::Context(ContextType t):
+Stage::Stage(StageType t):
        type(t),
-       present(false),
        previous(0)
 { }
 
 
 Module::Module():
-       global_context(GLOBAL),
-       vertex_context(VERTEX),
-       geometry_context(GEOMETRY),
-       fragment_context(FRAGMENT)
+       shared(SHARED)
 { }
 
 } // namespace ProgramSyntax