Register attributes name change

osaca/parser/register.py

@@ -7,10 +7,9 @@ class RegisterOperand(Operand):
     def __init__(
         self,
         name=None,
-        width_id=None,
-        prefix_id=None,
-        reg_id=None,
-        regtype_id=None,
+        width=None,
+        prefix=None,
+        regtype=None,
         lanes=None,
         shape=None,
         index=None,
@@ -25,10 +24,9 @@ class RegisterOperand(Operand):
         shift_op=False,
     ):
         super().__init__(name, source, destination)
-        self._width_id = width_id
-        self._prefix_id = prefix_id
-        self._reg_id = reg_id
-        self._regtype_id = regtype_id
+        self._width = width
+        self._prefix = prefix
+        self._regtype = regtype
         self._lanes = lanes
         self._shape = shape
         self._index = index
@@ -42,11 +40,11 @@ class RegisterOperand(Operand):
 
     @property
     def width(self):
-        return self._width_id
+        return self._width
 
     @width.setter
     def width(self, width):
-        self._width_id = width
+        self._width = width
 
     @property
     def shift(self):
@@ -72,10 +70,6 @@ class RegisterOperand(Operand):
     def predication(self, predication):
         self._predication = predication
 
-    @property
-    def regtype(self):
-        return self._regtype_id
-
     @property
     def pre_indexed(self):
         return self._pre_indexed
@@ -84,25 +78,21 @@ class RegisterOperand(Operand):
     def post_indexed(self):
         return self._post_indexed
 
-    @regtype.setter
-    def regtype(self, regtype):
-        self._regtype_id = regtype
-
     @property
     def prefix(self):
-        return self._prefix_id
+        return self._prefix
 
     @prefix.setter
     def prefix(self, prefix):
         self._prefix = prefix
 
     @property
-    def reg_id(self):
-        return self._reg_id
+    def regtype(self):
+        return self._regtype
 
-    @reg_id.setter
-    def reg_id(self, reg_id):
-        self._reg_id = reg_id
+    @regtype.setter
+    def regtype(self, regtype):
+        self._regtype = regtype
 
     @property
     def lanes(self):
@@ -154,8 +144,8 @@ class RegisterOperand(Operand):
 
     def __str__(self):
         return (
-            f"Register(name={self._name}, width_id={self._width_id}, "
-            f"prefix_id={self._prefix_id}, reg_id={self._reg_id}, REGtype_id={self._regtype_id}, "
+            f"Register(name={self._name}, width={self._width}, "
+            f"prefix={self._prefix}, regtype={self._regtype}, "
             f"lanes={self._lanes}, shape={self._shape}, index={self._index}, "
             f"mask={self._mask}, zeroing={self._zeroing},source={self._source},destination={self._destination},"
             f"pre_indexed={self._pre_indexed}, post_indexed={self._post_indexed}) "
@@ -168,10 +158,9 @@ class RegisterOperand(Operand):
         if isinstance(other, RegisterOperand):
             return (
                 self._name == other._name
-                and self._width_id == other._width_id
-                and self._prefix_id == other._prefix_id
-                and self._reg_id == other._reg_id
-                and self._regtype_id == other._regtype_id
+                and self._width == other._width
+                and self._prefix == other._prefix
+                and self._regtype == other._regtype
                 and self._lanes == other._lanes
                 and self._shape == other._shape
                 and self._index == other._index