virtual void visit(ProgramSyntax::ExpressionStatement &);
virtual void visit(ProgramSyntax::Import &);
virtual void visit(ProgramSyntax::Layout &);
+ virtual void visit(ProgramSyntax::InterfaceLayout &);
virtual void visit(ProgramSyntax::StructDeclaration &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
virtual void visit(ProgramSyntax::InterfaceBlock &);
virtual void visit(ProgramSyntax::Conditional &);
virtual void visit(ProgramSyntax::Iteration &);
virtual void visit(ProgramSyntax::Return &);
+ virtual void visit(ProgramSyntax::Jump &);
};
template<typename T>
struct BlockModifier: Visitor
{
bool remove_node;
- std::list<ProgramSyntax::Node *> insert_nodes;
+ std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
BlockModifier();
void flatten_block(ProgramSyntax::Block &);
- void apply_and_increment(ProgramSyntax::Block &, std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> >::iterator &);
+ void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
virtual void visit(ProgramSyntax::Block &);
};
std::string in_prefix;
std::string out_prefix;
unsigned scope_level;
- std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
+ std::map<std::string, RefPtr<ProgramSyntax::VariableDeclaration> > iface_declarations;
InterfaceGenerator();
virtual void visit(ProgramSyntax::VariableDeclaration &);
};
+ struct DeclarationReorderer: Visitor
+ {
+ enum DeclarationKind
+ {
+ NO_DECLARATION,
+ LAYOUT,
+ STRUCT,
+ VARIABLE,
+ FUNCTION
+ };
+
+ DeclarationKind kind;
+
+ DeclarationReorderer();
+
+ virtual void visit(ProgramSyntax::Block &);
+ virtual void visit(ProgramSyntax::InterfaceLayout &) { kind = LAYOUT; }
+ virtual void visit(ProgramSyntax::StructDeclaration &) { kind = STRUCT; }
+ virtual void visit(ProgramSyntax::VariableDeclaration &) { kind = VARIABLE; }
+ virtual void visit(ProgramSyntax::InterfaceBlock &) { kind = VARIABLE; }
+ virtual void visit(ProgramSyntax::FunctionDeclaration &) { kind = FUNCTION; }
+ };
+
+ struct InlineableFunctionLocator: Visitor
+ {
+ typedef std::set<ProgramSyntax::FunctionDeclaration *> ResultType;
+
+ std::map<ProgramSyntax::FunctionDeclaration *, unsigned> refcounts;
+ std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+ ProgramSyntax::FunctionDeclaration *in_function;
+
+ InlineableFunctionLocator();
+
+ const ResultType &get_result() const { return inlineable; }
+ virtual void visit(ProgramSyntax::FunctionCall &);
+ virtual void visit(ProgramSyntax::FunctionDeclaration &);
+ };
+
+ struct FunctionInliner: Visitor
+ {
+ std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+ unsigned extract_result;
+ RefPtr<ProgramSyntax::Expression> inline_result;
+
+ FunctionInliner();
+ FunctionInliner(const std::set<ProgramSyntax::FunctionDeclaration *> &);
+
+ void visit_and_inline(RefPtr<ProgramSyntax::Expression> &);
+ virtual void visit(ProgramSyntax::Block &);
+ virtual void visit(ProgramSyntax::UnaryExpression &);
+ virtual void visit(ProgramSyntax::BinaryExpression &);
+ virtual void visit(ProgramSyntax::FunctionCall &);
+ virtual void visit(ProgramSyntax::Return &);
+ };
+
struct ExpressionEvaluator: ProgramSyntax::NodeVisitor
{
typedef std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Expression *> ValueMap;
ExpressionEvaluator(const ValueMap &);
virtual void visit(ProgramSyntax::Literal &);
+ virtual void visit(ProgramSyntax::ParenthesizedExpression &);
virtual void visit(ProgramSyntax::VariableReference &);
virtual void visit(ProgramSyntax::UnaryExpression &);
virtual void visit(ProgramSyntax::BinaryExpression &);