germax26/python-plus-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make imports expect a string, not an expression

Browse Source
This commit is contained in:
germax26 2024-08-12 00:16:13 +10:00
parent 0dbc46bf9c
commit dd3b933e03
Signed by: germax26
SSH Key Fingerprint: SHA256:N3w+8798IMWBt7SYH8G1C0iJlIa2HIIcRCXwILT5FvM
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ppp_ast.py
View File

@ -518,7 +518,7 @@ class ForLoop(Statement):
@dataclass @dataclass
class Import(Statement): class Import(Statement):
file: Expression file: str
@dataclass @dataclass
class TypeDefinition(Statement): class TypeDefinition(Statement):

10
ppp_interpreter.py
View File

@ -554,14 +554,12 @@ def interpret_statements(statements: List_[Statement], program: ProgramState) ->
case _: assert False, ("Unimplemented", return_value) case _: assert False, ("Unimplemented", return_value)
case ContinueStatement(): return ContinueResult() case ContinueStatement(): return ContinueResult()
case BreakStatement(): return BreakResult() case BreakStatement(): return BreakResult()
case Import(file_): case Import(file):
# TODO: Maybe an inclusion system within a preprocessor maybe # TODO: Maybe an inclusion system within a preprocessor maybe
file = calculate_expression(file_, program) module = interpret_file(file, program.modules) if file not in program.modules else program.modules[file]
assert isinstance(file, Str), "Only strings are valid file paths!"
module = interpret_file(file.str, program.modules) if file.str not in program.modules else program.modules[file.str]
program.contexts[0] |= module program.contexts[0] |= module
if file.str not in program.modules: if file not in program.modules:
program.modules[file.str] = module program.modules[file] = module
case TypeDefinition(name, expression_): case TypeDefinition(name, expression_):
program.declare_and_assign_variable(name, TypeObject(calculate_type_expression(expression_, program))) program.declare_and_assign_variable(name, TypeObject(calculate_type_expression(expression_, program)))
case DeferStatement(statement=statement): case DeferStatement(statement=statement):

2
ppp_parser.py
View File

@ -329,7 +329,7 @@ def parse_statement(lexer: Lexer) -> Statement:
body = parse_statement(lexer) body = parse_statement(lexer)
return ForLoop(variable, expression, body) return ForLoop(variable, expression, body)
elif lexer.take_token(KeywordToken(Keyword.Import)): elif lexer.take_token(KeywordToken(Keyword.Import)):
file = parse_expression(lexer) file = parse_string(lexer)
lexer.assert_token(SymbolToken(Symbol.Semicolon)) lexer.assert_token(SymbolToken(Symbol.Semicolon))
return Import(file) return Import(file)
elif lexer.take_token(KeywordToken(Keyword.Type)): elif lexer.take_token(KeywordToken(Keyword.Type)):