projects
/
fur
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start implementing functions
[fur]
/
conversion.py
diff --git
a/conversion.py
b/conversion.py
index
b71e834
..
29a40d7
100644
(file)
--- a/
conversion.py
+++ b/
conversion.py
@@
-2,6
+2,13
@@
import collections
import normalization
import normalization
+CPSBuiltinExpression = collections.namedtuple(
+ 'CPSBuiltinExpression',
+ (
+ 'symbol',
+ ),
+)
+
CPSFunctionCallExpression = collections.namedtuple(
'CPSFunctionCallExpression',
(
CPSFunctionCallExpression = collections.namedtuple(
'CPSFunctionCallExpression',
(
@@
-45,8
+52,6
@@
CPSStructureLiteralExpression = collections.namedtuple(
'CPSStructureLiteralExpression',
(
'field_count',
'CPSStructureLiteralExpression',
(
'field_count',
- 'symbol_list_variable',
- 'value_list_variable',
),
)
),
)
@@
-57,6
+62,13
@@
CPSSymbolExpression = collections.namedtuple(
),
)
),
)
+CPSSymbolLiteralExpression = collections.namedtuple(
+ 'CPSSymbolLiteralExpression',
+ (
+ 'symbol',
+ ),
+)
+
CPSVariableExpression = collections.namedtuple(
'CPSVariableExpression',
(
CPSVariableExpression = collections.namedtuple(
'CPSVariableExpression',
(
@@
-96,14
+108,6
@@
CPSIfElseExpression = collections.namedtuple(
),
)
),
)
-CPSListAppendStatement = collections.namedtuple(
- 'CPSListAppendStatement',
- (
- 'list_expression',
- 'item_expression',
- ),
-)
-
CPSPushStatement = collections.namedtuple(
'CPSPushStatement',
(
CPSPushStatement = collections.namedtuple(
'CPSPushStatement',
(
@@
-134,6
+138,9
@@
CPSProgram = collections.namedtuple(
),
)
),
)
+def convert_builtin_expression(expression):
+ return CPSBuiltinExpression(symbol=expression.symbol)
+
def convert_function_call_expression(expression):
return CPSFunctionCallExpression(
metadata=expression.metadata,
def convert_function_call_expression(expression):
return CPSFunctionCallExpression(
metadata=expression.metadata,
@@
-160,18
+167,20
@@
def convert_string_literal_expression(expression):
def convert_structure_literal_expression(expression):
return CPSStructureLiteralExpression(
field_count=expression.field_count,
def convert_structure_literal_expression(expression):
return CPSStructureLiteralExpression(
field_count=expression.field_count,
- symbol_list_variable=expression.symbol_list_variable,
- value_list_variable=expression.value_list_variable,
)
def convert_symbol_expression(expression):
return CPSSymbolExpression(symbol=expression.symbol)
)
def convert_symbol_expression(expression):
return CPSSymbolExpression(symbol=expression.symbol)
+def convert_symbol_literal_expression(expression):
+ return CPSSymbolLiteralExpression(symbol=expression.symbol)
+
def convert_variable_expression(expression):
return CPSVariableExpression(variable=expression.variable)
def convert_expression(expression):
return {
def convert_variable_expression(expression):
return CPSVariableExpression(variable=expression.variable)
def convert_expression(expression):
return {
+ normalization.NormalBuiltinExpression: convert_builtin_expression,
normalization.NormalFunctionCallExpression: convert_function_call_expression,
normalization.NormalIfElseExpression: convert_if_else_expression,
normalization.NormalIntegerLiteralExpression: convert_integer_literal_expression,
normalization.NormalFunctionCallExpression: convert_function_call_expression,
normalization.NormalIfElseExpression: convert_if_else_expression,
normalization.NormalIntegerLiteralExpression: convert_integer_literal_expression,
@@
-180,15
+189,10
@@
def convert_expression(expression):
normalization.NormalStringLiteralExpression: convert_string_literal_expression,
normalization.NormalStructureLiteralExpression: convert_structure_literal_expression,
normalization.NormalSymbolExpression: convert_symbol_expression,
normalization.NormalStringLiteralExpression: convert_string_literal_expression,
normalization.NormalStructureLiteralExpression: convert_structure_literal_expression,
normalization.NormalSymbolExpression: convert_symbol_expression,
+ normalization.NormalSymbolLiteralExpression: convert_symbol_literal_expression,
normalization.NormalVariableExpression: convert_variable_expression,
}[type(expression)](expression)
normalization.NormalVariableExpression: convert_variable_expression,
}[type(expression)](expression)
-def convert_array_variable_initialization_statement(statement):
- return CPSArrayVariableInitializationStatement(
- variable=statement.variable,
- items=tuple(convert_expression(e) for e in statement.items),
- )
-
def convert_assignment_statement(statement):
return CPSAssignmentStatement(
target=statement.target,
def convert_assignment_statement(statement):
return CPSAssignmentStatement(
target=statement.target,
@@
-210,13
+214,6
@@
def convert_if_else_expression(statement):
else_statement_list=else_statement_list,
)
else_statement_list=else_statement_list,
)
-def convert_list_append_statement(statement):
- return CPSListAppendStatement(
- list_expression=convert_expression(statement.list_expression),
- item_expression=convert_expression(statement.item_expression),
- )
-
-
def convert_push_statement(statement):
return CPSPushStatement(
expression=convert_expression(statement.expression),
def convert_push_statement(statement):
return CPSPushStatement(
expression=convert_expression(statement.expression),
@@
-228,21
+225,12
@@
def convert_variable_initialization_statement(statement):
expression=convert_expression(statement.expression),
)
expression=convert_expression(statement.expression),
)
-def convert_symbol_array_variable_initialization_statement(statement):
- return CPSSymbolArrayVariableInitializationStatement(
- variable=statement.variable,
- symbol_list=statement.symbol_list,
- )
-
def convert_statement(statement):
return {
def convert_statement(statement):
return {
- normalization.NormalArrayVariableInitializationStatement: convert_array_variable_initialization_statement,
normalization.NormalAssignmentStatement: convert_assignment_statement,
normalization.NormalExpressionStatement: convert_expression_statement,
normalization.NormalAssignmentStatement: convert_assignment_statement,
normalization.NormalExpressionStatement: convert_expression_statement,
- normalization.NormalListAppendStatement: convert_list_append_statement,
normalization.NormalPushStatement: convert_push_statement,
normalization.NormalVariableInitializationStatement: convert_variable_initialization_statement,
normalization.NormalPushStatement: convert_push_statement,
normalization.NormalVariableInitializationStatement: convert_variable_initialization_statement,
- normalization.NormalSymbolArrayVariableInitializationStatement: convert_symbol_array_variable_initialization_statement,
}[type(statement)](statement)
def convert_statement_list(statement_list):
}[type(statement)](statement)
def convert_statement_list(statement_list):