Added int32_abs () to Utils.

Made Dice.roll () use uint32 as it's return value. It can never be negative, so...
gegoxaren · Jun 1, 2022 · a12a0cc · a12a0cc
1 parent b25d47f
commit a12a0cc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/libvqdr/dice.vala b/src/libvqdr/dice.vala
@@ -41,7 +41,7 @@ public class VQDR.Expression.Dice {
     this.modifier = 0;
   }
 
-  public int32 roll () {
+  public uint32 roll () {
     if (faces <= 0) {
       return modifier;
     }
@@ -51,14 +51,12 @@ public class VQDR.Expression.Dice {
     }
 
     if (faces == 1) {
-      return ((int32) times) + modifier;
+      return times + modifier;
     }
 
-    int32 retval = modifier;
+    uint32 retval = modifier;
     for (size_t i = 1; i <= times; i++) {
-      // we have to do this ugly mess, as int32 is missing the abs () method.
-      // bug: https://gitlab.gnome.org/GNOME/vala/-/issues/1328
-      int32 r = ((int)(Utils.Random.get_static_int () % (int)faces)).abs ();
+      uint32 r = Utils.Random.get_static_int () % faces;
 
       retval += r;
     }

diff --git a/src/utils/utils.vala b/src/utils/utils.vala
@@ -5,6 +5,10 @@
  */
 [CCode (cname = "V", cprefix = "v_")]
 namespace Utils {
+  // int32 is missinng the abs method. This will have to do for the time being.
+  // BUG: https://gitlab.gnome.org/GNOME/vala/-/issues/1328
+  static int32 int32_abs (int32 N) { return ((N < 0) ? ( -N ) : (N)); }
+
   [CCode (cname = "v_str_cmp")]
   public int str_cmp (string a, string b) {
     return a.collate (b);

diff --git a/tests/random-d6.vala b/tests/random-d6.vala
@@ -40,7 +40,7 @@ void d6_test () {
       int32 count[7] = {0};
       int32 rolls = 1000000;
       for (size_t i = 0; i < rolls; i++) {
-        int32 r = d.roll ();
+        uint32 r = d.roll ();
 
         count[r] += 1;
       }
@@ -60,7 +60,7 @@ void d6_test () {
       int32 count[7] = {0};
       int32 rolls = 1000000;
       for (size_t i = 0; i < rolls; i++) {
-        int32 r = d.roll ();
+        uint32 r = d.roll ();
 
         count[r] += 1;
       }