Some minor Pyrex fixes:

- Don't return self in IntNum.__abs__ (return a copy instead).
- yasm_sym_status enum values have YASM_ prefixes.

svn path=/trunk/yasm/; revision=2255

diff --git a/tools/python-yasm/intnum.pxi b/tools/python-yasm/intnum.pxi
index 0b469b896804d326ea0df19bd5117e127bed4df9..320ca1b03fa8d37aca08e1153a7914ea89c25a61 100644 (file)
--- a/tools/python-yasm/intnum.pxi
+++ b/tools/python-yasm/intnum.pxi
@@ -115,7 +115,7 @@ cdef class IntNum:
     def __neg__(self): return __intnum_op(self, YASM_EXPR_NEG, None)
     def __pos__(self): return self
     def __abs__(self):
-        if yasm_intnum_sign(self.intn) >= 0: return self
+        if yasm_intnum_sign(self.intn) >= 0: return IntNum(self)
         else: return __intnum_op(self, YASM_EXPR_NEG, None)
     def __nonzero__(self): return not yasm_intnum_is_zero(self.intn)
     def __invert__(self): return __intnum_op(self, YASM_EXPR_NOT, None)

diff --git a/tools/python-yasm/symrec.pxi b/tools/python-yasm/symrec.pxi
index 404ffe976b23c0781ff05bf8777f752f87297649..eb56ccf0c8beaf0cc48f31007d97c2f60d7b55b7 100644 (file)
--- a/tools/python-yasm/symrec.pxi
+++ b/tools/python-yasm/symrec.pxi
@@ -43,15 +43,15 @@ cdef class Symbol:
             cdef yasm_sym_status status
             s = set()
             status = yasm_symrec_get_status(self.sym)
-            if <int>status & <int>SYM_USED: s.add('used')
-            if <int>status & <int>SYM_DEFINED: s.add('defined')
-            if <int>status & <int>SYM_VALUED: s.add('valued')
+            if <int>status & <int>YASM_SYM_USED: s.add('used')
+            if <int>status & <int>YASM_SYM_DEFINED: s.add('defined')
+            if <int>status & <int>YASM_SYM_VALUED: s.add('valued')
             return s
 
     property in_table:
         def __get__(self):
             return bool(<int>yasm_symrec_get_status(self.sym) &
-                        <int>SYM_NOTINTABLE)
+                        <int>YASM_SYM_NOTINTABLE)
 
     property visibility:
         def __get__(self):