import desugaring
import util
+NormalBuiltinExpression = collections.namedtuple(
+ 'NormalBuiltinExpression',
+ (
+ 'symbol',
+ ),
+)
+
NormalVariableExpression = collections.namedtuple(
'NormalVariableExpression',
[
NormalSymbolExpression = collections.namedtuple(
'NormalSymbolExpression',
- [
+ (
'symbol',
- ],
+ ),
+)
+
+NormalSymbolLiteralExpression = collections.namedtuple(
+ 'NormalSymbolLiteralExpression',
+ (
+ 'symbol',
+ ),
)
NormalPushStatement = collections.namedtuple(
],
)
-NormalArrayVariableInitializationStatement = collections.namedtuple(
- 'NormalArrayVariableInitializationStatement',
- [
- 'variable',
- 'items',
- ],
-)
-
-NormalSymbolArrayVariableInitializationStatement = collections.namedtuple(
- 'NormalSymbolArrayVariableInitializationStatement',
- [
- 'variable',
- 'symbol_list',
- ],
-)
-
NormalVariableInitializationStatement = collections.namedtuple(
'NormalVariableInitializationStatement',
[
],
)
-NormalVariableReassignmentStatement = collections.namedtuple(
- 'NormalVariableReassignmentStatement',
- [
- 'variable',
- 'expression',
- ],
-)
-
NormalExpressionStatement = collections.namedtuple(
'NormalExpressionStatement',
[
],
)
-NormalIfElseStatement = collections.namedtuple(
- 'NormalIfElseStatement',
+NormalIfElseExpression = collections.namedtuple(
+ 'NormalIfElseExpression',
[
'condition_expression',
'if_statement_list',
],
)
+def normalize_builtin_expression(counter, expression):
+ return (
+ counter,
+ (),
+ NormalBuiltinExpression(symbol=expression.symbol),
+ )
+
def normalize_integer_literal_expression(counter, expression):
- variable = '${}'.format(counter)
return (
- counter + 1,
- (
- NormalVariableInitializationStatement(
- variable=variable,
- expression=NormalIntegerLiteralExpression(integer=expression.integer),
- ),
- ),
- NormalVariableExpression(variable=variable),
+ counter,
+ (),
+ NormalIntegerLiteralExpression(integer=expression.integer),
)
def normalize_lambda_expression(counter, expression):
_, statement_list = normalize_statement_list(
0,
expression.statement_list,
- assign_result_to='result',
)
return (
],
)
-NormalListAppendStatement = collections.namedtuple(
- 'NormalListAppendStatement',
- [
- 'list_expression',
- 'item_expression',
- ],
-)
-
def normalize_list_literal_expression(counter, expression):
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):
NormalStructureLiteralExpression = collections.namedtuple(
'NormalStructureLiteralExpression',
- [
+ (
'field_count',
- 'symbol_list_variable',
- 'value_list_variable',
- ],
+ ),
)
def normalize_structure_literal_expression(counter, expression):
prestatements = []
- field_symbol_array = []
- field_value_array = []
- for symbol_expression_pair in expression.fields:
- counter, field_prestatements, field_expression = normalize_expression(
+ for field in expression.fields:
+ counter, field_expression_prestatements, field_expression = normalize_expression(
counter,
- symbol_expression_pair.expression,
+ field.expression,
)
- for p in field_prestatements:
+ for p in field_expression_prestatements:
prestatements.append(p)
- field_symbol_array.append(symbol_expression_pair.symbol)
- field_value_array.append(field_expression)
-
- symbol_array_variable = '${}'.format(counter)
- counter += 1
-
- prestatements.append(
- NormalSymbolArrayVariableInitializationStatement(
- variable=symbol_array_variable,
- symbol_list=tuple(field_symbol_array),
- )
- )
+ prestatements.append(NormalPushStatement(
+ expression=field_expression,
+ ))
- value_array_variable = '${}'.format(counter)
- counter += 1
-
- prestatements.append(
- NormalArrayVariableInitializationStatement(
- variable=value_array_variable,
- items=tuple(field_value_array),
- )
- )
-
- variable = '${}'.format(counter)
-
- prestatements.append(
- NormalVariableInitializationStatement(
- variable=variable,
- expression=NormalStructureLiteralExpression(
- field_count=len(expression.fields),
- symbol_list_variable=symbol_array_variable,
- value_list_variable=value_array_variable,
+ prestatements.append(NormalPushStatement(
+ expression=NormalSymbolLiteralExpression(
+ symbol=field.symbol,
),
- )
- )
+ ))
return (
- counter + 1,
+ counter,
tuple(prestatements),
- NormalVariableExpression(variable=variable),
+ NormalStructureLiteralExpression(
+ field_count=len(expression.fields),
+ ),
)
-
def normalize_symbol_expression(counter, expression):
- variable = '${}'.format(counter)
return (
- counter + 1,
- (
- NormalVariableInitializationStatement(
- variable=variable,
- expression=NormalSymbolExpression(symbol=expression.symbol),
- ),
- ),
- NormalVariableExpression(variable=variable),
+ counter,
+ (),
+ NormalSymbolExpression(symbol=expression.symbol),
+ )
+
+def normalize_symbol_literal_expression(counter, expression):
+ return (
+ counter,
+ (),
+ NormalSymbolLiteralExpression(symbol=expression.symbol),
)
def normalize_function_call_expression(counter, expression):
for s in argument_prestatements:
prestatements.append(s)
- variable = '${}'.format(counter)
- prestatements.append(
- NormalVariableInitializationStatement(
- variable=variable,
- expression=normalized_argument,
- )
- )
prestatements.append(
NormalPushStatement(
- expression=NormalVariableExpression(
- variable=variable,
- ),
+ expression=normalized_argument,
),
)
- counter += 1
counter, function_prestatements, function_expression = normalize_expression(
counter,
for ps in function_prestatements:
prestatements.append(ps)
- if not isinstance(function_expression, NormalVariableExpression):
- function_variable = '${}'.format(counter)
-
- prestatements.append(
- NormalVariableInitializationStatement(
- variable=function_variable,
- expression=function_expression,
- )
- )
-
- function_expression = NormalVariableExpression(variable=function_variable)
- counter += 1
-
- result_variable = '${}'.format(counter)
-
- prestatements.append(
- NormalVariableInitializationStatement(
- variable=result_variable,
- expression=NormalFunctionCallExpression(
- metadata=expression.metadata,
- function_expression=function_expression,
- argument_count=len(expression.argument_list),
- ),
- )
- )
-
return (
- counter + 1,
+ counter,
tuple(prestatements),
- NormalVariableExpression(variable=result_variable),
+ NormalFunctionCallExpression(
+ metadata=expression.metadata,
+ function_expression=function_expression,
+ argument_count=len(expression.argument_list),
+ ),
)
def normalize_if_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):
return {
+ desugaring.DesugaredBuiltinExpression: normalize_builtin_expression,
desugaring.DesugaredFunctionCallExpression: normalize_function_call_expression,
desugaring.DesugaredIfExpression: normalize_if_expression,
desugaring.DesugaredIntegerLiteralExpression: normalize_integer_literal_expression,
desugaring.DesugaredStringLiteralExpression: normalize_string_literal_expression,
desugaring.DesugaredStructureLiteralExpression: normalize_structure_literal_expression,
desugaring.DesugaredSymbolExpression: normalize_symbol_expression,
+ desugaring.DesugaredSymbolLiteralExpression: normalize_symbol_literal_expression,
}[type(expression)](counter, expression)
def normalize_expression_statement(counter, statement):
}[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,
projects / fur / blobdiff