+ TraversingVisitor::visit(block);
+
+ for(map<VariableDeclaration *, ExpressionInfo>::iterator i=expressions.begin(); i!=expressions.end(); )
+ {
+ map<string, VariableDeclaration *>::iterator j = block.variables.find(i->first->name);
+ if(j!=block.variables.end() && j->second==i->first)
+ {
+ if(i->second.expression && i->second.inline_point)
+ inline_expression(*i->second.expression, *i->second.inline_point, i->second.outer_oper, i->second.inner_oper, i->second.inline_on_rhs);
+
+ expressions.erase(i++);
+ }
+ else
+ {
+ /* The expression was assigned in this block and may depend on local
+ variables of the block. If this is a conditionally executed block,
+ the assignment might not always happen. Mark the expression as not
+ available to any outer blocks. */
+ if(i->second.assign_scope==&block)
+ i->second.available = false;
+
+ ++i;
+ }
+ }
+}
+
+void ExpressionInliner::visit(VariableReference &var)
+{
+ if(var.declaration)
+ {
+ map<VariableDeclaration *, ExpressionInfo>::iterator i = expressions.find(var.declaration);
+ if(i!=expressions.end())
+ {
+ /* If a non-trivial expression is referenced multiple times, don't
+ inline it. */
+ if(i->second.inline_point && !i->second.trivial)
+ i->second.expression = 0;
+ /* Mutating expressions are analogous to self-referencing assignments
+ and prevent inlining. */
+ if(mutating)
+ i->second.expression = 0;
+ r_ref_info = &i->second;
+ }
+ }
+}
+
+void ExpressionInliner::visit(MemberAccess &memacc)
+{
+ visit_and_record(memacc.left, memacc.oper, false);
+ r_oper = memacc.oper;
+ r_trivial = false;
+}
+
+void ExpressionInliner::visit(UnaryExpression &unary)
+{
+ SetFlag set_target(mutating, mutating || unary.oper->token[1]=='+' || unary.oper->token[1]=='-');
+ visit_and_record(unary.expression, unary.oper, false);
+ r_oper = unary.oper;
+ r_trivial = false;
+}
+
+void ExpressionInliner::visit(BinaryExpression &binary)
+{
+ visit_and_record(binary.left, binary.oper, false);
+ {
+ SetFlag clear_target(mutating, false);
+ visit_and_record(binary.right, binary.oper, true);
+ }
+ r_oper = binary.oper;
+ r_trivial = false;