Upgrade NodePtr to RefPtr

[libs/gl.git] / source / programcompiler.h

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 96fee471cc7e5351a59e7d51f9b3772862bcc195..398bb214d10568800d69e757dec8eadad82efda5 100644 (file)
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -38,6 +38,7 @@ private:
 
                Formatter();
 
+               virtual void apply(ProgramSyntax::Stage &);
                const std::string &get_result() const { return formatted; }
                virtual void visit(ProgramSyntax::Block &);
                virtual void visit(ProgramSyntax::Literal &);
@@ -51,6 +52,7 @@ private:
                virtual void visit(ProgramSyntax::ExpressionStatement &);
                virtual void visit(ProgramSyntax::Import &);
                virtual void visit(ProgramSyntax::Layout &);
+               virtual void visit(ProgramSyntax::InterfaceLayout &);
                virtual void visit(ProgramSyntax::StructDeclaration &);
                virtual void visit(ProgramSyntax::VariableDeclaration &);
                virtual void visit(ProgramSyntax::InterfaceBlock &);
@@ -119,12 +121,12 @@ private:
        struct BlockModifier: Visitor
        {
                bool remove_node;
-               std::list<ProgramSyntax::Node *> insert_nodes;
+               std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
 
                BlockModifier();
 
                void flatten_block(ProgramSyntax::Block &);
-               void apply_and_increment(ProgramSyntax::Block &, std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> >::iterator &);
+               void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
                virtual void visit(ProgramSyntax::Block &);
        };
 
@@ -133,7 +135,7 @@ private:
                std::string in_prefix;
                std::string out_prefix;
                unsigned scope_level;
-               std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
+               std::map<std::string, RefPtr<ProgramSyntax::VariableDeclaration> > iface_declarations;
 
                InterfaceGenerator();
 
@@ -166,6 +168,7 @@ private:
                ExpressionEvaluator(const ValueMap &);
 
                virtual void visit(ProgramSyntax::Literal &);
+               virtual void visit(ProgramSyntax::ParenthesizedExpression &);
                virtual void visit(ProgramSyntax::VariableReference &);
                virtual void visit(ProgramSyntax::UnaryExpression &);
                virtual void visit(ProgramSyntax::BinaryExpression &);
@@ -246,6 +249,22 @@ private:
                virtual void visit(ProgramSyntax::VariableDeclaration &);
        };
 
+       struct LegacyConverter: BlockModifier
+       {
+               Version target_version;
+               std::string type;
+               std::string frag_out_name;
+
+               LegacyConverter();
+               LegacyConverter(const Version &);
+
+               bool check_version(const Version &);
+               virtual void visit(ProgramSyntax::VariableReference &);
+               virtual void visit(ProgramSyntax::FunctionCall &);
+               virtual void visit(ProgramSyntax::VariableDeclaration &);
+               virtual void visit(ProgramSyntax::InterfaceBlock &);
+       };
+
        Resources *resources;
        ProgramParser parser;
        ProgramSyntax::Module *module;