Further refactor the resolving process in SL::Compiler

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 48fc742342bdf042aa32bdbd5686e61e1e43bbe0..a728e99ced3a8bccd24aaa89de94cbbddee09664 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -48,52 +48,133 @@ private:
 /** Forms links between nested blocks in the syntax tree. */
 class BlockHierarchyResolver: private TraversingVisitor
 {
+private:
+       bool r_any_resolved;
+
 public:
-       void apply(Stage &s) { s.content.visit(*this); }
+       BlockHierarchyResolver(): r_any_resolved(false) { }
+
+       bool apply(Stage &s) { r_any_resolved = false; s.content.visit(*this); return r_any_resolved; }
 
 private:
        virtual void enter(Block &);
 };
 
+/** Resolves types of variables and base types of other types. */
+class TypeResolver: private TraversingVisitor
+{
+private:
+       Stage *stage;
+       std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
+       std::map<TypeDeclaration *, TypeDeclaration *> array_types;
+       NodeList<Statement>::iterator type_insert_point;
+       bool r_any_resolved;
+
+public:
+       TypeResolver();
+
+       bool apply(Stage &);
+
+private:
+       TypeDeclaration *get_or_create_array_type(TypeDeclaration &);
+       void resolve_type(TypeDeclaration *&, const std::string &, bool);
+       virtual void visit(Block &);
+       virtual void visit(BasicTypeDeclaration &);
+       virtual void visit(ImageTypeDeclaration &);
+       virtual void visit(StructDeclaration &);
+       virtual void visit(VariableDeclaration &);
+       virtual void visit(FunctionDeclaration &);
+};
+
 /** Resolves variable references.  Variable references which match the name
 of an interface block are turned into interface block references. */
 class VariableResolver: private TraversingVisitor
 {
 private:
        Stage *stage;
-       std::map<std::string, VariableDeclaration *> *members;
-       RefPtr<InterfaceBlockReference> iface_ref;
+       RefPtr<Expression> r_replacement_expr;
        std::string block_interface;
+       bool r_any_resolved;
        bool record_target;
-       VariableDeclaration *assignment_target;
-       bool self_referencing;
+       bool r_self_referencing;
+       VariableDeclaration *r_assignment_target;
 
 public:
        VariableResolver();
 
-       void apply(Stage &);
+       bool apply(Stage &);
 
 private:
        virtual void enter(Block &);
+       void visit_and_replace(RefPtr<Expression> &);
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
+       virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
-       virtual void visit(StructDeclaration &);
+       virtual void visit(FunctionCall &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
 };
 
+/** Resolves types and lvalueness of expressions. */
+class ExpressionResolver: private TraversingVisitor
+{
+private:
+       enum Compatibility
+       {
+               NOT_COMPATIBLE,
+               LEFT_CONVERTIBLE,
+               RIGHT_CONVERTIBLE,
+               SAME_TYPE
+       };
+
+       Stage *stage;
+       std::vector<BasicTypeDeclaration *> basic_types;
+       bool r_any_resolved;
+
+public:
+       ExpressionResolver();
+
+       bool apply(Stage &);
+
+private:
+       static bool is_scalar(BasicTypeDeclaration &);
+       static bool is_vector_or_matrix(BasicTypeDeclaration &);
+       static BasicTypeDeclaration *get_element_type(BasicTypeDeclaration &);
+       static bool can_convert(BasicTypeDeclaration &, BasicTypeDeclaration &);
+       static Compatibility get_compatibility(BasicTypeDeclaration &, BasicTypeDeclaration &);
+       BasicTypeDeclaration *find_type(BasicTypeDeclaration::Kind, unsigned);
+       BasicTypeDeclaration *find_type(BasicTypeDeclaration &, BasicTypeDeclaration::Kind, unsigned);
+       void convert_to(RefPtr<Expression> &, BasicTypeDeclaration &);
+       bool convert_to_element(RefPtr<Expression> &, BasicTypeDeclaration &);
+       void resolve(Expression &, TypeDeclaration *, bool);
+
+       virtual void visit(Literal &);
+       virtual void visit(ParenthesizedExpression &);
+       virtual void visit(VariableReference &);
+       virtual void visit(InterfaceBlockReference &);
+       virtual void visit(MemberAccess &);
+       virtual void visit(UnaryExpression &);
+       void visit(BinaryExpression &, bool);
+       virtual void visit(BinaryExpression &);
+       virtual void visit(Assignment &);
+       virtual void visit(FunctionCall &);
+       virtual void visit(BasicTypeDeclaration &);
+       virtual void visit(VariableDeclaration &);
+};
+
 /** Resolves function declarations and calls. */
 class FunctionResolver: private TraversingVisitor
 {
 private:
        Stage *stage;
        std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
+       bool r_any_resolved;
 
 public:
-       void apply(Stage &);
+       bool apply(Stage &);
 
 private:
        virtual void visit(FunctionCall &);
@@ -131,8 +212,8 @@ private:
        static std::string get_out_prefix(Stage::Type);
        std::string change_prefix(const std::string &, const std::string &) const;
        virtual void visit(Block &);
-       bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
-       bool generate_interface(InterfaceBlock &);
+       VariableDeclaration *generate_interface(VariableDeclaration &, const std::string &, const std::string &);
+       InterfaceBlock *generate_interface(InterfaceBlock &);
        ExpressionStatement &insert_assignment(const std::string &, Expression *);
        virtual void visit(VariableReference &);
        virtual void visit(VariableDeclaration &);