X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=transformation.py;h=7d47ed494100f2f8673f3b11e261b2418fd206ba;hp=0eed799e1f7b46cbabc66fee1677b0c2d75493e2;hb=b47a0017d1dbfda8e8bae7989fff9ccb31897a28;hpb=b059a00e0e2511a2ca2477db1e91d53fc5d2ec0f diff --git a/transformation.py b/transformation.py index 0eed799..7d47ed4 100644 --- a/transformation.py +++ b/transformation.py @@ -1,7 +1,7 @@ import collections import normalization -import parsing +import parsing # TODO Remove this import, as we should be normalizing everything before it gets here CIntegerLiteral = collections.namedtuple( 'CIntegerLiteral', @@ -18,13 +18,6 @@ CStringLiteral = collections.namedtuple( ], ) -CConstantExpression = collections.namedtuple( - 'CConstantExpression', - [ - 'value' - ], -) - CVariableExpression = collections.namedtuple( 'CVariableExpression', [ @@ -40,6 +33,24 @@ CSymbolExpression = collections.namedtuple( ], ) +CStructureLiteralExpression = collections.namedtuple( + 'CStructureLiteralExpression', + [ + 'field_count', + 'symbol_list_variable', + 'value_list_variable', + ], +) + +CDotExpression = collections.namedtuple( + 'CDotExpression', + [ + 'instance', + 'symbol', + 'symbol_list_index', + ], +) + CNegationExpression = collections.namedtuple( 'CNegationExpression', [ @@ -50,21 +61,27 @@ CNegationExpression = collections.namedtuple( CFunctionCallForFurInfixOperator = collections.namedtuple( 'CFunctionCallForFurInfixOperator', [ + 'metadata', 'name', - 'left', - 'right', ], ) +CPushStatement = collections.namedtuple( + 'CPushStatement', + ( + 'expression', + ), +) + CFunctionCallExpression = collections.namedtuple( 'CFunctionCallExpression', [ - 'name', + 'function_expression', 'argument_count', - 'argument_items', ], ) +# TODO We are currently not changing variables, just preventing them from being accessed. CSymbolAssignmentStatement = collections.namedtuple( 'CSymbolAssignmentStatement', [ @@ -82,6 +99,15 @@ CArrayVariableInitializationStatement = collections.namedtuple( ], ) +CSymbolArrayVariableInitializationStatement = collections.namedtuple( + 'CSymbolArrayVariableInitializationStatement', + [ + 'variable', + 'symbol_list', + 'symbol_list_indices', + ], +) + CVariableInitializationStatement = collections.namedtuple( 'CVariableInitializationStatement', [ @@ -109,8 +135,8 @@ CIfElseStatement = collections.namedtuple( 'CIfElseStatement', [ 'condition_expression', - 'if_statements', - 'else_statements', + 'if_statement_list', + 'else_statement_list', ], ) @@ -121,6 +147,8 @@ CFunctionDeclaration = collections.namedtuple( ], ) +# TODO If a function definition doesn't end with an expression, we have issues currently because we try to return statement. +# TODO Closures currently wrap entire defining environment, even symbols that are not used, which makes garbage collection ineffective. CFunctionDefinition = collections.namedtuple( 'CFunctionDefinition', [ @@ -144,17 +172,19 @@ CProgram = collections.namedtuple( ) BUILTINS = { - 'false': [], - 'pow': ['math.h'], - 'print': ['stdio.h'], - 'true': [], + 'concatenate': [], + 'false': [], + 'pow': ['math.h'], + 'print': ['stdio.h'], + 'true': [], } def transform_variable_expression(accumulators, expression): + assert isinstance(expression, normalization.NormalVariableExpression) return CVariableExpression(variable=expression.variable) -def transform_string_literal(accumulators, expression): - value = expression.value +def transform_string_literal_expression(accumulators, expression): + value = expression.string try: index = accumulators.string_literal_list.index(value) @@ -165,17 +195,17 @@ def transform_string_literal(accumulators, expression): return CStringLiteral(index=index, value=value) def transform_symbol_expression(accumulators, expression): - if expression.value in ['true', 'false']: - return CConstantExpression(value=expression.value) + if expression.symbol in BUILTINS: + accumulators.builtin_set.add(expression.symbol) try: - symbol_list_index = accumulators.symbol_list.index(expression.value) + symbol_list_index = accumulators.symbol_list.index(expression.symbol) except ValueError: symbol_list_index = len(accumulators.symbol_list) - accumulators.symbol_list.append(expression.value) + accumulators.symbol_list.append(expression.symbol) return CSymbolExpression( - symbol=expression.value, + symbol=expression.symbol, symbol_list_index=symbol_list_index, ) @@ -189,7 +219,11 @@ CInfixDeclaration = collections.namedtuple( ], ) -INFIX_OPERATOR_TO_DECLARATION = { +FUR_INFIX_OPERATOR_TO_C_FUNCTION = { + '++': 'concatenate', +} + +FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR = { '+': CInfixDeclaration(name='add', in_type='integer', out_type='integer', operator='+'), '-': CInfixDeclaration(name='subtract', in_type='integer', out_type='integer', operator='-'), '*': CInfixDeclaration(name='multiply', in_type='integer', out_type='integer', operator='*'), @@ -205,72 +239,107 @@ INFIX_OPERATOR_TO_DECLARATION = { '>': CInfixDeclaration(name='greaterThan', in_type='integer', out_type='boolean', operator='>'), } -def transform_comparison_level_expression(accumulators, expression): - accumulators.operator_set.add(INFIX_OPERATOR_TO_DECLARATION[expression.operator]) - - # Transform expressions like 1 < 2 < 3 into expressions like 1 < 2 && 2 < 3 - if isinstance(expression.left, parsing.FurInfixExpression) and expression.left.order == 'comparison_level': - left = transform_comparison_level_expression( - accumulators, - expression.left - ) - - middle = left.right - - right = transform_expression( - accumulators, - expression.right, - ) - - # TODO Don't evaluate the middle expression twice - return CFunctionCallForFurInfixOperator( - name='and', - left=left, - right=CFunctionCallForFurInfixOperator( - name=INFIX_OPERATOR_TO_DECLARATION[expression.operator].name, - left=middle, - right=right, - ), - ) - +def transform_infix_operator_without_c_equivalent(accumulators, expression): return CFunctionCallForFurInfixOperator( - name=INFIX_OPERATOR_TO_DECLARATION[expression.operator].name, - left=transform_expression(accumulators, expression.left), - right=transform_expression(accumulators, expression.right), + metadata=expression.metadata, + name='concatenate', ) def transform_infix_expression(accumulators, expression): - if expression.order == 'comparison_level': - return transform_comparison_level_expression(accumulators, expression) + if expression.operator in FUR_INFIX_OPERATOR_TO_C_FUNCTION: + return transform_infix_operator_without_c_equivalent(accumulators, expression) - accumulators.operator_set.add(INFIX_OPERATOR_TO_DECLARATION[expression.operator]) + accumulators.operator_set.add(FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator]) return CFunctionCallForFurInfixOperator( - name=INFIX_OPERATOR_TO_DECLARATION[expression.operator].name, - left=transform_expression(accumulators, expression.left), - right=transform_expression(accumulators, expression.right), + metadata=expression.metadata, + name=FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator].name, ) def transform_integer_literal_expression(accumulators, expression): - return CIntegerLiteral(value=expression.value) + return CIntegerLiteral(value=expression.integer) def transform_negation_expression(accumulators, expression): return CNegationExpression( value=transform_expression(accumulators, expression.internal_expression), ) +CListConstructExpression = collections.namedtuple( + 'CListConstructExpression', + [ + 'allocate', + ], +) + +CListAppendStatement = collections.namedtuple( + 'CListAppendStatement', + [ + 'list_expression', + 'item_expression', + ], +) + +CListGetExpression = collections.namedtuple( + 'CListGetExpression', + [ + 'list_expression', + 'index_expression', + ], +) + +def transform_structure_literal_expression(accumulators, expression): + return CStructureLiteralExpression( + field_count=expression.field_count, + symbol_list_variable=expression.symbol_list_variable, + value_list_variable=expression.value_list_variable, + ) + +def transform_dot_expression(accumulators, expression): + try: + symbol_list_index = accumulators.symbol_list.index(expression.field) + + except ValueError: + symbol_list_index = len(accumulators.symbol_list) + accumulators.symbol_list.append(expression.field) + + return CDotExpression( + instance=transform_variable_expression(accumulators, expression.instance), + symbol=expression.field, + symbol_list_index=symbol_list_index, + ) + +def transform_list_construct_expression(accumulators, expression): + return CListConstructExpression(allocate=expression.allocate) + +def transform_list_get_expression(accumulators, expression): + return CListGetExpression( + list_expression=transform_expression(accumulators, expression.list_expression), + index_expression=transform_expression(accumulators, expression.index_expression), + ) + +def transform_list_append_statement(accumulators, expression): + return CListAppendStatement( + list_expression=transform_expression(accumulators, expression.list_expression), + item_expression=transform_expression(accumulators, expression.item_expression), + ) + def transform_expression(accumulators, expression): # TODO Clean up handlers for parsing expressions return { - parsing.FurFunctionCallExpression: transform_function_call_expression, parsing.FurInfixExpression: transform_infix_expression, parsing.FurIntegerLiteralExpression: transform_integer_literal_expression, parsing.FurNegationExpression: transform_negation_expression, - parsing.FurStringLiteralExpression: transform_string_literal, - parsing.FurSymbolExpression: transform_symbol_expression, + parsing.FurStringLiteralExpression: transform_string_literal_expression, + normalization.NormalDotExpression: transform_dot_expression, normalization.NormalFunctionCallExpression: transform_function_call_expression, normalization.NormalInfixExpression: transform_infix_expression, + normalization.NormalIntegerLiteralExpression: transform_integer_literal_expression, + normalization.NormalListConstructExpression: transform_list_construct_expression, + normalization.NormalListGetExpression: transform_list_get_expression, normalization.NormalNegationExpression: transform_negation_expression, + normalization.NormalStructureLiteralExpression: transform_structure_literal_expression, + normalization.NormalStringLiteralExpression: transform_string_literal_expression, + normalization.NormalSymbolExpression: transform_symbol_expression, normalization.NormalVariableExpression: transform_variable_expression, }[type(expression)](accumulators, expression) @@ -292,15 +361,10 @@ def transform_symbol_assignment_statement(accumulators, assignment_statement): ) def transform_function_call_expression(accumulators, function_call): - if function_call.function.value in BUILTINS.keys(): - # TODO Check that the builtin is actually callable - accumulators.builtin_set.add(function_call.function.value) - # TODO Use the symbol from SYMBOL LIST return CFunctionCallExpression( - name=function_call.function.value, + function_expression=transform_expression(accumulators, function_call.function_expression), argument_count=function_call.argument_count, - argument_items=transform_expression(accumulators, function_call.argument_items), ) def transform_expression_statement(accumulators, statement): @@ -311,8 +375,8 @@ def transform_expression_statement(accumulators, statement): def transform_if_else_statement(accumulators, statement): return CIfElseStatement( condition_expression=transform_expression(accumulators, statement.condition_expression), - if_statements=tuple(transform_statement(accumulators, s) for s in statement.if_statements), - else_statements=tuple(transform_statement(accumulators, s) for s in statement.else_statements), + if_statement_list=tuple(transform_statement(accumulators, s) for s in statement.if_statement_list), + else_statement_list=tuple(transform_statement(accumulators, s) for s in statement.else_statement_list), ) def transform_array_variable_initialization_statement(accumulators, statement): @@ -321,6 +385,24 @@ def transform_array_variable_initialization_statement(accumulators, statement): items=tuple(transform_expression(accumulators, i) for i in statement.items), ) +def transform_symbol_array_variable_initialization_statement(accumulators, statement): + symbol_list_indices = [] + + for symbol in statement.symbol_list: + try: + symbol_list_index = accumulators.symbol_list.index(symbol) + except ValueError: + symbol_list_index = len(accumulators.symbol_list) + accumulators.symbol_list.append(symbol) + + symbol_list_indices.append(symbol_list_index) + + return CSymbolArrayVariableInitializationStatement( + variable=statement.variable, + symbol_list=statement.symbol_list, + symbol_list_indices=tuple(symbol_list_indices), + ) + def transform_variable_initialization_statement(accumulators, statement): return CVariableInitializationStatement( variable=statement.variable, @@ -347,6 +429,9 @@ def transform_function_definition_statement(accumulators, statement): return CFunctionDeclaration(name=statement.name) +def transform_push_statement(accumulators, statement): + return CPushStatement(expression=transform_expression(accumulators, statement.expression)) + def transform_statement(accumulators, statement): return { parsing.FurExpressionStatement: transform_expression_statement, @@ -355,6 +440,9 @@ def transform_statement(accumulators, statement): normalization.NormalExpressionStatement: transform_expression_statement, normalization.NormalFunctionDefinitionStatement: transform_function_definition_statement, normalization.NormalIfElseStatement: transform_if_else_statement, + normalization.NormalListAppendStatement: transform_list_append_statement, + normalization.NormalPushStatement: transform_push_statement, + normalization.NormalSymbolArrayVariableInitializationStatement: transform_symbol_array_variable_initialization_statement, normalization.NormalVariableInitializationStatement: transform_variable_initialization_statement, normalization.NormalVariableReassignmentStatement: transform_variable_reassignment_statement, }[type(statement)](accumulators, statement)