From 173f13324185b5de8c1c8f7edf3cc1c76d43bf17 Mon Sep 17 00:00:00 2001
From: stefandesouza <stefan.desouza@outlook.com>
Date: Thu, 22 Feb 2024 13:51:48 +0100
Subject: [PATCH] Memory attributes name change

---
 osaca/parser/memory.py | 64 +++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/osaca/parser/memory.py b/osaca/parser/memory.py
index a8c4be0..0010f6f 100644
--- a/osaca/parser/memory.py
+++ b/osaca/parser/memory.py
@@ -6,11 +6,11 @@ from osaca.parser.operand import Operand
 class MemoryOperand(Operand):
     def __init__(
         self,
-        offset_ID=None,
-        base_id=None,
-        index_id=None,
-        scale_id=1,
-        segment_ext_id=None,
+        offset=None,
+        base=None,
+        index=None,
+        scale=1,
+        segment_ext=None,
         mask=None,
         pre_indexed=False,
         post_indexed=False,
@@ -21,11 +21,11 @@ class MemoryOperand(Operand):
         destination=False,
     ):
         super().__init__("memory", source, destination)
-        self._offset_ID = offset_ID
-        self._base_id = base_id
-        self._index_id = index_id
-        self._scale_id = scale_id
-        self._segment_ext_id = segment_ext_id
+        self._offset = offset
+        self._base = base
+        self._index = index
+        self._scale = scale
+        self._segment_ext = segment_ext
         self._mask = mask
         self._pre_indexed = pre_indexed
         self._post_indexed = post_indexed
@@ -35,27 +35,27 @@ class MemoryOperand(Operand):
 
     @property
     def offset(self):
-        return self._offset_ID
+        return self._offset
 
     @property
     def immediate(self):
-        return self._IMMEDIATE_ID
+        return self._immediate_id
 
     @property
     def base(self):
-        return self._base_id
+        return self._base
 
     @property
     def index(self):
-        return self._index_id
+        return self._index
 
     @property
     def scale(self):
-        return self._scale_id
+        return self._scale
 
     @property
-    def segment_ext_id(self):
-        return self._segment_ext_id
+    def segment_ext(self):
+        return self._segment_ext
 
     @property
     def mask(self):
@@ -89,25 +89,25 @@ class MemoryOperand(Operand):
     def port_pressure(self, port_pressure):
         self._port_pressure = port_pressure
 
-    @segment_ext_id.setter
-    def segment_ext_id(self, segment):
-        self._segment_ext_id = segment
+    @segment_ext.setter
+    def segment_ext(self, segment):
+        self._segment_ext = segment
 
     @offset.setter
     def offset(self, offset):
-        self._offset_ID = offset
+        self._offset = offset
 
     @base.setter
     def base(self, base):
-        self._base_id = base
+        self._base = base
 
     @index.setter
     def index(self, index):
-        self._index_id = index
+        self._index = index
 
     @scale.setter
     def scale(self, scale):
-        self._scale_id = scale
+        self._scale = scale
 
     @mask.setter
     def mask(self, mask):
@@ -127,9 +127,9 @@ class MemoryOperand(Operand):
 
     def __str__(self):
         return (
-            f"MemoryOperand(name={self._name}, offset_ID={self._offset_ID}, "
-            f"base_id={self._base_id}, index_id={self._index_id}, scale_id={self._scale_id}, "
-            f"segment_ext_id={self._segment_ext_id}, mask={self._mask}, "
+            f"MemoryOperand(name={self._name}, offset={self._offset}, "
+            f"base={self._base}, index={self._index}, scale={self._scale}, "
+            f"segment_ext={self._segment_ext}, mask={self._mask}, "
             f"pre_indexed={self._pre_indexed}, post_indexed={self._post_indexed}, "
             f"indexed_val={self._indexed_val}, port_pressure={self._port_pressure}),"
             f"source={self._source}, destination={self._destination})"
@@ -141,11 +141,11 @@ class MemoryOperand(Operand):
     def __eq__(self, other):
         if isinstance(other, MemoryOperand):
             return (
-                self._offset_ID == other._offset_ID
-                and self._base_id == other._base_id
-                and self._index_id == other._index_id
-                and self._scale_id == other._scale_id
-                and self._segment_ext_id == other._segment_ext_id
+                self._offset == other._offset
+                and self._base == other._base
+                and self._index == other._index
+                and self._scale == other._scale
+                and self._segment_ext == other._segment_ext
                 and self._mask == other._mask
                 and self._pre_indexed == other._pre_indexed
                 and self._post_indexed == other._post_indexed