X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=normalization.py;h=9725b5b54e70fa84b5ff6fb290c748a26788dc3e;hp=0d967d7af107c41024223264d5ec3233bac1fc08;hb=aa339c441f43849a8cae256aa130278ca7618b7e;hpb=8be4bc7974ca10fb7fe247748c95c5c240bf11f4 diff --git a/normalization.py b/normalization.py index 0d967d7..9725b5b 100644 --- a/normalization.py +++ b/normalization.py @@ -1,6 +1,7 @@ import collections -import parsing +import desugaring +import util NormalVariableExpression = collections.namedtuple( 'NormalVariableExpression', @@ -9,26 +10,77 @@ NormalVariableExpression = collections.namedtuple( ], ) -NormalInfixExpression = collections.namedtuple( - 'NormalInfixExpression', +NormalIntegerLiteralExpression = collections.namedtuple( + 'NormalIntegerLiteralExpression', [ - 'order', - 'operator', - 'left', - 'right', + 'integer', ], ) +NormalLambdaExpression = collections.namedtuple( + 'NormalLambdaExpression', + ( + 'argument_name_list', + 'statement_list', + ), +) + +NormalStringLiteralExpression = collections.namedtuple( + 'NormalStringLiteralExpression', + [ + 'string', + ], +) + +NormalSymbolExpression = collections.namedtuple( + 'NormalSymbolExpression', + [ + 'symbol', + ], +) + +NormalPushStatement = collections.namedtuple( + 'NormalPushStatement', + ( + 'expression', + ), +) + NormalFunctionCallExpression = collections.namedtuple( 'NormalFunctionCallExpression', [ - 'function', - 'arguments', + 'metadata', + 'function_expression', + 'argument_count', + ], +) + +NormalArrayVariableInitializationStatement = collections.namedtuple( + 'NormalArrayVariableInitializationStatement', + [ + 'variable', + 'items', + ], +) + +NormalSymbolArrayVariableInitializationStatement = collections.namedtuple( + 'NormalSymbolArrayVariableInitializationStatement', + [ + 'variable', + 'symbol_list', ], ) -NormalVariableAssignmentStatement = collections.namedtuple( - 'NormalVariableAssignmentStatement', +NormalVariableInitializationStatement = collections.namedtuple( + 'NormalVariableInitializationStatement', + [ + 'variable', + 'expression', + ], +) + +NormalVariableReassignmentStatement = collections.namedtuple( + 'NormalVariableReassignmentStatement', [ 'variable', 'expression', @@ -42,169 +94,336 @@ NormalExpressionStatement = collections.namedtuple( ], ) -NormalProgram = collections.namedtuple( - 'NormalProgram', +NormalAssignmentStatement = collections.namedtuple( + 'NormalAssignmentStatement', [ - 'statement_list', + 'target', + 'expression', ], ) -def fake_normalization(counter, thing): - return (counter, (), thing) +NormalIfElseStatement = collections.namedtuple( + 'NormalIfElseStatement', + [ + 'condition_expression', + 'if_statement_list', + 'else_statement_list', + ], +) -def normalize_function_call_expression(counter, expression): - assert isinstance(expression, parsing.FurFunctionCallExpression) +NormalFunctionDefinitionStatement = collections.namedtuple( + 'NormalFunctionDefinitionStatement', + [ + 'name', + 'argument_name_list', + 'statement_list', + ], +) - prestatements = [] - arguments = [] +NormalProgram = collections.namedtuple( + 'NormalProgram', + [ + 'statement_list', + ], +) - for argument in expression.arguments: - counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument) +def normalize_integer_literal_expression(counter, expression): + variable = '${}'.format(counter) + return ( + counter + 1, + ( + NormalVariableInitializationStatement( + variable=variable, + expression=NormalIntegerLiteralExpression(integer=expression.integer), + ), + ), + NormalVariableExpression(variable=variable), + ) - for s in argument_prestatements: - prestatements.append(s) +def normalize_lambda_expression(counter, expression): + variable = '${}'.format(counter) - variable = '${}'.format(counter) - prestatements.append(NormalVariableAssignmentStatement( - variable=variable, - expression=normalized_argument, - )) - arguments.append(NormalVariableExpression( - variable=variable, - )) - counter += 1 + _, statement_list = normalize_statement_list( + 0, + expression.statement_list, + assign_result_to='result', + ) return ( - counter, - tuple(prestatements), - NormalFunctionCallExpression( - expression.function, # TODO Normalize the function - arguments=tuple(arguments), + counter + 1, + ( + NormalVariableInitializationStatement( + variable=variable, + expression=NormalLambdaExpression( + argument_name_list=expression.argument_name_list, + statement_list=statement_list, + ), + ), ), + NormalVariableExpression(variable=variable), ) -def normalize_basic_infix_operation(counter, expression): - counter, left_prestatements, left_expression = normalize_expression(counter, expression.left) - counter, right_prestatements, right_expression = normalize_expression(counter, expression.right) +NormalListConstructExpression = collections.namedtuple( + 'NormalListConstructExpression', + [ + 'allocate', + ], +) + +NormalListAppendStatement = collections.namedtuple( + 'NormalListAppendStatement', + [ + 'list_expression', + 'item_expression', + ], +) - left_variable = '${}'.format(counter) - counter += 1 - right_variable = '${}'.format(counter) +def normalize_list_literal_expression(counter, expression): + list_variable = '${}'.format(counter) counter += 1 - root_prestatements = ( - NormalVariableAssignmentStatement( - variable=left_variable, - expression=left_expression, - ), - NormalVariableAssignmentStatement( - variable=right_variable, - expression=right_expression, + prestatements = [ + NormalVariableInitializationStatement( + variable=list_variable, + expression=NormalListConstructExpression(allocate=len(expression.item_expression_list)), ), - ) + ] + + list_expression = NormalVariableExpression(variable=list_variable) + + for item_expression in expression.item_expression_list: + counter, item_expression_prestatements, normalized = normalize_expression( + counter, + item_expression, + ) + + for p in item_expression_prestatements: + prestatements.append(p) + + prestatements.append( + NormalListAppendStatement( + list_expression=list_expression, + item_expression=normalized, + ) + ) return ( counter, - left_prestatements + right_prestatements + root_prestatements, - NormalInfixExpression( - order=expression.order, # TODO Do we need this? - operator=expression.operator, - left=NormalVariableExpression(variable=left_variable), - right=NormalVariableExpression(variable=right_variable), + tuple(prestatements), + list_expression, + ) + +def normalize_string_literal_expression(counter, expression): + variable = '${}'.format(counter) + return ( + counter + 1, + ( + NormalVariableInitializationStatement( + variable=variable, + expression=NormalStringLiteralExpression(string=expression.string), + ), ), + NormalVariableExpression(variable=variable), ) -def normalize_comparison_expression(counter, expression): - stack = [] +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 = [] - while isinstance(expression.left, parsing.FurInfixExpression) and expression.order == 'comparison_level': - stack.append((expression.operator, expression.order, expression.right)) - expression = expression.left + for symbol_expression_pair in expression.fields: + counter, field_prestatements, field_expression = normalize_expression( + counter, + symbol_expression_pair.expression, + ) - counter, left_prestatements, left_expression = normalize_expression(counter, expression.left) - counter, right_prestatements, right_expression = normalize_expression(counter, expression.right) + for p in field_prestatements: + prestatements.append(p) - left_variable = '${}'.format(counter) + field_symbol_array.append(symbol_expression_pair.symbol) + field_value_array.append(field_expression) + + symbol_array_variable = '${}'.format(counter) counter += 1 - right_variable = '${}'.format(counter) + + prestatements.append( + NormalSymbolArrayVariableInitializationStatement( + variable=symbol_array_variable, + symbol_list=tuple(field_symbol_array), + ) + ) + + value_array_variable = '${}'.format(counter) counter += 1 - root_prestatements = ( - NormalVariableAssignmentStatement( - variable=left_variable, - expression=left_expression, - ), - NormalVariableAssignmentStatement( - variable=right_variable, - expression=right_expression, - ), + prestatements.append( + NormalArrayVariableInitializationStatement( + variable=value_array_variable, + items=tuple(field_value_array), + ) ) - counter, result_prestatements, result_expression = ( - counter, - left_prestatements + right_prestatements + root_prestatements, - # TODO Implement short-circuiting - NormalInfixExpression( - order=expression.order, # TODO Do we need this? - operator=expression.operator, - left=NormalVariableExpression(variable=left_variable), - right=NormalVariableExpression(variable=right_variable), + 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, + ), + ) + ) + + return ( + counter + 1, + tuple(prestatements), + NormalVariableExpression(variable=variable), + ) + + +def normalize_symbol_expression(counter, expression): + variable = '${}'.format(counter) + return ( + counter + 1, + ( + NormalVariableInitializationStatement( + variable=variable, + expression=NormalSymbolExpression(symbol=expression.symbol), + ), ), + NormalVariableExpression(variable=variable), ) - while len(stack) > 0: - right_operator, right_order, right_expression = stack.pop() - and_right_expression = parsing.FurInfixExpression( - operator=right_operator, - order=right_order, - left=NormalVariableExpression(variable=right_variable), - right=right_expression, +def normalize_function_call_expression(counter, expression): + prestatements = [] + + for argument in expression.argument_list: + counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument) + + 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, + ), + ), + ) + counter += 1 + + counter, function_prestatements, function_expression = normalize_expression( + counter, + expression.function, + ) + + for ps in function_prestatements: + prestatements.append(ps) + + if not isinstance(function_expression, NormalVariableExpression): + function_variable = '${}'.format(counter) - and_expression = parsing.FurInfixExpression( - operator='and', - order='and_level', - left=result_expression, - right=and_right_expression, + prestatements.append( + NormalVariableInitializationStatement( + variable=function_variable, + expression=function_expression, + ) ) - counter, and_prestatements, result_expression = normalize_boolean_expression( - counter, - and_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), + ), ) + ) - result_prestatements = result_prestatements + and_prestatements + return ( + counter + 1, + tuple(prestatements), + NormalVariableExpression(variable=result_variable), + ) - return (counter, result_prestatements, result_expression) +def normalize_if_expression(counter, expression): + counter, condition_prestatements, condition_expression = normalize_expression( + counter, + expression.condition_expression, + ) -def normalize_boolean_expression(counter, expression): - # TODO Unfake this - return fake_normalization(counter, expression) + result_variable = '${}'.format(counter) + counter += 1 -def normalize_infix_expression(counter, expression): - return { - 'multiplication_level': normalize_basic_infix_operation, - 'addition_level': normalize_basic_infix_operation, - 'comparison_level': normalize_comparison_expression, - 'and_level': normalize_boolean_expression, - 'or_level': normalize_boolean_expression, - }[expression.order](counter, expression) + 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, + ), + ), + NormalVariableExpression(variable=result_variable), + ) def normalize_expression(counter, expression): return { - parsing.FurFunctionCallExpression: normalize_function_call_expression, - parsing.FurInfixExpression: normalize_infix_expression, - parsing.FurIntegerLiteralExpression: fake_normalization, - parsing.FurNegationExpression: fake_normalization, # TODO Don't fake this - parsing.FurParenthesizedExpression: fake_normalization, # TODO Don't fake this - parsing.FurStringLiteralExpression: fake_normalization, - parsing.FurSymbolExpression: fake_normalization, + 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, }[type(expression)](counter, expression) def normalize_expression_statement(counter, statement): - counter, prestatements, normalized = { - parsing.FurFunctionCallExpression: normalize_function_call_expression, - }[type(statement.expression)](counter, statement.expression) + # TODO Normalized will be a NormalVariableExpression, which will go unused + # for expression statements in every case except when it's a return + # statement. This cases warnings on C compilation. We should only generate + # this variable when it will be used on return. + counter, prestatements, normalized = normalize_expression(counter, statement.expression) return ( counter, @@ -212,21 +431,74 @@ 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 ( + counter, + prestatements, + NormalAssignmentStatement( + target=statement.target, + expression=normalized_expression, + ), + ) + def normalize_statement(counter, statement): return { - parsing.FurExpressionStatement: normalize_expression_statement, - parsing.FurAssignmentStatement: fake_normalization, + desugaring.DesugaredAssignmentStatement: normalize_assignment_statement, + desugaring.DesugaredExpressionStatement: normalize_expression_statement, + desugaring.DesugaredFunctionDefinitionStatement: normalize_function_definition_statement, }[type(statement)](counter, statement) -def normalize(program): - counter = 0 - statement_list = [] +@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 - for statement in program.statement_list: + result_statement_list = [] + + for statement in statement_list: counter, prestatements, normalized = normalize_statement(counter, statement) for s in prestatements: - statement_list.append(s) - statement_list.append(normalized) + 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, + ) + +def normalize(program): + _, statement_list = normalize_statement_list(0, program.statement_list) return NormalProgram( statement_list=statement_list,