X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=2f9f1fc08a50f47eb3a8fc6f4757217cb39f0b09;hb=74bd3813b9744550c9ac5980588e561835b616d9;hp=03b5aa8863d1e70af4e9be52383431ed9b331a96;hpb=2b073e0a3808f8ece4b93669395e4b812214cf5d;p=libs%2Fgl.git

diff --git a/source/programsyntax.h b/source/programsyntax.h
index 03b5aa88..2f9f1fc0 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -5,6 +5,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include "extension.h"
 
 namespace Msp {
 namespace GL {
@@ -52,6 +53,7 @@ public:
 
 struct StructDeclaration;
 struct VariableDeclaration;
+struct FunctionDeclaration;
 
 struct Block: Node
 {
@@ -145,6 +147,7 @@ struct Assignment: BinaryExpression
 struct FunctionCall: Expression
 {
 	std::string name;
+	FunctionDeclaration *declaration;
 	bool constructor;
 	std::vector<NodePtr<Expression> > arguments;
 
@@ -162,6 +165,14 @@ struct ExpressionStatement: Node
 	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
@@ -226,10 +237,11 @@ struct FunctionDeclaration: Node
 	std::string return_type;
 	std::string name;
 	std::vector<NodePtr<VariableDeclaration> > parameters;
-	bool definition;
+	FunctionDeclaration *definition;
 	Block body;
 
 	FunctionDeclaration();
+	FunctionDeclaration(const FunctionDeclaration &);
 
 	virtual FunctionDeclaration *clone() const { return new FunctionDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -286,6 +298,7 @@ struct NodeVisitor
 	virtual void visit(Assignment &);
 	virtual void visit(FunctionCall &) { }
 	virtual void visit(ExpressionStatement &) { }
+	virtual void visit(Import &) { }
 	virtual void visit(Layout &) { }
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &) { }
@@ -331,6 +344,7 @@ struct Stage
 	ProgramSyntax::Block content;
 	std::map<std::string, VariableDeclaration *> in_variables;
 	std::map<std::string, VariableDeclaration *> out_variables;
+	Version required_version;
 
 	Stage(StageType);
 };