From bc7693596d7806fefe415b396b0e35f973d50b25 Mon Sep 17 00:00:00 2001 From: Jayaram Kancherla Date: Mon, 18 Mar 2024 17:05:18 -0700 Subject: [PATCH] import all from core --- src/rds2py/__init__.py | 2 ++ src/rds2py/lib/parser.pxd | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/rds2py/__init__.py b/src/rds2py/__init__.py index 45d8b17..50203ff 100644 --- a/src/rds2py/__init__.py +++ b/src/rds2py/__init__.py @@ -15,5 +15,7 @@ finally: del version, PackageNotFoundError +from .core import * + from .generics import read_rds, save_rds from .read_atomic_vector import parse_boolean_vector, parse_double_vector, parse_integer_vector, parse_string_vector diff --git a/src/rds2py/lib/parser.pxd b/src/rds2py/lib/parser.pxd index 6a4df6c..721d481 100644 --- a/src/rds2py/lib/parser.pxd +++ b/src/rds2py/lib/parser.pxd @@ -6,24 +6,24 @@ from libcpp.vector cimport vector from libcpp.utility cimport pair cdef extern from "rds2cpp_wrapper.cpp": - uintptr_t py_parser_rds_file(string_c file) nogil except + - uintptr_t py_parser_extract_robject(int ptr) nogil except + + uintptr_t py_parser_rds_file(string_c file) except + nogil + uintptr_t py_parser_extract_robject(int ptr) except + nogil - void py_read_parsed_ptr(uintptr_t ptr) nogil except + + void py_read_parsed_ptr(uintptr_t ptr) except + nogil - string_c py_robject_extract_type(uintptr_t ptr) nogil except + - int py_robject_extract_size(uintptr_t ptr) nogil except + + string_c py_robject_extract_type(uintptr_t ptr) except + nogil + int py_robject_extract_size(uintptr_t ptr) except + nogil - uintptr_t parse_robject_int_vector(uintptr_t ptr) nogil except + - vector[string_c] parse_robject_string_vector(uintptr_t ptr) nogil except + - vector[string_c] parse_robject_attribute_names(uintptr_t ptr) nogil except + + uintptr_t parse_robject_int_vector(uintptr_t ptr) except + nogil + vector[string_c] parse_robject_string_vector(uintptr_t ptr) except + nogil + vector[string_c] parse_robject_attribute_names(uintptr_t ptr) except + nogil - int parse_robject_find_attribute(uintptr_t ptr, string_c name) nogil except + - uintptr_t parse_robject_load_attribute_by_index(uintptr_t ptr, int i) nogil except + - uintptr_t parse_robject_load_attribute_by_name(uintptr_t ptr, string_c name) nogil except + - uintptr_t parse_robject_load_vec_element(uintptr_t ptr, int i) except + + int parse_robject_find_attribute(uintptr_t ptr, string_c name) except + nogil + uintptr_t parse_robject_load_attribute_by_index(uintptr_t ptr, int i) except + nogil + uintptr_t parse_robject_load_attribute_by_name(uintptr_t ptr, string_c name) except + nogil + uintptr_t parse_robject_load_vec_element(uintptr_t ptr, int i)except + nogil - string_c parse_robject_class_name(uintptr_t ptr) nogil except + - string_c parse_robject_package_name(uintptr_t ptr) nogil except + + string_c parse_robject_class_name(uintptr_t ptr) except + nogil + string_c parse_robject_package_name(uintptr_t ptr) except + nogil - pair[int, int] parse_robject_dimensions(uintptr_t ptr) nogil except + + pair[int, int] parse_robject_dimensions(uintptr_t ptr) except + nogil