Use integer'low rather than 'left and integer'high rather than 'right. Easier to understand.

JimLewis · JimLewis · commit 1332432db3f1 · 2025-02-05T11:43:59.000-08:00
diff --git a/AlertLogPkg.vhd b/AlertLogPkg.vhd
@@ -157,7 +157,7 @@ package AlertLogPkg is
   constant  ALERT_DEFAULT_ID               : AlertLogIDType := ALERTLOG_DEFAULT_ID ;
   constant  LOG_DEFAULT_ID                 : AlertLogIDType := ALERTLOG_DEFAULT_ID ;
 
-  constant  ALERTLOG_ID_NOT_FOUND          : AlertLogIDType := -1 ;  -- alternately integer'right
+  constant  ALERTLOG_ID_NOT_FOUND          : AlertLogIDType := -1 ;  -- alternately integer'high
   constant  ALERTLOG_ID_NOT_ASSIGNED       : AlertLogIDType := -1 ;
   constant  MIN_NUM_AL_IDS                 : AlertLogIDType := 32 ; -- Number IDs initially allocated
 
@@ -604,7 +604,7 @@ package AlertLogPkg is
     PrintDisabledAlerts      : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
     PrintRequirements        : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
     PrintIfHaveRequirements  : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
-    DefaultPassedGoal        : integer             := integer'left ;
+    DefaultPassedGoal        : integer             := integer'low ;
     AlertPrefix              : string := OSVVM_STRING_INIT_PARM_DETECT ;
     LogPrefix                : string := OSVVM_STRING_INIT_PARM_DETECT ;
     ReportPrefix             : string := OSVVM_STRING_INIT_PARM_DETECT ;
@@ -613,7 +613,7 @@ package AlertLogPkg is
     FailName                 : string := OSVVM_STRING_INIT_PARM_DETECT ;
     IdSeparator              : string := OSVVM_STRING_INIT_PARM_DETECT ;
     WriteTimeLast            : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
-    TimeJustifyAmount        : integer             := integer'left
+    TimeJustifyAmount        : integer             := integer'low
   ) ;
 
   procedure ReportAlertLogOptions ;
@@ -2975,10 +2975,10 @@ package body AlertLogPkg is
     procedure ClearAlertStopCounts is
     ------------------------------------------------------------
     begin
-      AlertLogPtr(ALERTLOG_BASE_ID).AlertStopCount := (FAILURE => 0, ERROR => integer'right, WARNING => integer'right) ;
+      AlertLogPtr(ALERTLOG_BASE_ID).AlertStopCount := (FAILURE => 0, ERROR => integer'high, WARNING => integer'high) ;
 
       for i in ALERTLOG_BASE_ID + 1 to NumAlertLogIDsVar loop
