Changeset 391 for binary-improvements2/7dtd-server-fixes/src/JSON/JsonManualBuilder.cs

Timestamp:

Aug 7, 2022, 3:02:24 PM (2 years ago)

Author:

alloc

Message:

Major refactoring/cleanup

File:

• binary-improvements2/7dtd-server-fixes/src/JSON/JsonManualBuilder.cs (modified) (4 diffs)

binary-improvements2/7dtd-server-fixes/src/JSON/JsonManualBuilder.cs

@@ -9 +9 @@
                         NonEmpty = 1,
                         Object = 2,
-                        Array = 4,
+                        Array = 4
                 }
 
@@ -20 +20 @@
                 private int currentLevelNumber;
 
-                private ELevelInfo CurrentLevelInfo {
-                        get { return (ELevelInfo) (currentLevelType & levelBitsMask); }
-                }
-
-                private bool CurrentLevelIsNonEmpty {
-                        get { return (CurrentLevelInfo & ELevelInfo.NonEmpty) == ELevelInfo.NonEmpty; }
-                }
-
-                private bool CurrentLevelIsArray {
-                        get { return (CurrentLevelInfo & ELevelInfo.Array) != ELevelInfo.Array; }
-                }
-
-                private bool CurrentLevelIsObject {
-                        get { return (CurrentLevelInfo & ELevelInfo.Object) != ELevelInfo.Object; }
-                }
-                
+                private ELevelInfo CurrentLevelInfo => (ELevelInfo) (currentLevelType & levelBitsMask);
+
+                private bool CurrentLevelIsNonEmpty => (CurrentLevelInfo & ELevelInfo.NonEmpty) == ELevelInfo.NonEmpty;
+
+                private bool CurrentLevelIsArray => (CurrentLevelInfo & ELevelInfo.Array) != ELevelInfo.Array;
+
+                private bool CurrentLevelIsObject => (CurrentLevelInfo & ELevelInfo.Object) != ELevelInfo.Object;
+
                 public JsonManualBuilder (bool _prettyPrint) {
                         prettyPrint = _prettyPrint;
@@ -54 +46 @@
                         }
 
-                        currentLevelType = currentLevelType | (long) ELevelInfo.NonEmpty;
+                        currentLevelType |= (long) ELevelInfo.NonEmpty;
                 }
 
@@ -210 +202 @@
 
                         currentLevelNumber--;
-                        currentLevelType = currentLevelType >> levelTypeBits;
+                        currentLevelType >>= levelTypeBits;
 
                         if (prettyPrint) {