Implemented some enhancement requests
This commit is contained in:
@@ -2,16 +2,16 @@ from core.builtin_concepts import BuiltinConcepts
|
||||
from core.rule import Rule, ACTION_TYPE_DEFERRED
|
||||
from core.sheerka.services.SheerkaExecute import ParserInput
|
||||
from core.tokenizer import TokenKind
|
||||
from parsers.BaseParser import BaseParser, ErrorNode, UnexpectedTokenErrorNode
|
||||
from parsers.BaseParser import BaseParser, ParsingError, UnexpectedTokenParsingError
|
||||
|
||||
|
||||
class RuleNotFound(ErrorNode):
|
||||
class RuleNotFoundError(ParsingError):
|
||||
def __init__(self, id_as_tuple):
|
||||
self.key = id_as_tuple[0]
|
||||
self.id = id_as_tuple[1]
|
||||
|
||||
def __repr__(self):
|
||||
return f"RuleNotFound(id={self.id}, key={self.key}"
|
||||
return f"RuleNotFoundError(id={self.id}, key={self.key}"
|
||||
|
||||
|
||||
class RuleParser(BaseParser):
|
||||
@@ -54,9 +54,9 @@ class RuleParser(BaseParser):
|
||||
token = parser_input.token
|
||||
|
||||
if parser_input.next_token():
|
||||
reason = UnexpectedTokenErrorNode("Only one rule supported",
|
||||
parser_input.token,
|
||||
[TokenKind.EOF])
|
||||
reason = UnexpectedTokenParsingError("Only one rule supported",
|
||||
parser_input.token,
|
||||
[TokenKind.EOF])
|
||||
return sheerka.ret(self.name,
|
||||
False,
|
||||
sheerka.new(BuiltinConcepts.NOT_FOR_ME, body=parser_input.as_text(), reason=reason))
|
||||
@@ -76,7 +76,7 @@ class RuleParser(BaseParser):
|
||||
return sheerka.ret(self.name,
|
||||
False,
|
||||
sheerka.new(BuiltinConcepts.ERROR,
|
||||
body=[RuleNotFound(token.value)]))
|
||||
body=[RuleNotFoundError(token.value)]))
|
||||
body = sheerka.new(BuiltinConcepts.PARSER_RESULT,
|
||||
parser=self,
|
||||
source=parser_input.as_text(),
|
||||
|
||||
Reference in New Issue
Block a user