],
)
-NormalVariableReassignmentStatement = collections.namedtuple(
- 'NormalVariableReassignmentStatement',
- [
- 'variable',
- 'expression',
- ],
-)
-
NormalExpressionStatement = collections.namedtuple(
'NormalExpressionStatement',
[
],
)
-NormalIfElseStatement = collections.namedtuple(
- 'NormalIfElseStatement',
+NormalIfElseExpression = collections.namedtuple(
+ 'NormalIfElseExpression',
[
'condition_expression',
'if_statement_list',
_, statement_list = normalize_statement_list(
0,
expression.statement_list,
- assign_result_to='result',
)
return (
list_variable = '${}'.format(counter)
counter += 1
- prestatements = [
- NormalVariableInitializationStatement(
- variable=list_variable,
- expression=NormalListConstructExpression(allocate=len(expression.item_expression_list)),
- ),
- ]
-
- list_expression = NormalVariableExpression(variable=list_variable)
+ prestatements = []
for item_expression in expression.item_expression_list:
counter, item_expression_prestatements, normalized = normalize_expression(
prestatements.append(p)
prestatements.append(
- NormalListAppendStatement(
- list_expression=list_expression,
- item_expression=normalized,
+ NormalPushStatement(
+ expression=normalized,
)
)
return (
counter,
tuple(prestatements),
- list_expression,
+ NormalListConstructExpression(allocate=len(expression.item_expression_list)),
)
def normalize_string_literal_expression(counter, expression):
expression.condition_expression,
)
- result_variable = '${}'.format(counter)
- counter += 1
-
counter, if_statement_list = normalize_statement_list(
counter,
expression.if_statement_list,
- assign_result_to=result_variable,
)
counter, else_statement_list = normalize_statement_list(
counter,
expression.else_statement_list,
- assign_result_to=result_variable,
)
return (
counter,
- condition_prestatements + (
- NormalVariableInitializationStatement(
- variable=result_variable,
- expression=NormalVariableExpression(variable='builtin$nil'),
- ),
- NormalIfElseStatement(
- condition_expression=condition_expression,
- if_statement_list=if_statement_list,
- else_statement_list=else_statement_list,
- ),
+ condition_prestatements,
+ NormalIfElseExpression(
+ condition_expression=condition_expression,
+ if_statement_list=if_statement_list,
+ else_statement_list=else_statement_list,
),
- NormalVariableExpression(variable=result_variable),
)
def normalize_expression(counter, expression):
}[type(statement)](counter, statement)
@util.force_generator(tuple)
-def normalize_statement_list(counter, statement_list, **kwargs):
- assign_result_to = kwargs.pop('assign_result_to', None)
-
- assert len(kwargs) == 0
-
+def normalize_statement_list(counter, statement_list):
result_statement_list = []
for statement in statement_list:
result_statement_list.append(s)
result_statement_list.append(normalized)
- # TODO The way we fix the last statement is really confusing
- last_statement = result_statement_list[-1]
-
- if isinstance(last_statement, NormalExpressionStatement) and isinstance(last_statement.expression, NormalVariableExpression):
- if assign_result_to is not None:
- result_expression = result_statement_list.pop().expression
- result_statement_list.append(
- NormalVariableReassignmentStatement(
- variable=assign_result_to,
- expression=result_expression,
- )
- )
-
return (
counter,
result_statement_list,