Implemented some enhancement requests
This commit is contained in:
@@ -7,7 +7,7 @@ from core.sheerka.services.SheerkaExecute import ParserInput
|
||||
from core.tokenizer import Tokenizer, TokenKind
|
||||
from core.utils import strip_tokens, make_unique
|
||||
from parsers.BaseNodeParser import BaseNodeParser, ConceptNode, UnrecognizedTokensNode, SourceCodeNode
|
||||
from parsers.BaseParser import UnexpectedTokenErrorNode, ErrorNode
|
||||
from parsers.BaseParser import UnexpectedTokenParsingError, ParsingError
|
||||
from parsers.BnfNodeParser import BnfNodeParser
|
||||
from parsers.SyaNodeParser import SyaNodeParser
|
||||
|
||||
@@ -15,14 +15,14 @@ PARSERS = [BnfNodeParser.NAME, SyaNodeParser.NAME, "Python"]
|
||||
|
||||
|
||||
@dataclass()
|
||||
class TokensNodeFound(ErrorNode):
|
||||
class TokensNodeFoundError(ParsingError):
|
||||
expected_tokens: list
|
||||
|
||||
def __eq__(self, other):
|
||||
if id(other) == id(self):
|
||||
return True
|
||||
|
||||
if not isinstance(other, UnexpectedTokenErrorNode):
|
||||
if not isinstance(other, UnexpectedTokenParsingError):
|
||||
return False
|
||||
|
||||
if self.message != other.message:
|
||||
@@ -96,7 +96,7 @@ class AtomConceptParserHelper:
|
||||
self.debug.append(token)
|
||||
|
||||
if self.expected_tokens[0] != token.strip_quote:
|
||||
self.errors.append(UnexpectedTokenErrorNode(
|
||||
self.errors.append(UnexpectedTokenParsingError(
|
||||
f"Found '{token}' while expecting '{self.expected_tokens[0]}'",
|
||||
token,
|
||||
[self.expected_tokens[0]]))
|
||||
@@ -186,7 +186,7 @@ class AtomConceptParserHelper:
|
||||
forked.finalize()
|
||||
|
||||
if self.expected_tokens:
|
||||
self.errors.append(TokensNodeFound(self.expected_tokens))
|
||||
self.errors.append(TokensNodeFoundError(self.expected_tokens))
|
||||
|
||||
def clone(self):
|
||||
clone = AtomConceptParserHelper(self.context)
|
||||
|
||||
Reference in New Issue
Block a user