Constant names Empty and Universe, pretty printing

[linpy.git] / pypol / isl.py

diff --git a/pypol/isl.py b/pypol/isl.py
index 0513358..ecc32c7 100644 (file)
--- a/pypol/isl.py
+++ b/pypol/isl.py
@@ -1,19 +1,12 @@
-"""
-note: for islpy
-isl format: basic set: ("{[x, y] : x >= 0 and x < 5 and y >= 0 and y < x+4 }")
-"""
-

 import ctypes, ctypes.util
 import ctypes, ctypes.util

-import functools
-import math
-import numbers
-import operator
-import re
+
+from . import _isl

 
 
 libisl = ctypes.CDLL(ctypes.util.find_library('isl'))
 
 libisl.isl_printer_get_str.restype = ctypes.c_char_p
 
 
 libisl = ctypes.CDLL(ctypes.util.find_library('isl'))
 
 libisl.isl_printer_get_str.restype = ctypes.c_char_p

+libisl.isl_dim_set = _isl.isl_dim_set

 
 
 class IslObject:
 
 
 class IslObject:


@@ -31,7 +24,8 @@ class IslObject:
 class Context(IslObject):
 
     def __init__(self):
 class Context(IslObject):
 
     def __init__(self):

-        self._ptr = libisl.isl_ctx_alloc()
+        ptr = libisl.isl_ctx_alloc()
+        super().__init__(ptr)

 
     #comment out so does not delete itself after being created
     #def __del__(self):
 
     #comment out so does not delete itself after being created
     #def __del__(self):


@@ -50,6 +44,8 @@ class BasicSet(IslObject):
         ctx = libisl.isl_local_space_get_ctx(ls)
         p = libisl.isl_printer_to_str(ctx)
         p = libisl.isl_printer_print_basic_set(p, self)
         ctx = libisl.isl_local_space_get_ctx(ls)
         p = libisl.isl_printer_to_str(ctx)
         p = libisl.isl_printer_print_basic_set(p, self)

-        string = libisl.isl_printer_get_str(p)
-        string = str(string.decode())
+        string = libisl.isl_printer_get_str(p).decode()

         return string
         return string

+
+    def __del__(self):
+        libisl.isl_basic_set_free(self)