struct BlockModifier: Visitor
{
bool remove_node;
- std::vector<RefPtr<ProgramSyntax::Node> > insert_nodes;
+ std::vector<RefPtr<ProgramSyntax::Statement> > insert_nodes;
BlockModifier();
void flatten_block(ProgramSyntax::Block &);
- void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
+ void apply_and_increment(ProgramSyntax::Block &, ProgramSyntax::NodeList<ProgramSyntax::Statement>::iterator &);
using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
};
typedef std::string ResultType;
std::string formatted;
+ unsigned source_index;
+ unsigned source_line;
unsigned indent;
bool parameter_list;
- unsigned else_if;
std::string block_interface;
Formatter();
virtual void apply(ProgramSyntax::Stage &);
const std::string &get_result() const { return formatted; }
using Visitor::visit;
+ void append(const std::string &);
+ void append(char);
+ void set_source(unsigned, unsigned);
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::Literal &);
virtual void visit(ProgramSyntax::ParenthesizedExpression &);
virtual void visit(ProgramSyntax::Block &);
std::string change_prefix(const std::string &, const std::string &) const;
bool generate_interface(ProgramSyntax::VariableDeclaration &, const std::string &, const std::string &);
- void insert_assignment(const std::string &, ProgramSyntax::Expression *);
+ ProgramSyntax::ExpressionStatement &insert_assignment(const std::string &, ProgramSyntax::Expression *);
virtual void visit(ProgramSyntax::VariableReference &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
virtual void visit(ProgramSyntax::Passthrough &);
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::UnaryExpression &);
virtual void visit(ProgramSyntax::BinaryExpression &);
+ virtual void visit(ProgramSyntax::MemberAccess &);
virtual void visit(ProgramSyntax::FunctionCall &);
+ virtual void visit(ProgramSyntax::VariableDeclaration &);
virtual void visit(ProgramSyntax::Return &);
};
struct ConstantConditionEliminator: BlockModifier
{
unsigned scope_level;
+ bool record_only;
ExpressionEvaluator::ValueMap variable_values;
ConstantConditionEliminator();
using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
+ virtual void visit(ProgramSyntax::UnaryExpression &);
virtual void visit(ProgramSyntax::Assignment &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
virtual void visit(ProgramSyntax::Conditional &);
std::vector<BlockVariableMap> variables;
ProgramSyntax::Assignment *assignment;
bool assignment_target;
+ bool assign_to_subscript;
bool global_scope;
UnusedVariableLocator();
using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
+ virtual void visit(ProgramSyntax::Iteration &);
};
struct PrecisionRemover: BlockModifier
LegacyConverter(const Version &);
bool check_version(const Version &) const;
+ bool check_extension(const Extension &) const;
using Visitor::visit;
bool supports_unified_interface_syntax() const;
virtual void visit(ProgramSyntax::VariableReference &);
Resources *resources;
ProgramSyntax::Module *module;
- std::set<std::string> imported_names;
+ std::vector<std::string> imported_names;
public:
ProgramCompiler();