projects
/
fur
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make "do" a keyword
[fur]
/
parsing.py
diff --git
a/parsing.py
b/parsing.py
index
91098f9
..
e2bd9d0
100644
(file)
--- a/
parsing.py
+++ b/
parsing.py
@@
-39,21
+39,21
@@
def _zero_or_more_parser(formatter, parser):
FurIntegerLiteralExpression = collections.namedtuple(
'FurIntegerLiteralExpression',
[
FurIntegerLiteralExpression = collections.namedtuple(
'FurIntegerLiteralExpression',
[
- '
value
',
+ '
integer
',
],
)
FurStringLiteralExpression = collections.namedtuple(
'FurStringLiteralExpression',
[
],
)
FurStringLiteralExpression = collections.namedtuple(
'FurStringLiteralExpression',
[
- '
value
',
+ '
string
',
],
)
FurSymbolExpression = collections.namedtuple(
'FurSymbolExpression',
[
],
)
FurSymbolExpression = collections.namedtuple(
'FurSymbolExpression',
[
- '
value
',
+ '
symbol
',
],
)
],
)
@@
-82,17
+82,17
@@
def _integer_literal_expression_parser(index, tokens):
value = int(tokens[index].match)
index += 1
value = int(tokens[index].match)
index += 1
- return True, index, FurIntegerLiteralExpression(
value
=value)
+ return True, index, FurIntegerLiteralExpression(
integer
=value)
def _string_literal_expression_parser(index, tokens):
if tokens[index].type == 'single_quoted_string_literal':
def _string_literal_expression_parser(index, tokens):
if tokens[index].type == 'single_quoted_string_literal':
- return (True, index + 1, FurStringLiteralExpression(
value
=tokens[index].match[1:-1]))
+ return (True, index + 1, FurStringLiteralExpression(
string
=tokens[index].match[1:-1]))
return (False, index, None)
def _symbol_expression_parser(index, tokens):
if tokens[index].type == 'symbol':
return (False, index, None)
def _symbol_expression_parser(index, tokens):
if tokens[index].type == 'symbol':
- return (True, index + 1, FurSymbolExpression(
value
=tokens[index].match))
+ return (True, index + 1, FurSymbolExpression(
symbol
=tokens[index].match))
return (False, index, None)
return (False, index, None)
@@
-399,7
+399,7
@@
def _function_definition_statement_parser(index, tokens):
tokens[index].line,
))
tokens[index].line,
))
- if tokens[index].
type == 'symbol' and tokens[index].
match == 'do':
+ if tokens[index].match == 'do':
index += 1
else:
return failure
index += 1
else:
return failure
@@
-415,7
+415,7
@@
def _function_definition_statement_parser(index, tokens):
return True, index, FurFunctionDefinitionStatement(
name=name,
return True, index, FurFunctionDefinitionStatement(
name=name,
-
argument_name_list=tuple(an.value
for an in argument_name_list),
+
argument_name_list=tuple(an.symbol
for an in argument_name_list),
statement_list=statement_list,
)
statement_list=statement_list,
)
@@
-462,7
+462,7
@@
if __name__ == '__main__':
(
True,
1,
(
True,
1,
- FurStringLiteralExpression(
value
='Hello, world'),
+ FurStringLiteralExpression(
string
='Hello, world'),
),
)
),
)
@@
-475,7
+475,7
@@
if __name__ == '__main__':
4,
FurFunctionCallExpression(
name='print',
4,
FurFunctionCallExpression(
name='print',
- arguments=(FurStringLiteralExpression(
value
='Hello, world'),),
+ arguments=(FurStringLiteralExpression(
string
='Hello, world'),),
),
),
)
),
),
)