X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=9a0cc6ea3f4bc8c867a2d381494b816b937495eb;hb=a48aaa402e2aacab780805f529cde4ded7ae3f59;hp=99ce8b9c1c47ebd20c202042d35218e67cfe17a8;hpb=73ce62f3b9c2bbfc1e655a9df343389a733dc795;p=libs%2Fgl.git diff --git a/source/programsyntax.h b/source/programsyntax.h index 99ce8b9c..9a0cc6ea 100644 --- a/source/programsyntax.h +++ b/source/programsyntax.h @@ -1,9 +1,12 @@ #ifndef MSP_GL_PROGRAMSYNTAX_H_ #define MSP_GL_PROGRAMSYNTAX_H_ +#include #include #include #include +#include +#include "extension.h" namespace Msp { namespace GL { @@ -22,33 +25,16 @@ public: virtual void visit(NodeVisitor &) = 0; }; -template -class NodePtr -{ -private: - T *node; - -public: - NodePtr(T *n = 0): node(n) { } - NodePtr(const NodePtr &p): node(clone(p.node)) { } - NodePtr &operator=(const NodePtr &p) { delete node; node = clone(p.node); return *this; } - ~NodePtr() { delete node; } - -private: - static T *clone(T *n) { return n ? n->clone() : 0; } - -public: - T *operator->() { return node; } - const T *operator->() const { return node; } - operator void *() const { return node; } -}; - +struct StructDeclaration; struct VariableDeclaration; +struct FunctionDeclaration; struct Block: Node { - std::vector > body; + std::list > body; bool use_braces; + std::map types; + std::map variables; Block(); @@ -71,7 +57,7 @@ struct Literal: Expression struct ParenthesizedExpression: Expression { - NodePtr expression; + RefPtr expression; virtual ParenthesizedExpression *clone() const { return new ParenthesizedExpression(*this); } virtual void visit(NodeVisitor &); @@ -80,6 +66,9 @@ struct ParenthesizedExpression: Expression struct VariableReference: Expression { std::string name; + VariableDeclaration *declaration; + + VariableReference(); virtual VariableReference *clone() const { return new VariableReference(*this); } virtual void visit(NodeVisitor &); @@ -87,8 +76,9 @@ struct VariableReference: Expression struct MemberAccess: Expression { - NodePtr left; + RefPtr left; std::string member; + VariableDeclaration *declaration; virtual MemberAccess *clone() const { return new MemberAccess(*this); } virtual void visit(NodeVisitor &); @@ -97,7 +87,7 @@ struct MemberAccess: Expression struct UnaryExpression: Expression { std::string oper; - NodePtr expression; + RefPtr expression; bool prefix; UnaryExpression(); @@ -108,23 +98,32 @@ struct UnaryExpression: Expression struct BinaryExpression: Expression { - NodePtr left; + RefPtr left; std::string oper; - NodePtr right; + RefPtr right; std::string after; - bool assignment; - - BinaryExpression(); virtual BinaryExpression *clone() const { return new BinaryExpression(*this); } virtual void visit(NodeVisitor &); }; +struct Assignment: BinaryExpression +{ + bool self_referencing; + VariableDeclaration *target_declaration; + + Assignment(); + + virtual Assignment *clone() const { return new Assignment(*this); } + virtual void visit(NodeVisitor &); +}; + struct FunctionCall: Expression { std::string name; + FunctionDeclaration *declaration; bool constructor; - std::vector > arguments; + std::vector > arguments; FunctionCall(); @@ -134,12 +133,20 @@ struct FunctionCall: Expression struct ExpressionStatement: Node { - NodePtr expression; + RefPtr expression; virtual ExpressionStatement *clone() const { return new ExpressionStatement(*this); } virtual void visit(NodeVisitor &); }; +struct Import: Node +{ + std::string module; + + virtual Import *clone() const { return new Import(*this); } + virtual void visit(NodeVisitor &); +}; + struct Layout: Node { struct Qualifier @@ -149,12 +156,20 @@ struct Layout: Node }; std::vector qualifiers; - std::string interface; virtual Layout *clone() const { return new Layout(*this); } virtual void visit(NodeVisitor &); }; +struct InterfaceLayout: Node +{ + std::string interface; + Layout layout; + + virtual InterfaceLayout *clone() const { return new InterfaceLayout(*this); } + virtual void visit(NodeVisitor &); +}; + struct StructDeclaration: Node { std::string name; @@ -172,10 +187,13 @@ struct VariableDeclaration: Node std::string sampling; std::string interface; std::string type; + StructDeclaration *type_declaration; std::string name; bool array; - NodePtr array_size; - NodePtr init_expression; + RefPtr array_size; + RefPtr init_expression; + VariableDeclaration *linked_declaration; + RefPtr layout; VariableDeclaration(); @@ -188,6 +206,8 @@ struct InterfaceBlock: Node std::string interface; std::string name; Block members; + std::string instance_name; + bool array; InterfaceBlock(); @@ -199,11 +219,12 @@ struct FunctionDeclaration: Node { std::string return_type; std::string name; - std::vector > parameters; - bool definition; + std::vector > parameters; + FunctionDeclaration *definition; Block body; FunctionDeclaration(); + FunctionDeclaration(const FunctionDeclaration &); virtual FunctionDeclaration *clone() const { return new FunctionDeclaration(*this); } virtual void visit(NodeVisitor &); @@ -211,7 +232,7 @@ struct FunctionDeclaration: Node struct Conditional: Node { - Expression *condition; + RefPtr condition; Block body; Block else_body; @@ -221,18 +242,26 @@ struct Conditional: Node struct Iteration: Node { - NodePtr init_statement; - NodePtr condition; - NodePtr loop_expression; + RefPtr init_statement; + RefPtr condition; + RefPtr loop_expression; Block body; virtual Iteration *clone() const { return new Iteration(*this); } virtual void visit(NodeVisitor &); }; +struct Passthrough: Node +{ + RefPtr subscript; + + virtual Passthrough *clone() const { return new Passthrough(*this); } + virtual void visit(NodeVisitor &); +}; + struct Return: Node { - NodePtr expression; + RefPtr expression; virtual Return *clone() const { return new Return(*this); } virtual void visit(NodeVisitor &); @@ -249,42 +278,67 @@ struct NodeVisitor virtual void visit(MemberAccess &) { } virtual void visit(UnaryExpression &) { } virtual void visit(BinaryExpression &) { } + virtual void visit(Assignment &); virtual void visit(FunctionCall &) { } virtual void visit(ExpressionStatement &) { } + virtual void visit(Import &) { } virtual void visit(Layout &) { } + virtual void visit(InterfaceLayout &) { } virtual void visit(StructDeclaration &) { } virtual void visit(VariableDeclaration &) { } virtual void visit(InterfaceBlock &) { } virtual void visit(FunctionDeclaration &) { } virtual void visit(Conditional &) { } virtual void visit(Iteration &) { } + virtual void visit(Passthrough &) { } virtual void visit(Return &) { } }; -enum ContextType +struct TraversingVisitor: NodeVisitor +{ + virtual void visit(Block &); + virtual void visit(ParenthesizedExpression &); + virtual void visit(MemberAccess &); + virtual void visit(UnaryExpression &); + virtual void visit(BinaryExpression &); + virtual void visit(FunctionCall &); + virtual void visit(ExpressionStatement &); + virtual void visit(InterfaceLayout &); + virtual void visit(StructDeclaration &); + virtual void visit(VariableDeclaration &); + virtual void visit(InterfaceBlock &); + virtual void visit(FunctionDeclaration &); + virtual void visit(Conditional &); + virtual void visit(Iteration &); + virtual void visit(Passthrough &); + virtual void visit(Return &); +}; + +enum StageType { - GLOBAL, + SHARED, VERTEX, GEOMETRY, FRAGMENT }; -struct Context +struct Stage { - ContextType type; - bool present; + StageType type; + Stage *previous; ProgramSyntax::Block content; + std::map in_variables; + std::map out_variables; + std::map locations; + Version required_version; - Context(ContextType); + Stage(StageType); }; struct Module { - Context global_context; - Context vertex_context; - Context geometry_context; - Context fragment_context; - std::map structs; + Stage shared; + std::list stages; Module(); };