-        AlertLogPtr(i).AlertStopCount := (FAILURE => integer'right, ERROR => integer'right, WARNING => integer'right) ;
+        AlertLogPtr(i).AlertStopCount := (FAILURE => integer'high, ERROR => integer'high, WARNING => integer'high) ;
       end loop ;
     end procedure ClearAlertStopCounts ;
 
@@ -3122,7 +3122,7 @@ package body AlertLogPkg is
       if AlertLogID = ALERTLOG_BASE_ID then
         AlertEnabled := (TRUE, TRUE, TRUE) ;
         LogEnabled   := (others => FALSE) ;
-        AlertStopCount := (FAILURE => 0, ERROR => integer'right, WARNING => integer'right) ;
+        AlertStopCount := (FAILURE => 0, ERROR => integer'high, WARNING => integer'high) ;
         HierarchyLevel := 0 ; 
         EnQueueID(AlertLogID, ALERTLOG_BASE_ID, TRUE) ;
       else
@@ -3135,7 +3135,7 @@ package body AlertLogPkg is
           LogEnabled   := AlertLogPtr(ParentID).LogEnabled ;
           EnQueueID(AlertLogID, ParentID, ParentIdSet) ;
         end if ;
-        AlertStopCount := (FAILURE | ERROR | WARNING => integer'right) ;
+        AlertStopCount := (FAILURE | ERROR | WARNING => integer'high) ;
       end if ;
       AlertLogPtr(AlertLogID).Name                := new string'(iName) ;
       AlertLogPtr(AlertLogID).NameLower           := new string'(to_lower(iName)) ;
@@ -3146,7 +3146,7 @@ package body AlertLogPkg is
       AlertLogPtr(AlertLogID).PassedGoal          := 0 ;
       AlertLogPtr(AlertLogID).AlertEnabled        := AlertEnabled ;
       AlertLogPtr(AlertLogID).AlertStopCount      := AlertStopCount ;
-      AlertLogPtr(AlertLogID).AlertPrintCount     := (FAILURE | ERROR | WARNING => integer'right) ;
+      AlertLogPtr(AlertLogID).AlertPrintCount     := (FAILURE | ERROR | WARNING => integer'high) ;
       AlertLogPtr(AlertLogID).LogEnabled          := LogEnabled ;
       AlertLogPtr(AlertLogID).ReportMode          := ReportMode ;
       AlertLogPtr(AlertLogID).HierarchyLevel      := HierarchyLevel ;
@@ -3742,7 +3742,7 @@ package body AlertLogPkg is
       Count        : integer
     ) is
     begin
-      if AlertLogPtr(AlertLogID).AlertStopCount(Level) = integer'right then
+      if AlertLogPtr(AlertLogID).AlertStopCount(Level) = integer'high then
         AlertLogPtr(AlertLogID).AlertStopCount(Level) := Count ;
       else
         AlertLogPtr(AlertLogID).AlertStopCount(Level) :=
@@ -7102,7 +7102,7 @@ package body AlertLogPkg is
     PrintDisabledAlerts      : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
     PrintRequirements        : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
     PrintIfHaveRequirements  : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
-    DefaultPassedGoal        : integer          := integer'left ;
+    DefaultPassedGoal        : integer          := integer'low ;
     AlertPrefix              : string := OSVVM_STRING_INIT_PARM_DETECT ;
     LogPrefix                : string := OSVVM_STRING_INIT_PARM_DETECT ;
     ReportPrefix             : string := OSVVM_STRING_INIT_PARM_DETECT ;
@@ -7111,7 +7111,7 @@ package body AlertLogPkg is
     FailName                 : string := OSVVM_STRING_INIT_PARM_DETECT ;
     IdSeparator              : string := OSVVM_STRING_INIT_PARM_DETECT ;
     WriteTimeLast            : OsvvmOptionsType := OPT_INIT_PARM_DETECT ;
-    TimeJustifyAmount        : integer          := integer'left
+    TimeJustifyAmount        : integer          := integer'low
   ) is
   begin
     -- synthesis translate_off
diff --git a/CoveragePkg.vhd b/CoveragePkg.vhd
@@ -142,7 +142,7 @@ package CoveragePkg is
     ID : integer_max ;
   end record CoverageIDType ;
   
-  constant COVERAGE_ID_UNINITIALZED : CoverageIdType := (ID => integer'left) ; 
+  constant COVERAGE_ID_UNINITIALZED : CoverageIdType := (ID => integer'low) ; 
 
   type CoverageIDArrayType is array (integer range <>) of CoverageIDType ;
 
@@ -156,7 +156,7 @@ package CoveragePkg is
     max : integer ;
   end record ;
   type RangeArrayType is array (integer range <>) of RangeType ;
-  constant ALL_RANGE : RangeArrayType := (1=>(Integer'left, Integer'right)) ;
+  constant ALL_RANGE : RangeArrayType := (1=>(integer'low, integer'high)) ;
 
 --!!  procedure write ( file f :  text ;  BinVal : RangeArrayType ) ;
   procedure write ( variable buf : inout line ; constant BinVal : in RangeArrayType) ;
@@ -1804,7 +1804,7 @@ package body CoveragePkg is
 --!!     for i in BinVal'range loop
 --!!       if BinVal(i).min = BinVal(i).max then
 --!!         write(f, "(" & to_string_max(BinVal(i).min) & ") " ) ;
---!!       elsif  (BinVal(i).min = integer'left) and (BinVal(i).max = integer'right) then
+--!!       elsif  (BinVal(i).min = integer'low) and (BinVal(i).max = integer'high) then
 --!!         write(f, "(ALL) " ) ;
 --!!       else
 --!!         write(f, "(" & to_string_max(BinVal(i).min) & " to " &
@@ -3508,7 +3508,7 @@ package body CoveragePkg is
     ------------------------------------------------------------
     impure function GetMinCount (ID : CoverageIDType) return integer is
     ------------------------------------------------------------
-      variable MinCount : integer := integer'right ;  -- big number
+      variable MinCount : integer := integer'high ;  -- big number
     begin
       CovLoop : for i in 1 to CovStructPtr(ID.ID).NumBins loop
         if CovStructPtr(ID.ID).CovBinPtr(i).action = COV_COUNT and CovStructPtr(ID.ID).CovBinPtr(i).Count < MinCount then
@@ -6239,7 +6239,7 @@ package body CoveragePkg is
           AdjAtLeast := AtLeast ;  -- Valid
         else
           -- Done, Enable all bins
-          -- AdjAtLeast := integer'right ;  -- Get All
+          -- AdjAtLeast := integer'high ;  -- Get All
           AdjAtLeast := GetMaxCount(ID) + 1 ;  -- Get All
         end if ;
       end if;
diff --git a/DelayCoveragePkg.vhd b/DelayCoveragePkg.vhd
@@ -63,7 +63,7 @@ package DelayCoveragePkg is
   end record DelayCoverageIDType ; 
   type DelayCoverageIDArrayType is array (integer range <>) of DelayCoverageIDType ;  
 
-  constant DELAYCOVERAGE_ID_UNINITIALZED : DelayCoverageIDType := (ID => integer'left, others => COVERAGE_ID_UNINITIALZED) ; 
+  constant DELAYCOVERAGE_ID_UNINITIALZED : DelayCoverageIDType := (ID => integer'low, others => COVERAGE_ID_UNINITIALZED) ; 
   
   ------------------------------------------------------------
   --- ///////////////////////////////////////////////////////////////////////////
diff --git a/MemoryGenericPkg.vhd b/MemoryGenericPkg.vhd
@@ -81,7 +81,7 @@ package MemoryGenericPkg is
     ID : integer_max ;
   end record MemoryIDType ; 
   
-  constant MEMORY_ID_UNINITIALZED : MemoryIdType := (ID => integer'left) ; 
+  constant MEMORY_ID_UNINITIALZED : MemoryIdType := (ID => integer'low) ; 
 
   type MemoryIDArrayType is array (integer range <>) of MemoryIDType ;
 
@@ -574,7 +574,7 @@ package body MemoryGenericPkg is
     ) return boolean is 
     begin
       if ID < MIN_INDEX or ID > MemStructPtr'High then 
-        if ID = integer'left then 
+        if ID = integer'low then 
           Alert(OSVVM_MEMORY_ALERTLOG_ID, "MemoryPkg." & Name & " ID not initialized yet.  " &
             "Either a call to NewID or wait for 0 ns (to allow for signal update) is needed. ",
              FAILURE ) ;
diff --git a/MemorySupportPkg.vhd b/MemorySupportPkg.vhd
@@ -275,7 +275,7 @@ package body MemorySupportPkg is
   function InitMemoryBaseType_orig(Size : integer) return integer_vector is  
   ------------------------------------------------------------
   begin
-    return (1 => integer'left) ; 
+    return (1 => integer'low) ; 
   end function InitMemoryBaseType_orig ; 
  
 end MemorySupportPkg ;
diff --git a/NameStorePkg.vhd b/NameStorePkg.vhd
@@ -57,7 +57,7 @@ package NameStorePkg is
   type NameIDArrayType is array (integer range <>) of NameIDType ;  
   type NameSearchType is (PRIVATE_NAME, NAME, NAME_AND_PARENT, NAME_AND_PARENT_ELSE_PRIVATE) ; 
   constant ID_NOT_FOUND : NameIDType := (ID => -1) ; 
-  constant NAME_ID_UNINITIALZED : NameIdType := (ID => integer'left) ; 
+  constant NAME_ID_UNINITIALZED : NameIdType := (ID => integer'low) ; 
   
   ------------------------------------------------------------
   impure function NewID (
diff --git a/RandomBasePkg.vhd b/RandomBasePkg.vhd
@@ -591,7 +591,7 @@ package body RandomBasePkg is
 --!!      ValRange := rMax - rMin ;
 --!!      return integer(round(A * ValRange + rMin)) ;
 --!!    else
---!!      return integer'left ;
+--!!      return integer'low ;
 --!!    end if ;
   end function Scale ;
 
diff --git a/RandomPkg.vhd b/RandomPkg.vhd
@@ -1667,7 +1667,7 @@ package body RandomPkg is
         DistArray(i) := DistArray(i) + sum ;
         if DistArray(i) < sum then
           Alert(OSVVM_RANDOM_ALERTLOG_ID, "RandomPkg.DistInt: negative weight or sum > 31 bits", FAILURE) ;
-          return DistArray'low ; -- allows debugging vs integer'left, out of range
+          return DistArray'low ; -- allows debugging vs integer'low, out of range
         end if ;
         sum := DistArray(i) ;
       end loop ;
@@ -1682,7 +1682,7 @@ package body RandomPkg is
       else
         Alert(OSVVM_RANDOM_ALERTLOG_ID, "RandomPkg.DistInt: No randomization weights", FAILURE) ;
       end if ;
-      return DistArray'low ; -- allows debugging vs integer'left, out of range
+      return DistArray'low ; -- allows debugging vs integer'low, out of range
     end function DistInt ;
 
     ------------------------------------------------------------
diff --git a/RandomPkg2019.vhd b/RandomPkg2019.vhd
@@ -1643,7 +1643,7 @@ package body RandomPkg2019 is
       DistArray(i) := DistArray(i) + sum ;
       if DistArray(i) < sum then
         Alert(OSVVM_RANDOM_ALERTLOG_ID, "RandomPkg2019.DistInt: negative weight or sum > 31 bits", FAILURE) ;
-        return DistArray'low ; -- allows debugging vs integer'left, out of range
+        return DistArray'low ; -- allows debugging vs integer'low, out of range
       end if ;
       sum := DistArray(i) ;
     end loop ;
@@ -1658,7 +1658,7 @@ package body RandomPkg2019 is
     else
       Alert(OSVVM_RANDOM_ALERTLOG_ID, "RandomPkg2019.DistInt: No randomization weights", FAILURE) ;
     end if ;
-    return DistArray'low ; -- allows debugging vs integer'left, out of range
+    return DistArray'low ; -- allows debugging vs integer'low, out of range
   end function DistInt ;
 
   ------------------------------------------------------------
diff --git a/RandomProcedurePkg.vhd b/RandomProcedurePkg.vhd
@@ -149,7 +149,7 @@ package body RandomProcedurePkg is
       DistArray(i) := DistArray(i) + sum ;
       if DistArray(i) < sum then
         Alert(OSVVM_RANDOM_ALERTLOG_ID, "RandomPkg.DistInt: negative weight or sum > 31 bits", FAILURE) ;
-        R := DistArray'low ; -- allows debugging vs integer'left, out of range
+        R := DistArray'low ; -- allows debugging vs integer'low, out of range
       end if ;
       sum := DistArray(i) ;
     end loop ;
@@ -165,7 +165,7 @@ package body RandomProcedurePkg is
     else
       Alert(OSVVM_RANDOM_ALERTLOG_ID, "RandomPkg.DistInt: No randomization weights", FAILURE) ;
     end if ;
-    R := DistArray'low ; -- allows debugging vs integer'left, out of range
+    R := DistArray'low ; -- allows debugging vs integer'low, out of range
   end procedure DistInt ;
 
 end RandomProcedurePkg ;
diff --git a/ResolutionPkg.vhd b/ResolutionPkg.vhd
@@ -226,7 +226,7 @@ package body ResolutionPkg is
     variable result : integer := 0 ;
   begin
     for i in s'RANGE loop
-      if s(i) /= integer'left then
+      if s(i) /= integer'low then
         result := s(i) + result;
       end if ;
     end loop ;
diff --git a/ScoreboardGenericPkg.vhd b/ScoreboardGenericPkg.vhd
@@ -122,7 +122,7 @@ package ScoreboardGenericPkg is
   type ScoreboardIdArrayType  is array (integer range <>) of ScoreboardIdType ;
   type ScoreboardIdMatrixType is array (integer range <>, integer range <>) of ScoreboardIdType ;
 
-  constant SCOREBOARD_ID_UNINITIALZED : ScoreboardIdType := (ID => integer'left) ; 
+  constant SCOREBOARD_ID_UNINITIALZED : ScoreboardIdType := (ID => integer'low) ; 
 
   -- Preparation for refactoring - if that ever happens.
   subtype FifoIdType       is ScoreboardIdType ;
@@ -364,7 +364,7 @@ package ScoreboardGenericPkg is
 
   ------------------------------------------------------------
   -- Find - Returns the ItemNumber for a value and tag (if applicable) in a scoreboard.
-  -- Find returns integer'left if no match found
+  -- Find returns integer'low if no match found
   -- Also See Flush.  Flush will drop items up through the ItemNumber
 
   -- Simple Scoreboard
@@ -665,7 +665,7 @@ package ScoreboardGenericPkg is
     
     ------------------------------------------------------------
     -- Find - Returns the ItemNumber for a value and tag (if applicable) in a scoreboard.
-    -- Find returns integer'left if no match found
+    -- Find returns integer'low if no match found
     -- Also See Flush.  Flush will drop items up through the ItemNumber
     -- Scoreboard no tag
     impure function Find (
@@ -856,7 +856,7 @@ package ScoreboardGenericPkg is
 
     ------------------------------------------------------------
     -- Find - Returns the ItemNumber for a value and tag (if applicable) in a scoreboard.
-    -- Find returns integer'left if no match found
+    -- Find returns integer'low if no match found
     -- Also See Flush.  Flush will drop items up through the ItemNumber
     -- Simple Scoreboard
     impure function Find (
@@ -1975,7 +1975,7 @@ package body ScoreboardGenericPkg is
     ------------------------------------------------------------
     -- Tagged Scoreboards
     -- Find Element with Matching Tag and ActualData
-    -- Returns integer'left if no match found
+    -- Returns integer'low if no match found
     impure function Find (
     ------------------------------------------------------------
       constant Index       :  in  integer ;
@@ -1986,7 +1986,7 @@ package body ScoreboardGenericPkg is
       variable FindParentPtr : ListPtrType ;
     begin
 --!!        if LocalOutOfRange(Index, "Find") then
---!!          return integer'left ; -- error reporting in LocalOutOfRange
+--!!          return integer'low ; -- error reporting in LocalOutOfRange
 --!!        end if ;
 --!!        CurPtr := SbPtr(Index).HeadPtr ;
 --!!        loop
@@ -2002,8 +2002,8 @@ package body ScoreboardGenericPkg is
 --!!                    GetName & " Did not find Actual Data: " & actual_to_string(ActualData),
 --!!                    ERROR ) ;
 --!!            end if ;
---!!  --          return integer'left ;
---!!            LocalItemNumber := integer'left ;
+--!!  --          return integer'low ;
+--!!            LocalItemNumber := integer'low ;
 --!!            exit ;
 --!!  
 --!!          elsif CurPtr.TagPtr.all = Tag and
@@ -2192,7 +2192,7 @@ package body ScoreboardGenericPkg is
     ------------------------------------------------------------
     -- Scoreboard no tag
     -- Find Element with Matching Tag and ActualData
-    -- Returns integer'left if no match found
+    -- Returns integer'low if no match found
     procedure FindAndDelete (
     ------------------------------------------------------------
       constant Index       :  in  integer ;
@@ -2264,7 +2264,7 @@ package body ScoreboardGenericPkg is
     ------------------------------------------------------------
     -- Scoreboard no tag
     -- Find Element with Matching Tag and ActualData
-    -- Returns integer'left if no match found
+    -- Returns integer'low if no match found
     procedure FindAndFlush (
     ------------------------------------------------------------
       constant Index       :  in  integer ;
@@ -3508,7 +3508,7 @@ package body ScoreboardGenericPkg is
 
   ------------------------------------------------------------
   -- Find - Returns the ItemNumber for a value and tag (if applicable) in a scoreboard.
-  -- Find returns integer'left if no match found
+  -- Find returns integer'low if no match found
   -- Also See Flush.  Flush will drop items up through the ItemNumber
 
   -- Simple Scoreboard
diff --git a/deprecated/MemoryPkg_c.vhd b/deprecated/MemoryPkg_c.vhd
@@ -85,7 +85,7 @@ package MemoryPkg is
     ID : integer_max ;
   end record MemoryIDType ; 
   
-  constant MEMORY_ID_UNINITIALZED : MemoryIdType := (ID => integer'left) ; 
+  constant MEMORY_ID_UNINITIALZED : MemoryIdType := (ID => integer'low) ; 
 
   type MemoryIDArrayType is array (integer range <>) of MemoryIDType ;
 
diff --git a/deprecated/MemoryPkg_orig_c.vhd b/deprecated/MemoryPkg_orig_c.vhd
@@ -85,7 +85,7 @@ package MemoryPkg_orig is
     ID : integer_max ;
   end record MemoryIDType ; 
   
-  constant MEMORY_ID_UNINITIALZED : MemoryIdType := (ID => integer'left) ; 
+  constant MEMORY_ID_UNINITIALZED : MemoryIdType := (ID => integer'low) ; 
 
   type MemoryIDArrayType is array (integer range <>) of MemoryIDType ;
 
diff --git a/deprecated/ScoreboardPkg_IntV_c.vhd b/deprecated/ScoreboardPkg_IntV_c.vhd
diff --git a/deprecated/ScoreboardPkg_int_c.vhd b/deprecated/ScoreboardPkg_int_c.vhd
diff --git a/deprecated/ScoreboardPkg_signed_c.vhd b/deprecated/ScoreboardPkg_signed_c.vhd
diff --git a/deprecated/ScoreboardPkg_slv_c.vhd b/deprecated/ScoreboardPkg_slv_c.vhd
diff --git a/deprecated/ScoreboardPkg_unsigned_c.vhd b/deprecated/ScoreboardPkg_unsigned_c.vhd
