X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=normalization.py;h=5eef1db1532bc8256817ee8e6f76b53edc74619a;hp=c96e455ec3e8b939435e76552f83c739f2bad2f6;hb=1c6569d51fe16165b0114dfea143d8c6a971777c;hpb=a96e96f3f783930707122f691cd6a08a90416a74 diff --git a/normalization.py b/normalization.py index c96e455..5eef1db 100644 --- a/normalization.py +++ b/normalization.py @@ -1,6 +1,6 @@ import collections -import parsing +import desugaring import util NormalVariableExpression = collections.namedtuple( @@ -17,6 +17,15 @@ NormalIntegerLiteralExpression = collections.namedtuple( ], ) +NormalLambdaExpression = collections.namedtuple( + 'NormalLambdaExpression', + ( + 'name', + 'argument_name_list', + 'statement_list', + ), +) + NormalStringLiteralExpression = collections.namedtuple( 'NormalStringLiteralExpression', [ @@ -31,29 +40,19 @@ NormalSymbolExpression = collections.namedtuple( ], ) -NormalNegationExpression = collections.namedtuple( - 'NormalNegationExpression', - [ - 'internal_expression', - ], -) - -NormalInfixExpression = collections.namedtuple( - 'NormalInfixExpression', - [ - 'order', - 'operator', - 'left', - 'right', - ], +NormalPushStatement = collections.namedtuple( + 'NormalPushStatement', + ( + 'expression', + ), ) NormalFunctionCallExpression = collections.namedtuple( 'NormalFunctionCallExpression', [ + 'metadata', 'function_expression', 'argument_count', - 'argument_items', ], ) @@ -65,6 +64,14 @@ NormalArrayVariableInitializationStatement = collections.namedtuple( ], ) +NormalSymbolArrayVariableInitializationStatement = collections.namedtuple( + 'NormalSymbolArrayVariableInitializationStatement', + [ + 'variable', + 'symbol_list', + ], +) + NormalVariableInitializationStatement = collections.namedtuple( 'NormalVariableInitializationStatement', [ @@ -105,15 +112,6 @@ NormalIfElseStatement = collections.namedtuple( ], ) -NormalFunctionDefinitionStatement = collections.namedtuple( - 'NormalFunctionDefinitionStatement', - [ - 'name', - 'argument_name_list', - 'statement_list', - ], -) - NormalProgram = collections.namedtuple( 'NormalProgram', [ @@ -121,9 +119,6 @@ NormalProgram = collections.namedtuple( ], ) -def fake_normalization(counter, thing): - return (counter, (), thing) - def normalize_integer_literal_expression(counter, expression): variable = '${}'.format(counter) return ( @@ -137,241 +132,202 @@ def normalize_integer_literal_expression(counter, expression): NormalVariableExpression(variable=variable), ) -def normalize_string_literal_expression(counter, expression): +def normalize_lambda_expression(counter, expression): variable = '${}'.format(counter) - return ( - counter + 1, - ( - NormalVariableInitializationStatement( - variable=variable, - expression=NormalStringLiteralExpression(string=expression.string), - ), - ), - NormalVariableExpression(variable=variable), + + _, statement_list = normalize_statement_list( + 0, + expression.statement_list, + assign_result_to='result', ) -def normalize_symbol_expression(counter, expression): - variable = '${}'.format(counter) return ( counter + 1, ( NormalVariableInitializationStatement( variable=variable, - expression=NormalSymbolExpression(symbol=expression.symbol), + expression=NormalLambdaExpression( + name=expression.name, + argument_name_list=expression.argument_name_list, + statement_list=statement_list, + ), ), ), NormalVariableExpression(variable=variable), ) -def normalize_function_call_expression(counter, expression): - assert isinstance(expression, parsing.FurFunctionCallExpression) - - prestatements = [] - arguments = [] - - for argument in expression.arguments: - counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument) - - for s in argument_prestatements: - prestatements.append(s) +NormalListConstructExpression = collections.namedtuple( + 'NormalListConstructExpression', + [ + 'allocate', + ], +) - variable = '${}'.format(counter) - prestatements.append( - NormalVariableInitializationStatement( - variable=variable, - expression=normalized_argument, - ) - ) - arguments.append(NormalVariableExpression( - variable=variable, - )) - counter += 1 +NormalListAppendStatement = collections.namedtuple( + 'NormalListAppendStatement', + [ + 'list_expression', + 'item_expression', + ], +) - arguments_variable = '${}'.format(counter) +def normalize_list_literal_expression(counter, expression): + list_variable = '${}'.format(counter) counter += 1 - prestatements.append(NormalArrayVariableInitializationStatement( - variable=arguments_variable, - items=tuple(arguments), - )) + prestatements = [ + NormalVariableInitializationStatement( + variable=list_variable, + expression=NormalListConstructExpression(allocate=len(expression.item_expression_list)), + ), + ] - counter, function_prestatements, function_expression = normalize_expression( - counter, - expression.function, - ) + list_expression = NormalVariableExpression(variable=list_variable) - for ps in function_prestatements: - prestatements.append(ps) + for item_expression in expression.item_expression_list: + counter, item_expression_prestatements, normalized = normalize_expression( + counter, + item_expression, + ) - if not isinstance(function_expression, NormalVariableExpression): - function_variable = '${}'.format(counter) + for p in item_expression_prestatements: + prestatements.append(p) prestatements.append( - NormalVariableInitializationStatement( - variable=function_variable, - expression=function_expression, + NormalListAppendStatement( + list_expression=list_expression, + item_expression=normalized, ) ) - function_expression = NormalVariableExpression(variable=function_variable) - counter += 1 - return ( counter, tuple(prestatements), - NormalFunctionCallExpression( - function_expression=function_expression, - argument_count=len(arguments), - argument_items=NormalVariableExpression(variable=arguments_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) - - left_variable = '${}'.format(counter) - counter += 1 - right_variable = '${}'.format(counter) - counter += 1 - center_variable = '${}'.format(counter) - counter += 1 - - root_prestatements = ( - NormalVariableInitializationStatement( - variable=left_variable, - expression=left_expression, - ), - NormalVariableInitializationStatement( - variable=right_variable, - expression=right_expression, - ), - NormalVariableInitializationStatement( - variable=center_variable, - expression=NormalInfixExpression( - order=expression.order, - operator=expression.operator, - left=NormalVariableExpression(variable=left_variable), - right=NormalVariableExpression(variable=right_variable), - ), - ), + list_expression, ) +def normalize_string_literal_expression(counter, expression): return ( counter, - left_prestatements + right_prestatements + root_prestatements, - NormalVariableExpression(variable=center_variable), + (), + NormalStringLiteralExpression(string=expression.string), ) -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 = [] + + for symbol_expression_pair in expression.fields: + counter, field_prestatements, field_expression = normalize_expression( + counter, + symbol_expression_pair.expression, + ) - while isinstance(expression.left, parsing.FurInfixExpression) and expression.order == 'comparison_level': - stack.append((expression.operator, expression.order, expression.right)) - expression = expression.left + for p in field_prestatements: + prestatements.append(p) - counter, left_prestatements, left_expression = normalize_expression(counter, expression.left) - counter, right_prestatements, right_expression = normalize_expression(counter, expression.right) + field_symbol_array.append(symbol_expression_pair.symbol) + field_value_array.append(field_expression) - left_variable = '${}'.format(counter) + 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 = ( - NormalVariableInitializationStatement( - variable=left_variable, - expression=left_expression, - ), + prestatements.append( + NormalArrayVariableInitializationStatement( + variable=value_array_variable, + items=tuple(field_value_array), + ) + ) + + variable = '${}'.format(counter) + + prestatements.append( NormalVariableInitializationStatement( - variable=right_variable, - expression=right_expression, - ), + variable=variable, + expression=NormalStructureLiteralExpression( + field_count=len(expression.fields), + symbol_list_variable=symbol_array_variable, + value_list_variable=value_array_variable, + ), + ) ) - counter, result_prestatements, result_expression = ( - counter, - left_prestatements + right_prestatements + root_prestatements, - NormalInfixExpression( - order=expression.order, - operator=expression.operator, - left=NormalVariableExpression(variable=left_variable), - right=NormalVariableExpression(variable=right_variable), - ), + return ( + counter + 1, + tuple(prestatements), + 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, - ) - and_expression = parsing.FurInfixExpression( - operator='and', - order='and_level', - left=result_expression, - right=and_right_expression, - ) +def normalize_symbol_expression(counter, expression): + return ( + counter, + (), + NormalSymbolExpression(symbol=expression.symbol), + ) - counter, and_prestatements, result_expression = normalize_boolean_expression( - counter, - and_expression, - ) +def normalize_function_call_expression(counter, expression): + prestatements = [] - result_prestatements = result_prestatements + and_prestatements + for argument in expression.argument_list: + counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument) - return (counter, result_prestatements, result_expression) + for s in argument_prestatements: + prestatements.append(s) -def normalize_boolean_expression(counter, expression): - counter, left_prestatements, left_expression = normalize_expression(counter, expression.left) - counter, right_prestatements, right_expression = normalize_expression(counter, expression.right) + prestatements.append( + NormalPushStatement( + expression=normalized_argument, + ), + ) - result_variable = '${}'.format(counter) - if_else_prestatment = NormalVariableInitializationStatement( - variable=result_variable, - expression=left_expression, + counter, function_prestatements, function_expression = normalize_expression( + counter, + expression.function, ) - counter += 1 - condition_expression=NormalVariableExpression(variable=result_variable) - short_circuited_statements = right_prestatements + (NormalVariableReassignmentStatement(variable=result_variable, expression=right_expression),) + for ps in function_prestatements: + prestatements.append(ps) - if expression.operator == 'and': - if_else_statement = NormalIfElseStatement( - condition_expression=condition_expression, - if_statement_list=short_circuited_statements, - else_statement_list=(), - ) + result_variable = '${}'.format(counter) - elif expression.operator == 'or': - if_else_statement = NormalIfElseStatement( - condition_expression=condition_expression, - if_statement_list=(), - else_statement_list=short_circuited_statements, + prestatements.append( + NormalVariableInitializationStatement( + variable=result_variable, + expression=NormalFunctionCallExpression( + metadata=expression.metadata, + function_expression=function_expression, + argument_count=len(expression.argument_list), + ), ) - - else: - raise Exception('Unable to handle operator "{}"'.format(expression.operator)) + ) return ( - counter, - left_prestatements + (if_else_prestatment, if_else_statement), + counter + 1, + tuple(prestatements), NormalVariableExpression(variable=result_variable), ) - -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) - def normalize_if_expression(counter, expression): counter, condition_prestatements, condition_expression = normalize_expression( counter, @@ -408,37 +364,16 @@ def normalize_if_expression(counter, expression): NormalVariableExpression(variable=result_variable), ) - - - -def normalize_negation_expression(counter, expression): - counter, prestatements, internal_expression = normalize_expression(counter, expression.value) - - internal_variable = '${}'.format(counter) - counter += 1 - - return ( - counter, - prestatements + ( - NormalVariableInitializationStatement( - variable=internal_variable, - expression=internal_expression, - ), - ), - NormalNegationExpression(internal_expression=NormalVariableExpression(variable=internal_variable)), - ) - def normalize_expression(counter, expression): return { - NormalInfixExpression: fake_normalization, - NormalVariableExpression: fake_normalization, - parsing.FurFunctionCallExpression: normalize_function_call_expression, - parsing.FurIfExpression: normalize_if_expression, - parsing.FurInfixExpression: normalize_infix_expression, - parsing.FurIntegerLiteralExpression: normalize_integer_literal_expression, - parsing.FurNegationExpression: normalize_negation_expression, - parsing.FurStringLiteralExpression: normalize_string_literal_expression, - parsing.FurSymbolExpression: normalize_symbol_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, }[type(expression)](counter, expression) def normalize_expression_statement(counter, statement): @@ -454,22 +389,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 ( @@ -483,9 +402,8 @@ def normalize_assignment_statement(counter, statement): def normalize_statement(counter, statement): return { - parsing.FurAssignmentStatement: normalize_assignment_statement, - parsing.FurExpressionStatement: normalize_expression_statement, - parsing.FurFunctionDefinitionStatement: normalize_function_definition_statement, + desugaring.DesugaredAssignmentStatement: normalize_assignment_statement, + desugaring.DesugaredExpressionStatement: normalize_expression_statement, }[type(statement)](counter, statement) @util.force_generator(tuple) @@ -502,12 +420,12 @@ 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): - result_expression = result_statement_list.pop().expression - if assign_result_to is not None: + result_expression = result_statement_list.pop().expression result_statement_list.append( NormalVariableReassignmentStatement( variable=assign_result_to,