import collections
-import parsing
+import desugaring
import util
+NormalBuiltinExpression = collections.namedtuple(
+ 'NormalBuiltinExpression',
+ (
+ 'symbol',
+ ),
+)
+
NormalVariableExpression = collections.namedtuple(
'NormalVariableExpression',
[
],
)
-NormalNegationExpression = collections.namedtuple(
- 'NormalNegationExpression',
+NormalIntegerLiteralExpression = collections.namedtuple(
+ 'NormalIntegerLiteralExpression',
[
- 'internal_expression',
+ 'integer',
],
)
-NormalInfixExpression = collections.namedtuple(
- 'NormalInfixExpression',
+NormalLambdaExpression = collections.namedtuple(
+ 'NormalLambdaExpression',
+ (
+ 'name',
+ 'argument_name_list',
+ 'statement_list',
+ ),
+)
+
+NormalStringLiteralExpression = collections.namedtuple(
+ 'NormalStringLiteralExpression',
[
- 'order',
- 'operator',
- 'left',
- 'right',
+ 'string',
],
)
+NormalSymbolExpression = collections.namedtuple(
+ 'NormalSymbolExpression',
+ (
+ 'symbol',
+ ),
+)
+
+NormalSymbolLiteralExpression = collections.namedtuple(
+ 'NormalSymbolLiteralExpression',
+ (
+ 'symbol',
+ ),
+)
+
+NormalPushStatement = collections.namedtuple(
+ 'NormalPushStatement',
+ (
+ 'expression',
+ ),
+)
+
NormalFunctionCallExpression = collections.namedtuple(
'NormalFunctionCallExpression',
[
- 'function',
+ 'metadata',
+ 'function_expression',
'argument_count',
- 'argument_items',
- ],
-)
-
-NormalArrayVariableInitializationStatement = collections.namedtuple(
- 'NormalArrayVariableInitializationStatement',
- [
- 'variable',
- 'items',
],
)
],
)
-NormalVariableReassignmentStatement = collections.namedtuple(
- 'NormalVariableReassignmentStatement',
- [
- 'variable',
- 'expression',
- ],
-)
-
NormalExpressionStatement = collections.namedtuple(
'NormalExpressionStatement',
[
],
)
-NormalIfElseStatement = collections.namedtuple(
- 'NormalIfElseStatement',
+NormalAssignmentStatement = collections.namedtuple(
+ 'NormalAssignmentStatement',
[
- 'condition_expression',
- 'if_statements',
- 'else_statements',
+ 'target',
+ 'expression',
],
)
-NormalFunctionDefinitionStatement = collections.namedtuple(
- 'NormalFunctionDefinitionStatement',
+NormalIfElseExpression = collections.namedtuple(
+ 'NormalIfElseExpression',
[
- 'name',
- 'statement_list',
+ 'condition_expression',
+ 'if_statement_list',
+ 'else_statement_list',
],
)
],
)
-# TODO Get rid of this
-def fake_normalization(counter, thing):
- return (counter, (), thing)
+def normalize_builtin_expression(counter, expression):
+ return (
+ counter,
+ (),
+ NormalBuiltinExpression(symbol=expression.symbol),
+ )
-def normalize_function_call_expression(counter, expression):
- assert isinstance(expression, parsing.FurFunctionCallExpression)
+def normalize_integer_literal_expression(counter, expression):
+ return (
+ counter,
+ (),
+ NormalIntegerLiteralExpression(integer=expression.integer),
+ )
- prestatements = []
- arguments = []
+def normalize_lambda_expression(counter, expression):
+ variable = '${}'.format(counter)
- for argument in expression.arguments:
- counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument)
+ _, statement_list = normalize_statement_list(
+ 0,
+ expression.statement_list,
+ )
- for s in argument_prestatements:
- prestatements.append(s)
+ return (
+ counter + 1,
+ (
+ NormalVariableInitializationStatement(
+ variable=variable,
+ expression=NormalLambdaExpression(
+ name=expression.name,
+ argument_name_list=expression.argument_name_list,
+ statement_list=statement_list,
+ ),
+ ),
+ ),
+ NormalVariableExpression(variable=variable),
+ )
- variable = '${}'.format(counter)
- prestatements.append(NormalVariableInitializationStatement(
- variable=variable,
- expression=normalized_argument,
- ))
- arguments.append(NormalVariableExpression(
- variable=variable,
- ))
- counter += 1
+NormalListConstructExpression = collections.namedtuple(
+ 'NormalListConstructExpression',
+ [
+ 'allocate',
+ ],
+)
- 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 = []
- return (
- counter,
- tuple(prestatements),
- NormalFunctionCallExpression(
- function=expression.function, # TODO Normalize the function
- argument_count=len(arguments),
- argument_items=NormalVariableExpression(variable=arguments_variable),
- ),
- )
+ for item_expression in expression.item_expression_list:
+ counter, item_expression_prestatements, normalized = normalize_expression(
+ counter,
+ item_expression,
+ )
-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)
+ for p in item_expression_prestatements:
+ prestatements.append(p)
- left_variable = '${}'.format(counter)
- counter += 1
- right_variable = '${}'.format(counter)
- counter += 1
+ prestatements.append(
+ NormalPushStatement(
+ expression=normalized,
+ )
+ )
- root_prestatements = (
- NormalVariableInitializationStatement(
- variable=left_variable,
- expression=left_expression,
- ),
- NormalVariableInitializationStatement(
- variable=right_variable,
- expression=right_expression,
- ),
+ return (
+ counter,
+ tuple(prestatements),
+ NormalListConstructExpression(allocate=len(expression.item_expression_list)),
)
+def normalize_string_literal_expression(counter, expression):
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),
- ),
+ (),
+ NormalStringLiteralExpression(string=expression.string),
)
-def normalize_comparison_expression(counter, expression):
- stack = []
+NormalStructureLiteralExpression = collections.namedtuple(
+ 'NormalStructureLiteralExpression',
+ (
+ 'field_count',
+ ),
+)
- while isinstance(expression.left, parsing.FurInfixExpression) and expression.order == 'comparison_level':
- stack.append((expression.operator, expression.order, expression.right))
- expression = expression.left
+def normalize_structure_literal_expression(counter, expression):
+ prestatements = []
- counter, left_prestatements, left_expression = normalize_expression(counter, expression.left)
- counter, right_prestatements, right_expression = normalize_expression(counter, expression.right)
+ for field in expression.fields:
+ counter, field_expression_prestatements, field_expression = normalize_expression(
+ counter,
+ field.expression,
+ )
- left_variable = '${}'.format(counter)
- counter += 1
- right_variable = '${}'.format(counter)
- counter += 1
+ for p in field_expression_prestatements:
+ prestatements.append(p)
- root_prestatements = (
- NormalVariableInitializationStatement(
- variable=left_variable,
- expression=left_expression,
- ),
- NormalVariableInitializationStatement(
- variable=right_variable,
- expression=right_expression,
- ),
- )
+ prestatements.append(NormalPushStatement(
+ expression=field_expression,
+ ))
+
+ prestatements.append(NormalPushStatement(
+ expression=NormalSymbolLiteralExpression(
+ symbol=field.symbol,
+ ),
+ ))
- counter, result_prestatements, result_expression = (
+ return (
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),
+ tuple(prestatements),
+ NormalStructureLiteralExpression(
+ field_count=len(expression.fields),
),
)
- 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,
- )
-
- counter, and_prestatements, result_expression = normalize_boolean_expression(
- counter,
- and_expression,
- )
-
- result_prestatements = result_prestatements + and_prestatements
+def normalize_symbol_expression(counter, expression):
+ return (
+ counter,
+ (),
+ NormalSymbolExpression(symbol=expression.symbol),
+ )
- return (counter, result_prestatements, result_expression)
+def normalize_symbol_literal_expression(counter, expression):
+ return (
+ counter,
+ (),
+ NormalSymbolLiteralExpression(symbol=expression.symbol),
+ )
-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)
+def normalize_function_call_expression(counter, expression):
+ prestatements = []
- result_variable = '${}'.format(counter)
- if_else_prestatment = NormalVariableInitializationStatement(variable=result_variable, expression=left_expression)
- counter += 1
+ for argument in expression.argument_list:
+ counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument)
- condition_expression=NormalVariableExpression(variable=result_variable)
- short_circuited_statements = right_prestatements + (NormalVariableReassignmentStatement(variable=result_variable, expression=right_expression),)
+ for s in argument_prestatements:
+ prestatements.append(s)
- if expression.operator == 'and':
- if_else_statement = NormalIfElseStatement(
- condition_expression=condition_expression,
- if_statements=short_circuited_statements,
- else_statements=(),
+ prestatements.append(
+ NormalPushStatement(
+ expression=normalized_argument,
+ ),
)
- elif expression.operator == 'or':
- if_else_statement = NormalIfElseStatement(
- condition_expression=condition_expression,
- if_statements=(),
- else_statements=short_circuited_statements,
- )
+ counter, function_prestatements, function_expression = normalize_expression(
+ counter,
+ expression.function,
+ )
- else:
- raise Exception('Unable to handle operator "{}"'.format(expression.operator))
+ for ps in function_prestatements:
+ prestatements.append(ps)
return (
counter,
- left_prestatements + (if_else_prestatment, if_else_statement),
- NormalVariableExpression(variable=result_variable),
+ tuple(prestatements),
+ NormalFunctionCallExpression(
+ metadata=expression.metadata,
+ function_expression=function_expression,
+ argument_count=len(expression.argument_list),
+ ),
)
+def normalize_if_expression(counter, expression):
+ counter, condition_prestatements, condition_expression = normalize_expression(
+ counter,
+ expression.condition_expression,
+ )
-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_negation_expression(counter, expression):
- counter, prestatements, internal_expression = normalize_expression(counter, expression.value)
-
- internal_variable = '${}'.format(counter)
- counter += 1
+ counter, if_statement_list = normalize_statement_list(
+ counter,
+ expression.if_statement_list,
+ )
+ counter, else_statement_list = normalize_statement_list(
+ counter,
+ expression.else_statement_list,
+ )
return (
counter,
- prestatements + (NormalVariableInitializationStatement(variable=internal_variable, expression=internal_expression),),
- NormalNegationExpression(internal_expression=NormalVariableExpression(variable=internal_variable)),
+ condition_prestatements,
+ NormalIfElseExpression(
+ condition_expression=condition_expression,
+ if_statement_list=if_statement_list,
+ else_statement_list=else_statement_list,
+ ),
)
-def normalize_parenthesized_expression(counter, expression):
- return normalize_expression(counter, expression.internal)
-
def normalize_expression(counter, expression):
return {
- NormalInfixExpression: fake_normalization,
- NormalVariableExpression: fake_normalization,
- parsing.FurFunctionCallExpression: normalize_function_call_expression,
- parsing.FurInfixExpression: normalize_infix_expression,
- parsing.FurIntegerLiteralExpression: fake_normalization,
- parsing.FurNegationExpression: normalize_negation_expression,
- parsing.FurParenthesizedExpression: normalize_parenthesized_expression,
- parsing.FurStringLiteralExpression: fake_normalization,
- parsing.FurSymbolExpression: fake_normalization,
+ desugaring.DesugaredBuiltinExpression: normalize_builtin_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,
+ desugaring.DesugaredSymbolLiteralExpression: normalize_symbol_literal_expression,
}[type(expression)](counter, expression)
def normalize_expression_statement(counter, statement):
- counter, prestatements, normalized = {
- parsing.FurFunctionCallExpression: normalize_function_call_expression,
- parsing.FurIntegerLiteralExpression: normalize_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,
NormalExpressionStatement(expression=normalized),
)
-def normalize_function_definition_statement(counter, statement):
+def normalize_assignment_statement(counter, statement):
+ counter, prestatements, normalized_expression = normalize_expression(counter, statement.expression)
return (
counter,
- (),
- NormalFunctionDefinitionStatement(
- name=statement.name,
- statement_list=normalize_statement_list(statement.statement_list),
+ prestatements,
+ NormalAssignmentStatement(
+ target=statement.target,
+ expression=normalized_expression,
),
)
def normalize_statement(counter, statement):
return {
- parsing.FurAssignmentStatement: fake_normalization, # TODO unfake this
- 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)
-def normalize_statement_list(statement_list):
- counter = 0
+def normalize_statement_list(counter, statement_list):
+ result_statement_list = []
for statement in statement_list:
counter, prestatements, normalized = normalize_statement(counter, statement)
for s in prestatements:
- yield s
- yield normalized
+ result_statement_list.append(s)
+ result_statement_list.append(normalized)
+
+ return (
+ counter,
+ result_statement_list,
+ )
def normalize(program):
+ _, statement_list = normalize_statement_list(0, program.statement_list)
return NormalProgram(
- statement_list=normalize_statement_list(program.statement_list),
+ statement_list=statement_list,
)
projects / fur / blobdiff