Asmbloc: rename asm_constraint[to/next] to AsmConstraint[To/Next]

1 files changed, 18 insertions, 5 deletions

diff --git a/miasm2/core/asmbloc.py b/miasm2/core/asmbloc.py
index 28f1fe12..669fd92d 100644
--- a/miasm2/core/asmbloc.py
+++ b/miasm2/core/asmbloc.py
@@ -102,24 +102,37 @@ class AsmConstraint(object):
 
 class asm_constraint(AsmConstraint):
 
-    def __init__(self, label, c_t=c_to):
+    def __init__(self, label, c_t=AsmConstraint.c_to):
         warnings.warn('DEPRECATION WARNING: use "AsmConstraint" instead of "asm_constraint"')
         super(asm_constraint, self).__init__(label, c_t)
 
 
-class asm_constraint_next(AsmConstraint):
+class AsmConstraintNext(AsmConstraint):
 
     def __init__(self, label):
-        super(asm_constraint_next, self).__init__(
+        super(AsmConstraintNext, self).__init__(
             label, c_t=AsmConstraint.c_next)
 
 
-class asm_constraint_to(AsmConstraint):
+class asm_constraint_next(AsmConstraint):
+
+    def __init__(self, label):
+        warnings.warn('DEPRECATION WARNING: use "AsmConstraintNext" instead of "asm_constraint_next"')
+        super(asm_constraint_next, self).__init__(label)
+
+
+class AsmConstraintTo(AsmConstraint):
 
     def __init__(self, label):
-        super(asm_constraint_to, self).__init__(
+        super(AsmConstraintTo, self).__init__(
             label, c_t=AsmConstraint.c_to)
 
+class asm_constraint_to(AsmConstraint):
+
+    def __init__(self, label):
+        warnings.warn('DEPRECATION WARNING: use "AsmConstraintTo" instead of "asm_constraint_to"')
+        super(asm_constraint_to, self).__init__(label)
+
 
 class AsmBlock(object):