Merge pull request #34 from leonardt/fp

Fp

.travis.yml

@@ -1,4 +1,10 @@
 language: python
+addons:
+  apt:
+    packages:
+    - libgmp-dev
+    - libmpfr-dev
+    - libmpc-dev
 python:
 - '3.6'
 install:

README.md

@@ -1,5 +1,14 @@
 [![Build Status](https://travis-ci.org/leonardt/hwtypes.svg?branch=master)](https://travis-ci.org/leonardt/hwtypes)
 
+
+# Install
+## Debian
+```
+apt install libgmp-dev libmpfr-dev libmpc-dev
+pip install hwtypes
+```
+## OSX
 ```
+brew install gmp mpfr libmpc
 pip install hwtypes
 ```

hwtypes/__init__.py

@@ -3,3 +3,5 @@
 from .adt import *
 from .smt_bit_vector import *
 from .z3_bit_vector import *
+from .fp_vector_abc import *
+from .fp_vector import *

hwtypes/bit_vector_abc.py

@@ -12,7 +12,10 @@
 #BitVector(val, None) from BitVector(val)
 _MISSING = object()
 class AbstractBitVectorMeta(ABCMeta):
+    # BitVectorType, size :  BitVectorType[size]
     _class_cache = weakref.WeakValueDictionary()
+
+    # BitVectorType : UnsizedBitVectorType, size
     _class_info  = weakref.WeakKeyDictionary()
 
     def __call__(cls, value=_MISSING, size=_MISSING, *args, **kwargs):
@@ -44,8 +47,7 @@ def __call__(cls, value=_MISSING, size=_MISSING, *args, **kwargs):
         else:
             warnings.warn('DEPRECATION WARNING: Use of BitVectorT(value, size) is deprecated')
 
-        return AbstractBitVectorMeta.__call__(cls[size], value)
-
+        return type(cls).__call__(cls[size], value)
 
 
     def __new__(mcs, name, bases, namespace, **kwargs):
@@ -59,15 +61,17 @@ def __new__(mcs, name, bases, namespace, **kwargs):
 
         t = super().__new__(mcs, name, bases, namespace, **kwargs)
         if size is None:
-            AbstractBitVectorMeta._class_info[t] = t, size
+            mcs._class_info[t] = t, size
         else:
-            AbstractBitVectorMeta._class_info[t] = None, size
+            mcs._class_info[t] = None, size
 
         return t
 
+
     def __getitem__(cls, idx : int) -> 'AbstractBitVectorMeta':
+        mcs = type(cls)
         try:
-            return AbstractBitVector._class_cache[cls, idx]
+            return mcs._class_cache[cls, idx]
         except KeyError:
             pass
 
@@ -80,30 +84,30 @@ def __getitem__(cls, idx : int) -> 'AbstractBitVectorMeta':
             raise TypeError('{} is already sized'.format(cls))
 
         bases = [cls]
-        bases.extend(b[idx] for b in cls.__bases__ if isinstance(b, AbstractBitVectorMeta))
+        bases.extend(b[idx] for b in cls.__bases__ if isinstance(b, mcs))
         bases = tuple(bases)
         class_name = '{}[{}]'.format(cls.__name__, idx)
-        t = type(cls)(class_name, bases, {})
+        t = mcs(class_name, bases, {})
         t.__module__ = cls.__module__
-        AbstractBitVectorMeta._class_cache[cls, idx] = t
-        AbstractBitVectorMeta._class_info[t] = cls, idx
+        mcs._class_cache[cls, idx] = t
+        mcs._class_info[t] = cls, idx
         return t
 
     @property
     def unsized_t(cls) -> 'AbstractBitVectorMeta':
-        t = AbstractBitVectorMeta._class_info[cls][0]
+        t = type(cls)._class_info[cls][0]
         if t is not None:
             return t
         else:
             raise AttributeError('type {} has no unsized_t'.format(cls))
 
     @property
     def size(cls) -> int:
-        return AbstractBitVectorMeta._class_info[cls][1]
+        return type(cls)._class_info[cls][1]
 
     @property
     def is_sized(cls) -> bool:
-        return AbstractBitVectorMeta._class_info[cls][1] is not None
+        return type(cls)._class_info[cls][1] is not None
 
 class AbstractBit(metaclass=ABCMeta):
     @staticmethod