- more preparation for cython usage

DHParser/error.pxd → DHParser/compile.pxd

@@ -4,11 +4,3 @@
 #cython: c_string_encoding=utf-8
 
 import cython
-
-cdef class Error:
-    cdef str message
-    cdef int _pos
-    cdef object code
-    cdef int orig_pos
-    cdef int line
-    cdef int column

DHParser/compile.py

@@ -35,7 +35,6 @@ compiler object.
 """
 
 import copy
-import os
 import re
 
 from DHParser.preprocess import strip_tokens, with_source_mapping, PreprocessorFunc

DHParser/ebnf.pxd

+#cython: infer_types=True
+#cython: language_level=3
+#cython: c_string_type=unicode
+#cython: c_string_encoding=utf-8
+
+import cython

DHParser/error.py

@@ -94,12 +94,12 @@ class Error:
         assert not isinstance(pos, ErrorCode)
         assert pos >= 0
         assert code >= 0
-        self.message = message
-        self._pos = pos
-        self.code = code
-        self.orig_pos = orig_pos
-        self.line = line
-        self.column = column
+        self.message = message    # type: str
+        self._pos = pos           # type: int
+        self.code = code          # type: ErrorCode
+        self.orig_pos = orig_pos  # type: int
+        self.line = line          # type: int
+        self.column = column      # type: int
 
     def __str__(self):
         prefix = ''

DHParser/syntaxtree.pxd

@@ -17,8 +17,12 @@ import cython
 #     pass 
 
 # cdef class Node:
-#    cdef int _pos
-#    cdef int _len
+#     cdef object errors
+#     cdef int _pos
+#     cdef object _result
+#     cdef str _content
+#     cdef int _len
+#     cdef object parser
 
 # cdef class RootNode(Node):
 #     pass

build_cython-modules.bat

+del DHParser\*.pyd
+del DHParser\*.c
 python.exe setup.py build_ext --inplace

setup.py

@@ -17,7 +17,8 @@ setup(
     packages=['DHParser'],
     ext_modules=cythonize(['DHParser/stringview.py', 'DHParser/syntaxtree.py',
                            'DHParser/parse.py', 'DHParser/transform.py',
-                           'DHParser/error.py']),
+                           'DHParser/compile.py', 'DHParser/ebnf.py'],
+                          nthreads=0, annotate=False),
     url='https://gitlab.lrz.de/badw-it/DHParser',
     license='[Apache 2.0 License](https://www.apache.org/licenses/LICENSE-2.0)',
     author='Eckhart Arnold',