Rename InterfaceBlock::name to block_name for clarity

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 86972869f2fe03ed2ebdce4bf47efe4e98d1aa5b..f7c8ed29cedc09229be11f5ce774d78f67107ee3 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;
@@ -434,7 +430,7 @@ struct VariableDeclaration: Statement
 struct InterfaceBlock: Statement
 {
        std::string interface;
-       std::string name;
+       std::string block_name;
        NodePtr<Block> members;
        std::string instance_name;
        bool array;
@@ -458,6 +454,8 @@ struct FunctionDeclaration: Statement
        std::string return_type;
        std::string name;
        NodeArray<VariableDeclaration> parameters;
+       bool virtua;
+       bool overrd;
        Block body;
 
        std::string signature;
@@ -550,6 +548,8 @@ struct Module
        Module();
 };
 
+std::string get_unused_variable_name(const Block &, const std::string &);
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp