some more enums as const

funkwerk · May 5, 2020 · fd7cc1a · fd7cc1a
1 parent 3283a79
commit fd7cc1a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 22 deletions.
diff --git a/model/DRuntimeMisc.zargo b/model/DRuntimeMisc.zargo
diff --git a/source/antlr/v4/runtime/misc/Array2DHashSet.d b/source/antlr/v4/runtime/misc/Array2DHashSet.d
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The ANTLR Project. All rights reserved.
+ * Copyright (c) 2012-2020 The ANTLR Project. All rights reserved.
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
@@ -22,11 +22,11 @@ import antlr.v4.runtime.misc;
 class Array2DHashSet(T)
 {
 
-    public static immutable int INITAL_CAPACITY = 16;
+    enum int INITAL_CAPACITY = 16;
 
-    public static immutable int INITAL_BUCKET_CAPACITY = 8;
+    enum int INITAL_BUCKET_CAPACITY = 8;
 
-    public static immutable double LOAD_FACTOR = 0.75;
+    enum double LOAD_FACTOR = 0.75;
 
     protected size_t function(Object o) @trusted nothrow hashOfFp;
 
@@ -65,9 +65,8 @@ class Array2DHashSet(T)
         this(hashOfFp, opEqualsFp, INITAL_CAPACITY, INITAL_BUCKET_CAPACITY);
     }
 
-    public this(size_t function(Object o) @trusted nothrow hashOfFp,
-            bool function(Object a, Object b) opEqualsFp,
-            int initialCapacity, int initialBucketCapacity)
+    public this(size_t function(Object o) @trusted nothrow hashOfFp, bool function(Object a,
+            Object b) opEqualsFp, int initialCapacity, int initialBucketCapacity)
     {
         if (hashOfFp is null || opEqualsFp is null)
         {
@@ -198,7 +197,7 @@ class Array2DHashSet(T)
     {
         if (o is this)
             return true;
-        if (! cast(Array2DHashSet) o)
+        if (!cast(Array2DHashSet) o)
             return false;
         Array2DHashSet!T other = cast(Array2DHashSet!T) o;
         if (other.size() != size())

diff --git a/source/antlr/v4/runtime/misc/BitSet.d b/source/antlr/v4/runtime/misc/BitSet.d
@@ -49,7 +49,8 @@ struct BitSet
 
     public int nextSetBit(int fromIndex)
     {
-        foreach (i, el; bitSet) {
+        foreach (i, el; bitSet)
+        {
             if (i > fromIndex && el == true)
                 return to!int(i);
         }
@@ -94,7 +95,7 @@ struct BitSet
                     res ~= to!string(j) ~ ", ";
                 }
             }
-            return format!"{%s}"(res[0 .. $-2]);
+            return format!"{%s}"(res[0 .. $ - 2]);
         }
         else
             return "{}";
@@ -134,9 +135,8 @@ struct BitSet
         auto maxLenght = max(this.bitSet.length, bits.bitSet.length);
         if (this.bitSet.length < maxLenght)
             this.bitSet.length = maxLenght;
-        else
-            if (bits.values.length < maxLenght)
-                bits.values.length = maxLenght;
+        else if (bits.values.length < maxLenght)
+            bits.values.length = maxLenght;
         result.bitSet = this.bitSet | bits.bitSet;
         return result;
     }
@@ -145,11 +145,12 @@ struct BitSet
     {
         import std.conv;
         import std.array : join;
+
         string[] res;
         int index;
-        foreach(i, el; bitSet)
+        foreach (i, el; bitSet)
         {
-            if(el)
+            if (el)
                 res ~= to!string(i);
         }
         return "{" ~ join(res, ",") ~ "}";

diff --git a/source/antlr/v4/runtime/misc/IntegerList.d b/source/antlr/v4/runtime/misc/IntegerList.d
@@ -144,7 +144,8 @@ class IntegerList
     public final void removeRange(int fromIndex, int toIndex)
     in
     {
-        assert(fromIndex >= 0 || toIndex >= 0 || fromIndex <= data_.length || toIndex <= data_.length, "IndexOutOfBoundsException");
+        assert(fromIndex >= 0 || toIndex >= 0 || fromIndex <= data_.length
+                || toIndex <= data_.length, "IndexOutOfBoundsException");
         assert(fromIndex <= toIndex, "IllegalArgumentException");
     }
     do

diff --git a/source/antlr/v4/runtime/misc/Interval.d b/source/antlr/v4/runtime/misc/Interval.d
@@ -20,7 +20,7 @@ class Interval
 
     public static const Interval INVALID = new Interval(-1, -2);
 
-    private static Interval[] cache = new Interval[INTERVAL_POOL_MAX_VALUE+1];
+    private static Interval[] cache = new Interval[INTERVAL_POOL_MAX_VALUE + 1];
 
     public int a;
 
@@ -192,8 +192,8 @@ class Interval
 
     unittest
     {
-        auto a = new Interval(1 , 2);
-        auto b = new Interval(3 , 10);
+        auto a = new Interval(1, 2);
+        auto b = new Interval(3, 10);
         assert(b.adjacent(a));
         assert(!b.adjacent(new Interval(1, 6)));
         assert(!b.adjacent(new Interval(10, 16)));

diff --git a/source/antlr/v4/runtime/misc/IntervalSet.d b/source/antlr/v4/runtime/misc/IntervalSet.d
@@ -61,7 +61,7 @@ class IntervalSet : IntSet
         addAll(set);
     }
 
-    public this(int[] els ...)
+    public this(int[] els...)
     {
         foreach (int e; els)
             add(e);

diff --git a/source/antlr/v4/runtime/misc/MurmurHash.d b/source/antlr/v4/runtime/misc/MurmurHash.d
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The ANTLR Project. All rights reserved.
+ * Copyright (c) 2012-2020 The ANTLR Project. All rights reserved.
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
@@ -16,7 +16,7 @@ import std.stdio;
 class MurmurHash
 {
 
-    public static immutable size_t DEFAULT_SEED = 0;
+    enum size_t DEFAULT_SEED = 0;
 
     /**
      * Initialize the hash using the default seed value.