X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=transformation.py;h=7d47ed494100f2f8673f3b11e261b2418fd206ba;hp=e06bcf02638636b826c9fcd39d984460fa4890f7;hb=b47a0017d1dbfda8e8bae7989fff9ccb31897a28;hpb=151f60b119247efb1bcf05a664f4324b71fac782 diff --git a/transformation.py b/transformation.py index e06bcf0..7d47ed4 100644 --- a/transformation.py +++ b/transformation.py @@ -33,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', [ @@ -43,18 +61,23 @@ CNegationExpression = collections.namedtuple( CFunctionCallForFurInfixOperator = collections.namedtuple( 'CFunctionCallForFurInfixOperator', [ + 'metadata', 'name', - 'left', - 'right', ], ) +CPushStatement = collections.namedtuple( + 'CPushStatement', + ( + 'expression', + ), +) + CFunctionCallExpression = collections.namedtuple( 'CFunctionCallExpression', [ 'function_expression', 'argument_count', - 'argument_items', ], ) @@ -76,6 +99,15 @@ CArrayVariableInitializationStatement = collections.namedtuple( ], ) +CSymbolArrayVariableInitializationStatement = collections.namedtuple( + 'CSymbolArrayVariableInitializationStatement', + [ + 'variable', + 'symbol_list', + 'symbol_list_indices', + ], +) + CVariableInitializationStatement = collections.namedtuple( 'CVariableInitializationStatement', [ @@ -148,6 +180,7 @@ BUILTINS = { } def transform_variable_expression(accumulators, expression): + assert isinstance(expression, normalization.NormalVariableExpression) return CVariableExpression(variable=expression.variable) def transform_string_literal_expression(accumulators, expression): @@ -206,59 +239,21 @@ FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR = { '>': CInfixDeclaration(name='greaterThan', in_type='integer', out_type='boolean', operator='>'), } -def transform_comparison_level_expression(accumulators, expression): - accumulators.operator_set.add(FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[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=FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator].name, - left=middle, - right=right, - ), - ) - - return CFunctionCallForFurInfixOperator( - name=FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator].name, - left=transform_expression(accumulators, expression.left), - right=transform_expression(accumulators, expression.right), - ) - def transform_infix_operator_without_c_equivalent(accumulators, expression): return CFunctionCallForFurInfixOperator( + metadata=expression.metadata, name='concatenate', - left=transform_expression(accumulators, expression.left), - right=transform_expression(accumulators, expression.right), ) + def transform_infix_expression(accumulators, expression): if expression.operator in FUR_INFIX_OPERATOR_TO_C_FUNCTION: return transform_infix_operator_without_c_equivalent(accumulators, expression) - if expression.order == 'comparison_level': - return transform_comparison_level_expression(accumulators, expression) - accumulators.operator_set.add(FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator]) return CFunctionCallForFurInfixOperator( + metadata=expression.metadata, name=FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator].name, - left=transform_expression(accumulators, expression.left), - right=transform_expression(accumulators, expression.right), ) def transform_integer_literal_expression(accumulators, expression): @@ -292,6 +287,27 @@ CListGetExpression = collections.namedtuple( ], ) +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) @@ -314,12 +330,14 @@ def transform_expression(accumulators, expression): parsing.FurIntegerLiteralExpression: transform_integer_literal_expression, parsing.FurNegationExpression: transform_negation_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, @@ -347,7 +365,6 @@ def transform_function_call_expression(accumulators, function_call): return CFunctionCallExpression( 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): @@ -368,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, @@ -394,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, @@ -403,6 +441,8 @@ def transform_statement(accumulators, 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) @@ -432,11 +472,6 @@ def transform(program): transform_statement(accumulators, statement) for statement in program.statement_list ] - # This prevents warnings about normalized variables being entire C statements - last_statement = statement_list[-1] - if isinstance(last_statement, normalization.NormalExpressionStatement) and isinstance(last_statement.expression, normalization.NormalVariableExpression): - del statement_list[-1] - standard_library_set = set() for builtin in accumulators.builtin_set: for standard_library in BUILTINS[builtin]: