X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=transformation.py;h=a9cad95b600141efa33a873942f1f06f54f0cb95;hp=2661cef0b1328909e9965f875b67f666876613df;hb=37d4a702fda63b87c1482a59b2ef4c1bba2e3696;hpb=3da330f045ed7fcb66ee9d9447de320680263699 diff --git a/transformation.py b/transformation.py index 2661cef..a9cad95 100644 --- a/transformation.py +++ b/transformation.py @@ -1,7 +1,6 @@ import collections -import normalization -import parsing # TODO Remove this import, as we should be normalizing everything before it gets here +import conversion CIntegerLiteral = collections.namedtuple( 'CIntegerLiteral', @@ -33,29 +32,29 @@ CSymbolExpression = collections.namedtuple( ], ) -CNegationExpression = collections.namedtuple( - 'CNegationExpression', +CStructureLiteralExpression = collections.namedtuple( + 'CStructureLiteralExpression', [ - 'value', + 'field_count', + 'symbol_list_variable', + 'value_list_variable', ], ) -CFunctionCallForFurInfixOperator = collections.namedtuple( - 'CFunctionCallForFurInfixOperator', - [ - 'name', - 'left', - 'right', - ], +CPushStatement = collections.namedtuple( + 'CPushStatement', + ( + 'expression', + ), ) CFunctionCallExpression = collections.namedtuple( 'CFunctionCallExpression', - [ - 'name', + ( + 'metadata', + 'function_expression', 'argument_count', - 'argument_items', - ], + ), ) # TODO We are currently not changing variables, just preventing them from being accessed. @@ -76,6 +75,15 @@ CArrayVariableInitializationStatement = collections.namedtuple( ], ) +CSymbolArrayVariableInitializationStatement = collections.namedtuple( + 'CSymbolArrayVariableInitializationStatement', + [ + 'variable', + 'symbol_list', + 'symbol_list_indices', + ], +) + CVariableInitializationStatement = collections.namedtuple( 'CVariableInitializationStatement', [ @@ -103,15 +111,8 @@ CIfElseStatement = collections.namedtuple( 'CIfElseStatement', [ 'condition_expression', - 'if_statements', - 'else_statements', - ], -) - -CFunctionDeclaration = collections.namedtuple( - 'CFunctionDeclaration', - [ - 'name', + 'if_statement_list', + 'else_statement_list', ], ) @@ -121,6 +122,7 @@ CFunctionDefinition = collections.namedtuple( 'CFunctionDefinition', [ 'name', + 'index', 'argument_name_list', 'statement_list', ], @@ -140,13 +142,15 @@ 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, conversion.CPSVariableExpression) return CVariableExpression(variable=expression.variable) def transform_string_literal_expression(accumulators, expression): @@ -175,101 +179,80 @@ def transform_symbol_expression(accumulators, expression): symbol_list_index=symbol_list_index, ) -CInfixDeclaration = collections.namedtuple( - 'CInfixDeclaration', - [ - 'name', - 'in_type', - 'out_type', - 'operator', - ], -) - -INFIX_OPERATOR_TO_DECLARATION = { - '+': 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='*'), - '//': CInfixDeclaration(name='integerDivide', in_type='integer', out_type='integer', operator='/'), - '%': CInfixDeclaration(name='modularDivide', in_type='integer', out_type='integer', operator='%'), - 'and': CInfixDeclaration(name='and', in_type='boolean', out_type='boolean', operator='&&'), - 'or': CInfixDeclaration(name='or', in_type='boolean', out_type='boolean', operator='||'), - '==': CInfixDeclaration(name='equals', in_type='integer', out_type='boolean', operator='=='), - '!=': CInfixDeclaration(name='notEquals', in_type='integer', out_type='boolean', operator='!='), - '<=': CInfixDeclaration(name='lessThanOrEqual', in_type='integer', out_type='boolean', operator='<='), - '>=': CInfixDeclaration(name='greaterThanOrEqual', in_type='integer', out_type='boolean', operator='>='), - '<': CInfixDeclaration(name='lessThan', in_type='integer', out_type='boolean', operator='<'), - '>': CInfixDeclaration(name='greaterThan', in_type='integer', out_type='boolean', operator='>'), -} +def transform_integer_literal_expression(accumulators, expression): + return CIntegerLiteral(value=expression.integer) -def transform_comparison_level_expression(accumulators, expression): - accumulators.operator_set.add(INFIX_OPERATOR_TO_DECLARATION[expression.operator]) +CListConstructExpression = collections.namedtuple( + 'CListConstructExpression', + ( + 'allocate', + ), +) - # 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 - ) +CLambdaExpression = collections.namedtuple( + 'CLambdaExpression', + ( + 'name', + 'index', + ), +) - middle = left.right +CListAppendStatement = collections.namedtuple( + 'CListAppendStatement', + ( + 'list_expression', + 'item_expression', + ), +) - 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, - ), - ) - - return CFunctionCallForFurInfixOperator( - name=INFIX_OPERATOR_TO_DECLARATION[expression.operator].name, - left=transform_expression(accumulators, expression.left), - right=transform_expression(accumulators, expression.right), +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_infix_expression(accumulators, expression): - if expression.order == 'comparison_level': - return transform_comparison_level_expression(accumulators, expression) +def transform_lambda_expression(accumulators, expression): + if expression.name is None: + name = '__lambda' + else: + name = expression.name + + index = accumulators.function_name_iterators.get(name, 0) + accumulators.function_name_iterators[name] = index + 1 - accumulators.operator_set.add(INFIX_OPERATOR_TO_DECLARATION[expression.operator]) + accumulators.function_definition_list.append(CFunctionDefinition( + name=name, + index=index, + argument_name_list=expression.argument_name_list, + statement_list=tuple(transform_statement(accumulators, s) for s in expression.statement_list), + )) - return CFunctionCallForFurInfixOperator( - name=INFIX_OPERATOR_TO_DECLARATION[expression.operator].name, - left=transform_expression(accumulators, expression.left), - right=transform_expression(accumulators, expression.right), + return CLambdaExpression( + name=name, + index=index, ) -def transform_integer_literal_expression(accumulators, expression): - return CIntegerLiteral(value=expression.integer) -def transform_negation_expression(accumulators, expression): - return CNegationExpression( - value=transform_expression(accumulators, expression.internal_expression), +def transform_list_construct_expression(accumulators, expression): + return CListConstructExpression(allocate=expression.allocate) + +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_expression, - normalization.NormalFunctionCallExpression: transform_function_call_expression, - normalization.NormalInfixExpression: transform_infix_expression, - normalization.NormalIntegerLiteralExpression: transform_integer_literal_expression, - normalization.NormalNegationExpression: transform_negation_expression, - normalization.NormalStringLiteralExpression: transform_string_literal_expression, - normalization.NormalSymbolExpression: transform_symbol_expression, - normalization.NormalVariableExpression: transform_variable_expression, + conversion.CPSFunctionCallExpression: transform_function_call_expression, + conversion.CPSIntegerLiteralExpression: transform_integer_literal_expression, + conversion.CPSLambdaExpression: transform_lambda_expression, + conversion.CPSListConstructExpression: transform_list_construct_expression, + conversion.CPSStructureLiteralExpression: transform_structure_literal_expression, + conversion.CPSStringLiteralExpression: transform_string_literal_expression, + conversion.CPSSymbolExpression: transform_symbol_expression, + conversion.CPSVariableExpression: transform_variable_expression, }[type(expression)](accumulators, expression) def transform_symbol_assignment_statement(accumulators, assignment_statement): @@ -292,9 +275,9 @@ def transform_symbol_assignment_statement(accumulators, assignment_statement): def transform_function_call_expression(accumulators, function_call): # TODO Use the symbol from SYMBOL LIST return CFunctionCallExpression( - name=transform_expression(accumulators, function_call.function), + metadata=function_call.metadata, + 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): @@ -305,8 +288,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): @@ -315,6 +298,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, @@ -327,30 +328,20 @@ def transform_variable_reassignment_statement(accumulators, statement): expression=transform_expression(accumulators, statement.expression), ) -def transform_function_definition_statement(accumulators, statement): - # TODO Allow defining the same function in different contexts - if any(fd.name == statement.name for fd in accumulators.function_definition_list): - raise Exception('A function with name "{}" already exists'.format(statement.name)) - - # TODO Add argument names to the symbol table - accumulators.function_definition_list.append(CFunctionDefinition( - name=statement.name, - argument_name_list=statement.argument_name_list, - statement_list=tuple(transform_statement(accumulators, s) for s in statement.statement_list) - )) - - 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, - normalization.NormalArrayVariableInitializationStatement: transform_array_variable_initialization_statement, - normalization.NormalAssignmentStatement: transform_symbol_assignment_statement, - normalization.NormalExpressionStatement: transform_expression_statement, - normalization.NormalFunctionDefinitionStatement: transform_function_definition_statement, - normalization.NormalIfElseStatement: transform_if_else_statement, - normalization.NormalVariableInitializationStatement: transform_variable_initialization_statement, - normalization.NormalVariableReassignmentStatement: transform_variable_reassignment_statement, + conversion.CPSArrayVariableInitializationStatement: transform_array_variable_initialization_statement, + conversion.CPSAssignmentStatement: transform_symbol_assignment_statement, + conversion.CPSExpressionStatement: transform_expression_statement, + conversion.CPSIfElseStatement: transform_if_else_statement, + conversion.CPSListAppendStatement: transform_list_append_statement, + conversion.CPSPushStatement: transform_push_statement, + conversion.CPSSymbolArrayVariableInitializationStatement: transform_symbol_array_variable_initialization_statement, + conversion.CPSVariableInitializationStatement: transform_variable_initialization_statement, + conversion.CPSVariableReassignmentStatement: transform_variable_reassignment_statement, }[type(statement)](accumulators, statement) @@ -359,6 +350,7 @@ Accumulators = collections.namedtuple( [ 'builtin_set', 'function_definition_list', + 'function_name_iterators', 'operator_set', 'symbol_list', 'string_literal_list', @@ -369,6 +361,7 @@ def transform(program): accumulators = Accumulators( builtin_set=set(), function_definition_list=[], + function_name_iterators={}, operator_set=set(), symbol_list=[], string_literal_list=[], @@ -378,11 +371,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]: