Store the index of the member in MemberAccess

[libs/gl.git] / source / glsl / syntax.h

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 81fd6b4f6390050e0312aee3b2d04983e55217e4..66fed6e83f058d83b476d777a45cb43947703c72 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -39,7 +39,8 @@ struct Operator
        };
 
        char token[4];
-       unsigned precedence;
+       char token2[2];
+       UInt8 precedence;
        Type type;
        Associativity assoc;
 
@@ -95,6 +96,9 @@ class NodeContainer: public C
 public:
        NodeContainer() { }
        NodeContainer(const NodeContainer &);
+
+       void push_back_nocopy(const typename C::value_type &v)
+       { C::push_back(0); C::back() = v; }
 };
 
 template<typename T>
@@ -151,14 +155,6 @@ struct Literal: Expression
        virtual void visit(NodeVisitor &);
 };
 
-struct ParenthesizedExpression: Expression
-{
-       NodePtr<Expression> expression;
-
-       virtual ParenthesizedExpression *clone() const { return new ParenthesizedExpression(*this); }
-       virtual void visit(NodeVisitor &);
-};
-
 struct VariableReference: Expression
 {
        std::string name;
@@ -191,6 +187,7 @@ struct MemberAccess: Expression
        std::string member;
 
        VariableDeclaration *declaration;
+       int index;
 
        MemberAccess();
        MemberAccess(const MemberAccess &);
@@ -317,6 +314,8 @@ struct Layout: Node
                std::string name;
                bool has_value;
                int value;
+
+               Qualifier(): has_value(false), value(0) { }
        };
 
        std::vector<Qualifier> qualifiers;
@@ -433,8 +432,9 @@ struct VariableDeclaration: Statement
 
 struct InterfaceBlock: Statement
 {
+       NodePtr<Layout> layout;
        std::string interface;
-       std::string name;
+       std::string block_name;
        NodePtr<Block> members;
        std::string instance_name;
        bool array;
@@ -535,6 +535,8 @@ struct Stage
        std::map<std::string, InterfaceBlock *> interface_blocks;
        std::map<std::string, FunctionDeclaration *> functions;
        std::map<std::string, unsigned> locations;
+       std::map<std::string, unsigned> texture_bindings;
+       std::map<std::string, unsigned> uniform_block_bindings;
        Features required_features;
        std::vector<Diagnostic> diagnostics;
 
@@ -552,6 +554,11 @@ struct Module
        Module();
 };
 
+std::string get_unused_variable_name(const Block &, const std::string &);
+
+bool is_same_type(const TypeDeclaration &, const TypeDeclaration &);
+int get_layout_value(const Layout &, const std::string &, int = -1);
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp