From f4598735744d343172b853148fb181497ea550c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= Date: Fri, 12 Jul 2019 00:18:53 +0200 Subject: [PATCH] Rename terminalParser() to terminal() --- smnp/ast/node/atom.py | 14 +++++++------- smnp/ast/node/block.py | 4 ++-- smnp/ast/node/condition.py | 14 +++++++------- smnp/ast/node/expression.py | 4 ++-- smnp/ast/node/factor.py | 8 ++++---- smnp/ast/node/function.py | 4 ++-- smnp/ast/node/identifier.py | 4 ++-- smnp/ast/node/imports.py | 2 +- smnp/ast/node/iterable.py | 10 +++++----- smnp/ast/node/map.py | 2 +- smnp/ast/parser.py | 4 ++-- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/smnp/ast/node/atom.py b/smnp/ast/node/atom.py index 6f827aa..45fdff0 100644 --- a/smnp/ast/node/atom.py +++ b/smnp/ast/node/atom.py @@ -45,10 +45,10 @@ class TypeLiteral(Atom): def IntegerParser(input): return Parser.oneOf( - Parser.terminalParser(TokenType.INTEGER, lambda val, pos: IntegerLiteral.withValue(int(val), pos)), + Parser.terminal(TokenType.INTEGER, lambda val, pos: IntegerLiteral.withValue(int(val), pos)), Parser.allOf( - Parser.terminalParser(TokenType.MINUS), - Parser.terminalParser(TokenType.INTEGER, lambda val, pos: IntegerLiteral.withValue(int(val), pos)), + Parser.terminal(TokenType.MINUS), + Parser.terminal(TokenType.INTEGER, lambda val, pos: IntegerLiteral.withValue(int(val), pos)), createNode=lambda minus, integer: IntegerLiteral.withValue(-integer.value, minus.pos), name="negative integer" ) @@ -56,19 +56,19 @@ def IntegerParser(input): def StringParser(input): - return Parser.terminalParser(TokenType.STRING, createNode=StringLiteral.withValue)(input) + return Parser.terminal(TokenType.STRING, createNode=StringLiteral.withValue)(input) def NoteParser(input): - return Parser.terminalParser(TokenType.NOTE, createNode=NoteLiteral.withValue)(input) + return Parser.terminal(TokenType.NOTE, createNode=NoteLiteral.withValue)(input) def BoolParser(input): - return Parser.terminalParser(TokenType.BOOL, createNode=BoolLiteral.withValue)(input) + return Parser.terminal(TokenType.BOOL, createNode=BoolLiteral.withValue)(input) def TypeLiteralParser(input): - return Parser.terminalParser(TokenType.TYPE, createNode=TypeLiteral.withValue)(input) + return Parser.terminal(TokenType.TYPE, createNode=TypeLiteral.withValue)(input) def LiteralParser(input): diff --git a/smnp/ast/node/block.py b/smnp/ast/node/block.py index d5cf6e9..4ade903 100644 --- a/smnp/ast/node/block.py +++ b/smnp/ast/node/block.py @@ -10,8 +10,8 @@ class Block(Node): def BlockParser(input): return Parser.loop( - Parser.terminalParser(TokenType.OPEN_CURLY), + Parser.terminal(TokenType.OPEN_CURLY), Parser.doAssert(StatementParser, f"statement or '{TokenType.CLOSE_CURLY.key}'"), - Parser.terminalParser(TokenType.CLOSE_CURLY), + Parser.terminal(TokenType.CLOSE_CURLY), createNode=lambda open, statements, close: Block.withChildren(statements, open.pos) )(input) diff --git a/smnp/ast/node/condition.py b/smnp/ast/node/condition.py index fcb05e4..5621839 100644 --- a/smnp/ast/node/condition.py +++ b/smnp/ast/node/condition.py @@ -46,22 +46,22 @@ class IfElse(Node): def IfElseStatementParser(input): ifStatementParser = Parser.allOf( - Parser.terminalParser(TokenType.IF), - Parser.terminalParser(TokenType.OPEN_PAREN), + Parser.terminal(TokenType.IF), + Parser.terminal(TokenType.OPEN_PAREN), ExpressionParser, - Parser.terminalParser(TokenType.CLOSE_PAREN), + Parser.terminal(TokenType.CLOSE_PAREN), StatementParser, createNode=lambda _, __, condition, ___, ifStatement: IfElse.createNode(ifStatement, condition), name="if statement" ) ifElseStatementParser = Parser.allOf( - Parser.terminalParser(TokenType.IF), - Parser.terminalParser(TokenType.OPEN_PAREN), + Parser.terminal(TokenType.IF), + Parser.terminal(TokenType.OPEN_PAREN), ExpressionParser, - Parser.terminalParser(TokenType.CLOSE_PAREN), + Parser.terminal(TokenType.CLOSE_PAREN), StatementParser, - Parser.terminalParser(TokenType.ELSE), + Parser.terminal(TokenType.ELSE), StatementParser, createNode=lambda _, __, condition, ___, ifStatement, ____, elseStatement: IfElse.createNode(ifStatement, condition, elseStatement), name="if-else statement" diff --git a/smnp/ast/node/expression.py b/smnp/ast/node/expression.py index 7c6e511..33420b1 100644 --- a/smnp/ast/node/expression.py +++ b/smnp/ast/node/expression.py @@ -44,9 +44,9 @@ def ExpressionParser(input): ifElseExpression = Parser.allOf( expr4, - Parser.terminalParser(TokenType.IF), + Parser.terminal(TokenType.IF), expr4, - Parser.terminalParser(TokenType.ELSE), + Parser.terminal(TokenType.ELSE), expr4, createNode=lambda ifNode, _, condition, __, elseNode: IfElse.createNode(ifNode, condition, elseNode) ) diff --git a/smnp/ast/node/factor.py b/smnp/ast/node/factor.py index e2166e3..bbea8b0 100644 --- a/smnp/ast/node/factor.py +++ b/smnp/ast/node/factor.py @@ -29,9 +29,9 @@ def FactorParser(input): ) exprFactor = Parser.allOf( - Parser.terminalParser(TokenType.OPEN_PAREN), + Parser.terminal(TokenType.OPEN_PAREN), ExpressionParser, - Parser.terminalParser(TokenType.CLOSE_PAREN), + Parser.terminal(TokenType.CLOSE_PAREN), createNode=lambda open, expr, close: expr, name="grouping parentheses" ) @@ -43,7 +43,7 @@ def FactorParser(input): ) notOperator = Parser.allOf( - Parser.terminalParser(TokenType.NOT, Operator.withValue), + Parser.terminal(TokenType.NOT, Operator.withValue), factorParser, createNode=NotOperator.withValues, name="not" @@ -51,7 +51,7 @@ def FactorParser(input): loopFactor = Parser.allOf( factorParser, - Parser.terminalParser(TokenType.DASH, createNode=Operator.withValue), + Parser.terminal(TokenType.DASH, createNode=Operator.withValue), StatementParser, createNode=Loop.withValues, name="dash-loop" diff --git a/smnp/ast/node/function.py b/smnp/ast/node/function.py index ea0b9b6..2fe0edd 100644 --- a/smnp/ast/node/function.py +++ b/smnp/ast/node/function.py @@ -102,7 +102,7 @@ def ArgumentParser(input): return Parser.allOf( Parser.optional(TypeParser), IdentifierLiteralParser, - Parser.optional(Parser.terminalParser(TokenType.DOTS, lambda val, pos: True)), + Parser.optional(Parser.terminal(TokenType.DOTS, lambda val, pos: True)), createNode=createNode, name="function argument" )(input) @@ -119,7 +119,7 @@ def ArgumentsDeclarationParser(input): def FunctionDefinitionParser(input): return Parser.allOf( - Parser.terminalParser(TokenType.FUNCTION), + Parser.terminal(TokenType.FUNCTION), IdentifierLiteralParser, ArgumentsDeclarationParser, BlockParser, diff --git a/smnp/ast/node/identifier.py b/smnp/ast/node/identifier.py index f01f86f..6bd7da1 100644 --- a/smnp/ast/node/identifier.py +++ b/smnp/ast/node/identifier.py @@ -50,7 +50,7 @@ class Assignment(BinaryOperator): def IdentifierLiteralParser(input): - return Parser.terminalParser(TokenType.IDENTIFIER, createNode=Identifier.withValue)(input) + return Parser.terminal(TokenType.IDENTIFIER, createNode=Identifier.withValue)(input) def IdentifierParser(input): @@ -64,7 +64,7 @@ def IdentifierParser(input): assignmentParser = Parser.allOf( IdentifierLiteralParser, - Parser.terminalParser(TokenType.ASSIGN, createNode=Operator.withValue), + Parser.terminal(TokenType.ASSIGN, createNode=Operator.withValue), ExpressionParser, createNode=lambda identifier, assign, expr: Assignment.withValues(identifier, assign, expr) ) diff --git a/smnp/ast/node/imports.py b/smnp/ast/node/imports.py index ce8576c..237cbee 100644 --- a/smnp/ast/node/imports.py +++ b/smnp/ast/node/imports.py @@ -34,7 +34,7 @@ class Import(Node): def ImportParser(input): return Parser.allOf( - Parser.terminalParser(TokenType.IMPORT), + Parser.terminal(TokenType.IMPORT), StringParser, createNode=lambda imp, source: Import.withValue(source), name="import" diff --git a/smnp/ast/node/iterable.py b/smnp/ast/node/iterable.py index a7d6ba3..031510b 100644 --- a/smnp/ast/node/iterable.py +++ b/smnp/ast/node/iterable.py @@ -45,8 +45,8 @@ def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, item return node return Parser.allOf( - Parser.terminalParser(openTokenType), - Parser.terminalParser(closeTokenType), + Parser.terminal(openTokenType), + Parser.terminal(closeTokenType), createNode=createNode )(input) @@ -58,7 +58,7 @@ def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, item return node return Parser.allOf( - Parser.terminalParser(openTokenType), + Parser.terminal(openTokenType), itemParser, abstractIterableTailParser, createNode=createNode @@ -78,14 +78,14 @@ def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, item return node return Parser.allOf( - Parser.terminalParser(TokenType.COMMA, doAssert=True), + Parser.terminal(TokenType.COMMA, doAssert=True), itemParser, abstractIterableTailParser, createNode=createNode )(input) def closeIterable(input): - return Parser.terminalParser(closeTokenType)(input) + return Parser.terminal(closeTokenType)(input) return toFlatDesiredNode(iterableNodeType, abstractIterableParser) diff --git a/smnp/ast/node/map.py b/smnp/ast/node/map.py index 2341937..d96182e 100644 --- a/smnp/ast/node/map.py +++ b/smnp/ast/node/map.py @@ -36,7 +36,7 @@ def MapParser(input): mapEntryParser = Parser.allOf( keyParser, - Parser.terminalParser(TokenType.ARROW, createNode=Operator.withValue), + Parser.terminal(TokenType.ARROW, createNode=Operator.withValue), valueParser, createNode=MapEntry.withValues ) diff --git a/smnp/ast/parser.py b/smnp/ast/parser.py index 802700b..202d75e 100644 --- a/smnp/ast/parser.py +++ b/smnp/ast/parser.py @@ -41,7 +41,7 @@ class Parser: # a -> A @staticmethod - def terminalParser(expectedType, createNode=None, doAssert=False): + def terminal(expectedType, createNode=None, doAssert=False): def provideNode(value, pos): if createNode is None: return IgnoredNode(pos) @@ -140,7 +140,7 @@ class Parser: @staticmethod def oneOfTerminals(*tokenTypes, createNode=None): - return Parser.oneOf(*[ Parser.terminalParser(expectedType, createNode=createNode) for expectedType in tokenTypes ], name='|'.join([t.value for t in tokenTypes])) + return Parser.oneOf(*[Parser.terminal(expectedType, createNode=createNode) for expectedType in tokenTypes], name='|'.join([t.value for t in tokenTypes])) # loop -> start item* end @staticmethod