Skip to content

Commit

Permalink
Moved to cython syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
@overfl0
overfl0 committed May 10, 2023
1 parent 563f37e commit 6f4244a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 55 deletions.
74 changes: 21 additions & 53 deletions armaclass/parser.py → armaclass/parser.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,21 @@ class ParseError(RuntimeError):
pass


@cython.cclass
class Parser:
cdef class Parser:
currentPosition: cython.Py_ssize_t
input_string: cython.p_char
input_string_len: cython.Py_ssize_t
translations: dict

@cython.cfunc
def ensure(self, condition: cython.bint, message='Error'):
if condition:
return

raise ParseError('{} at position {}. Before: {}'.format(
message, self.currentPosition, self.input_string[self.currentPosition:self.currentPosition + 50]))

@cython.cfunc
@cython.inline
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.exceptval(check=False)
def detectComment(self) -> cython.void:
cdef inline void detectComment(self) noexcept:
indexCommentEnd: cython.Py_ssize_t
indexOfLinefeed: cython.Py_ssize_t

Expand All @@ -84,43 +78,33 @@ def detectComment(self) -> cython.void:
indexCommentEnd = self.input_string.find(END_COMMENT_U, self.currentPosition)
self.currentPosition = self.input_string_len if indexCommentEnd == -1 else indexCommentEnd + 2

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def next(self) -> cython.char:
cdef inline char next(self) noexcept:
self.currentPosition += 1
self.detectComment()
return self.current()

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def nextWithoutCommentDetection(self) -> cython.void:
cdef inline void nextWithoutCommentDetection(self) noexcept:
self.currentPosition += 1

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def current(self) -> cython.char:
cdef inline char current(self) noexcept:
if self.currentPosition >= self.input_string_len:
return -1

return self.input_string[self.currentPosition]

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def weHaveADoubleQuote(self) -> cython.bint:
cdef inline bint weHaveADoubleQuote(self) noexcept:
if self.input_string_len >= self.currentPosition + 2 and \
self.input_string[self.currentPosition] == QUOTE and \
self.input_string[self.currentPosition + 1] == QUOTE:
return True
return False

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def weHaveAStringLineBreak(self) -> cython.bint:
cdef inline bint weHaveAStringLineBreak(self) noexcept:
if (
self.input_string_len >= self.currentPosition + 6 and
self.input_string[self.currentPosition] == QUOTE and
Expand All @@ -133,17 +117,13 @@ def weHaveAStringLineBreak(self) -> cython.bint:
return True
return False

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def forwardToNextQuote(self) -> cython.void:
cdef inline void forwardToNextQuote(self) noexcept:
self.currentPosition = self.input_string.find(QUOTE_U, self.currentPosition + 1)
if self.currentPosition == -1:
self.currentPosition = self.input_string_len

@cython.cfunc
@cython.inline
def parseString(self) -> cython.unicode:
cdef inline unicode parseString(self):
result: vector[cython.char]
if not cython.compiled:
result = vector()
Expand Down Expand Up @@ -174,9 +154,8 @@ def parseString(self) -> cython.unicode:

return PyUnicode_DecodeUTF8(result.data(), result.size(), 'surrogateescape')

@cython.cfunc
@cython.exceptval(check=False)
def guessExpression(self, s: cython.bytes):
cdef guessExpression(self, s: cython.bytes) noexcept:
s_len: cython.Py_ssize_t
s = s.strip()
slen = len(s)
Expand All @@ -198,9 +177,8 @@ def guessExpression(self, s: cython.bytes):
except ValueError:
return PyUnicode_DecodeUTF8(PyBytes_AS_STRING(s), PyBytes_GET_SIZE(s), 'surrogateescape')

@cython.cfunc
@cython.exceptval(check=False)
def parseUnknownExpression(self):
cdef parseUnknownExpression(self) noexcept:
pos: cython.Py_ssize_t
c: cython.char

Expand All @@ -221,7 +199,7 @@ def parseUnknownExpression(self):
return self.guessExpression(expression)

@cython.cfunc
def parseNonArrayPropertyValue(self):
cdef parseNonArrayPropertyValue(self):
current: cython.char = self.current()
if current == CURLY_OPEN:
return self.parseArray()
Expand All @@ -232,14 +210,11 @@ def parseNonArrayPropertyValue(self):
else:
return self.parseUnknownExpression()

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def isValidVarnameChar(self, c: cython.char) -> cython.bint:
cdef inline bint isValidVarnameChar(self, c: cython.char) noexcept:
return c in b'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.\\'

@cython.cfunc
def parsePropertyName(self) -> cython.bytes:
cdef bytes parsePropertyName(self):
start: cython.Py_ssize_t = self.currentPosition
stop: cython.Py_ssize_t = self.currentPosition + 1

Expand All @@ -252,8 +227,7 @@ def parsePropertyName(self) -> cython.bytes:

return self.input_string[start:stop]

@cython.cfunc
def parseClassValue(self):
cdef parseClassValue(self):
result: dict = {}

self.ensure(self.current() == CURLY_OPEN)
Expand All @@ -268,8 +242,7 @@ def parseClassValue(self):

return result

@cython.cfunc
def parseArray(self):
cdef parseArray(self):
result = []
self.ensure(self.current() == CURLY_OPEN)
self.next()
Expand All @@ -288,26 +261,21 @@ def parseArray(self):
self.next()
return result

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def parseWhitespace(self) -> cython.void:
cdef inline void parseWhitespace(self) noexcept:
while self.isWhitespace():
self.next()

@cython.cfunc
@cython.inline
@cython.exceptval(check=False)
def isWhitespace(self) -> cython.bint:
cdef inline bint isWhitespace(self) noexcept:
c: cython.char
if self.input_string_len <= self.currentPosition:
return False

c = self.input_string[self.currentPosition]
return c in b' \t\r\n' or c < 32

@cython.cfunc
def parseProperty(self, context: dict) -> cython.void:
cdef void parseProperty(self, context: dict):
value = None
name = self.parsePropertyName()

Expand Down Expand Up @@ -380,14 +348,14 @@ def parseProperty(self, context: dict) -> cython.void:
self.next()

@cython.cfunc
def translateString(self, txt: str) -> str:
cdef str translateString(self, txt: str):
translated: str = self.translations.get(txt)
if translated is not None:
return translated
return txt

@cython.cfunc
def parseTranslationString(self):
cdef parseTranslationString(self):
result: vector[cython.char]
if not cython.compiled:
result = vector()
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
compiler_directives['linetrace'] = True

ext_modules = cythonize(
os.path.join('armaclass', 'parser.py'),
os.path.join('armaclass', 'parser.pyx'),
language_level=3,
compiler_directives=compiler_directives,
)
Expand Down
2 changes: 1 addition & 1 deletion setup_cython.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from Cython.Build import cythonize

setup(
ext_modules=cythonize(os.path.join('armaclass', 'parser.py'),
ext_modules=cythonize(os.path.join('armaclass', 'parser.pyx'),
language_level=3,
annotate=True,
),
Expand Down

0 comments on commit 6f4244a

Please sign in to comment.