X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=normalization.py;h=8248169c9210e0a2d005bfafe5a6e6455c434877;hp=40e3afdaa1afc275afe26a6aa3f19d4cedf38690;hb=c24be69b26aedc427c7831f150e86ca00182d8e0;hpb=3a076cfd2c46c9f3b51815facd613445722a340b diff --git a/normalization.py b/normalization.py index 40e3afd..8248169 100644 --- a/normalization.py +++ b/normalization.py @@ -3,6 +3,13 @@ import collections import desugaring import util +NormalBuiltinExpression = collections.namedtuple( + 'NormalBuiltinExpression', + ( + 'symbol', + ), +) + NormalVariableExpression = collections.namedtuple( 'NormalVariableExpression', [ @@ -17,6 +24,15 @@ NormalIntegerLiteralExpression = collections.namedtuple( ], ) +NormalLambdaExpression = collections.namedtuple( + 'NormalLambdaExpression', + ( + 'name', + 'argument_name_list', + 'statement_list', + ), +) + NormalStringLiteralExpression = collections.namedtuple( 'NormalStringLiteralExpression', [ @@ -26,9 +42,16 @@ NormalStringLiteralExpression = collections.namedtuple( NormalSymbolExpression = collections.namedtuple( 'NormalSymbolExpression', - [ + ( 'symbol', - ], + ), +) + +NormalSymbolLiteralExpression = collections.namedtuple( + 'NormalSymbolLiteralExpression', + ( + 'symbol', + ), ) NormalPushStatement = collections.namedtuple( @@ -47,22 +70,6 @@ NormalFunctionCallExpression = collections.namedtuple( ], ) -NormalArrayVariableInitializationStatement = collections.namedtuple( - 'NormalArrayVariableInitializationStatement', - [ - 'variable', - 'items', - ], -) - -NormalSymbolArrayVariableInitializationStatement = collections.namedtuple( - 'NormalSymbolArrayVariableInitializationStatement', - [ - 'variable', - 'symbol_list', - ], -) - NormalVariableInitializationStatement = collections.namedtuple( 'NormalVariableInitializationStatement', [ @@ -71,14 +78,6 @@ NormalVariableInitializationStatement = collections.namedtuple( ], ) -NormalVariableReassignmentStatement = collections.namedtuple( - 'NormalVariableReassignmentStatement', - [ - 'variable', - 'expression', - ], -) - NormalExpressionStatement = collections.namedtuple( 'NormalExpressionStatement', [ @@ -94,8 +93,8 @@ NormalAssignmentStatement = collections.namedtuple( ], ) -NormalIfElseStatement = collections.namedtuple( - 'NormalIfElseStatement', +NormalIfElseExpression = collections.namedtuple( + 'NormalIfElseExpression', [ 'condition_expression', 'if_statement_list', @@ -103,15 +102,6 @@ NormalIfElseStatement = collections.namedtuple( ], ) -NormalFunctionDefinitionStatement = collections.namedtuple( - 'NormalFunctionDefinitionStatement', - [ - 'name', - 'argument_name_list', - 'statement_list', - ], -) - NormalProgram = collections.namedtuple( 'NormalProgram', [ @@ -119,14 +109,38 @@ NormalProgram = collections.namedtuple( ], ) +def normalize_builtin_expression(counter, expression): + return ( + counter, + (), + NormalBuiltinExpression(symbol=expression.symbol), + ) + def normalize_integer_literal_expression(counter, expression): + return ( + counter, + (), + NormalIntegerLiteralExpression(integer=expression.integer), + ) + +def normalize_lambda_expression(counter, expression): variable = '${}'.format(counter) + + _, statement_list = normalize_statement_list( + 0, + expression.statement_list, + ) + return ( counter + 1, ( NormalVariableInitializationStatement( variable=variable, - expression=NormalIntegerLiteralExpression(integer=expression.integer), + expression=NormalLambdaExpression( + name=expression.name, + argument_name_list=expression.argument_name_list, + statement_list=statement_list, + ), ), ), NormalVariableExpression(variable=variable), @@ -139,34 +153,11 @@ NormalListConstructExpression = collections.namedtuple( ], ) -NormalListAppendStatement = collections.namedtuple( - 'NormalListAppendStatement', - [ - 'list_expression', - 'item_expression', - ], -) - -NormalListGetExpression = collections.namedtuple( - 'NormalListGetExpression', - [ - 'list_expression', - 'index_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( @@ -178,127 +169,73 @@ def normalize_list_literal_expression(counter, expression): prestatements.append(p) prestatements.append( - NormalListAppendStatement( - list_expression=list_expression, - item_expression=normalized, + NormalPushStatement( + expression=normalized, ) ) return ( counter, tuple(prestatements), - list_expression, - ) - -def normalize_list_item_expression(counter, expression): - counter, list_prestatements, list_expression = normalize_expression(counter, expression.list_expression) - counter, index_prestatements, index_expression = normalize_expression(counter, expression.index_expression) - - result_variable = '${}'.format(counter) - result_prestatement = NormalVariableInitializationStatement( - variable=result_variable, - expression=NormalListGetExpression( - list_expression=list_expression, - index_expression=index_expression, - ), - ) - - return ( - counter + 1, - list_prestatements + index_prestatements + (result_prestatement,), - NormalVariableExpression(variable=result_variable), + NormalListConstructExpression(allocate=len(expression.item_expression_list)), ) def normalize_string_literal_expression(counter, expression): - variable = '${}'.format(counter) return ( - counter + 1, - ( - NormalVariableInitializationStatement( - variable=variable, - expression=NormalStringLiteralExpression(string=expression.string), - ), - ), - NormalVariableExpression(variable=variable), + counter, + (), + NormalStringLiteralExpression(string=expression.string), ) 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), - ) - ) - - value_array_variable = '${}'.format(counter) - counter += 1 - - prestatements.append( - NormalArrayVariableInitializationStatement( - variable=value_array_variable, - items=tuple(field_value_array), - ) - ) - - variable = '${}'.format(counter) + prestatements.append(NormalPushStatement( + expression=field_expression, + )) - 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): @@ -310,21 +247,11 @@ 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, @@ -334,36 +261,14 @@ def normalize_function_call_expression(counter, expression): 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): @@ -372,45 +277,37 @@ 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.DesugaredLambdaExpression: normalize_lambda_expression, desugaring.DesugaredListLiteralExpression: normalize_list_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): @@ -426,22 +323,6 @@ def normalize_expression_statement(counter, statement): NormalExpressionStatement(expression=normalized), ) -def normalize_function_definition_statement(counter, statement): - _, statement_list = normalize_statement_list( - 0, - statement.statement_list, - assign_result_to='result', - ) - return ( - counter, - (), - NormalFunctionDefinitionStatement( - name=statement.name, - argument_name_list=statement.argument_name_list, - statement_list=statement_list, - ), - ) - def normalize_assignment_statement(counter, statement): counter, prestatements, normalized_expression = normalize_expression(counter, statement.expression) return ( @@ -457,15 +338,10 @@ def normalize_statement(counter, statement): return { desugaring.DesugaredAssignmentStatement: normalize_assignment_statement, desugaring.DesugaredExpressionStatement: normalize_expression_statement, - desugaring.DesugaredFunctionDefinitionStatement: normalize_function_definition_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: @@ -474,19 +350,6 @@ def normalize_statement_list(counter, statement_list, **kwargs): 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,