Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions examples/exponent.not
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
PRINT "Enter first number"
INPUT a
PRINT "Enter second number"
INPUT b

LET c = a**b

PRINT c
Binary file modified language/__pycache__/constants.cpython-310.pyc
Binary file not shown.
Binary file modified language/__pycache__/emitter.cpython-310.pyc
Binary file not shown.
Binary file modified language/__pycache__/lexer.cpython-310.pyc
Binary file not shown.
Binary file modified language/__pycache__/parser.cpython-310.pyc
Binary file not shown.
3 changes: 2 additions & 1 deletion language/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class TokenType(enum.Enum):
GT = 210
GTEQ = 211
MODULO = 212
EXP = 213
# Brackets.
LPAREN = 301
RPAREN = 302
Expand All @@ -40,4 +41,4 @@ class TokenType(enum.Enum):

COMPARISON_TOKENS = [
TokenType.EQEQ, TokenType.NOTEQ, TokenType.LT, TokenType.LTEQ, TokenType.GT, TokenType.GTEQ
]
]
Binary file modified language/errors/__pycache__/lexing_error.cpython-310.pyc
Binary file not shown.
Binary file modified language/errors/__pycache__/parseing_error.cpython-310.pyc
Binary file not shown.
16 changes: 15 additions & 1 deletion language/lexer.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,17 @@ def parse_operators(self):
elif self.curChar == '-':
return(Token(self.curChar, TokenType.MINUS))
elif self.curChar == '*':
return(Token(self.curChar, TokenType.ASTERISK))
# Check whether this token is * or **
if self.peek() == '*':
lastChar = self.curChar
self.next_char()
return (Token(lastChar + self.curChar, TokenType.EXP))
else:
return(Token(self.curChar, TokenType.ASTERISK))
elif self.curChar == '/':
return(Token(self.curChar, TokenType.SLASH))
elif self.curChar == '**':
return(Token(self.curChar, TokenType.EXP))
elif self.curChar == '%':
return(Token(self.curChar, TokenType.MODULO))
elif self.curChar == '=':
Expand Down Expand Up @@ -155,6 +163,12 @@ def get_token(self) -> Token:

token = (self.parse_special_symbols() or self.parse_operators() or
self.parse_literals() or self.parse_brackets())

if self.curChar == '*':
self.next_char()
if self.curChar == '*':
self.next_char()
return Token(TokenType.EXP, "**")

if token is None:
raise UnknownTokenError(self.curChar, self.curPos)
Expand Down
14 changes: 11 additions & 3 deletions language/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,23 @@ def term(self):
self.unary()

while self.check_token(TokenType.ASTERISK) or self.check_token(TokenType.SLASH) or \
self.check_token(TokenType.MODULO):
self.check_token(TokenType.MODULO) or self.check_token(TokenType.EXP):
self.emitter.emit(self.cur_token.text)

if self.check_token(TokenType.EXP):
self.emitter.emit("**") # Use the ** operator for exponentiation
else:
self.emitter.emit(self.cur_token.text)
self.next_token()

if self.check_token(TokenType.MODULO):
self.emitter.emit("(int)")

self.next_token()
self.unary()

if self.check_token(TokenType.EXP):
self.emitter.emit(")")

def expression(self):
self.term()
while self.check_token(TokenType.PLUS) or self.check_token(TokenType.MINUS):
Expand Down Expand Up @@ -220,4 +228,4 @@ def program(self):
self.emitter.emit_line("return 0;")
self.emitter.emit_line("}")

self.emitter.write_file()
self.emitter.write_file()