Minor code edits

CBOR/PeterO/Cbor/CBORDataUtilitiesTextString.cs

@@ -30,7 +30,7 @@ internal static CBORObject ParseJSONNumber(
         return null;
       }
 
-      options = options ?? CBORDataUtilities.DefaultOptions;
+      _ = options ?? CBORDataUtilities.DefaultOptions;
       bool preserveNegativeZero = options.PreserveNegativeZero;
       JSONOptions.ConversionMode kind = options.NumberConversion;
       int endPos = offset + count;
@@ -260,14 +260,19 @@ internal static CBORObject ParseJSONNumber(
             chars,
             initialOffset,
             endPos - initialOffset);
-        return ed.IsZero && negative ? ed.Exponent.IsZero ?
-            preserveNegativeZero ?
+        if (ed.IsZero && negative) {
+          if (ed.Exponent.IsZero) {
+            return preserveNegativeZero ?
               CBORObject.FromEDecimal(EDecimal.NegativeZero) :
-              CBORObject.FromInt32(0) :
-            !preserveNegativeZero ? CBORObject.FromEDecimal(ed.Negate()) :
-CBORObject.FromEDecimal(ed) :
-          ed.Exponent.IsZero ? CBORObject.FromEInteger(ed.Mantissa) :
+              CBORObject.FromInt32(0);
+          } else {
+            return !preserveNegativeZero ?
+CBORObject.FromEDecimal(ed.Negate()) : CBORObject.FromEDecimal(ed);
+          }
+        } else {
+          return ed.Exponent.IsZero ? CBORObject.FromEInteger(ed.Mantissa) :
             CBORObject.FromEDecimal(ed);
+        }
       } else if (kind == JSONOptions.ConversionMode.Double) {
         var ef = EFloat.FromString(
             chars,

CBOR/PeterO/Cbor/CBORNumber.cs

@@ -100,7 +100,7 @@ public CBORObject ToCBORObject() {
       if (obj is ERational erf) {
         return CBORObject.FromERational(erf);
       }
-      throw new Exception("Unexpected type: " + obj.GetType());
+      throw new InvalidOperationException("Unexpected type: " + obj.GetType());
     }
 
     /// <summary>Gets this value's sign: -1 if nonzero and negative; 1 if

CBOR/PeterO/Cbor/CBORObject.cs

@@ -590,8 +590,7 @@ public CBORObject GetOrDefault(CBORObject cborkey, CBORObject
       }
       if (this.Type == CBORType.Map) {
         IDictionary<CBORObject, CBORObject> map = this.AsMap();
-        var ckey = cborkey;
-        return PropertyMap.GetOrDefault(map, ckey, defaultValue);
+        return PropertyMap.GetOrDefault(map, cborkey, defaultValue);
       }
       return defaultValue;
     }
@@ -621,8 +620,10 @@ public CBORObject GetOrDefault(int key, CBORObject defaultValue) {
       }
       if (this.Type == CBORType.Map) {
         IDictionary<CBORObject, CBORObject> map = this.AsMap();
-        var ckey = FromInt32(key);
-        return PropertyMap.GetOrDefault(map, ckey, defaultValue);
+        return PropertyMap.GetOrDefault(
+          map,
+          FromInt32(key),
+          defaultValue);
       }
       return defaultValue;
     }
@@ -645,8 +646,10 @@ public CBORObject GetOrDefault(string key, CBORObject defaultValue) {
       }
       if (this.Type == CBORType.Map) {
         IDictionary<CBORObject, CBORObject> map = this.AsMap();
-        var ckey = FromString(key);
-        return PropertyMap.GetOrDefault(map, ckey, defaultValue);
+        return PropertyMap.GetOrDefault(
+          map,
+          FromString(key),
+          defaultValue);
       }
       return defaultValue;
     }
@@ -755,8 +758,7 @@ public CBORObject this[string key]
         if (key == null) {
           throw new ArgumentNullException(nameof(key));
         }
-        var objkey = FromString(key);
-        return this[objkey];
+        return this[FromString(key)];
       }
 
       set {
@@ -766,9 +768,9 @@ public CBORObject this[string key]
         if (value == null) {
           throw new ArgumentNullException(nameof(value));
         }
-        var objkey = FromString(key);
         if (this.Type == CBORType.Map) {
           IDictionary<CBORObject, CBORObject> map = this.AsMap();
+          CBORObject objkey = FromString(key);
           map[objkey] = value;
         } else {
           throw new InvalidOperationException("Not a map");

CBORTest/CBORObjectTest.cs

@@ -649,8 +649,10 @@ public void TestAsInt16() {
           ToObjectTest.TestToFromObjectRoundTrip(
             EDecimal.FromString(numberinfo["number"].AsString()));
         if (numberinfo["int16"].AsBoolean()) {
+          int intForShort = TestCommon.StringToInt(
+             numberinfo["integer"].AsString());
           Assert.AreEqual(
-            TestCommon.StringToInt(numberinfo["integer"].AsString()),
+            (short)intForShort,
             cbornumber.ToObject(typeof(short)));
         } else {
           try {
@@ -9827,39 +9829,45 @@ public void TestFromJsonStringSmallDoubleSpec() {
         Int32.MinValue);
     }
 
+    private static void AreEqualDouble(double a, double b) {
+      if (a != b) {
+        Assert.Fail(a+ ", " + b);
+      }
+    }
+
     [Test]
     [Timeout(10000)]
     public void TestFromJsonStringSmallDouble() {
       CBORObject cbor;
       AssertJSONDouble("0", "double", 0.0);
       cbor = FromJSON("[0, 1, 2, 3]", "double");
       Assert.AreEqual(4, cbor.Count);
-      Assert.AreEqual(0.0, cbor[0].AsDouble());
-      Assert.AreEqual(1.0, cbor[1].AsDouble());
-      Assert.AreEqual(2.0, cbor[2].AsDouble());
-      Assert.AreEqual(3.0, cbor[3].AsDouble());
+      AreEqualDouble(0.0, cbor[0].AsDouble());
+      AreEqualDouble(1.0, cbor[1].AsDouble());
+      AreEqualDouble(2.0, cbor[2].AsDouble());
+      AreEqualDouble(3.0, cbor[3].AsDouble());
       cbor = FromJSON("[0]", "double");
       Assert.AreEqual(1, cbor.Count);
-      Assert.AreEqual(0.0, cbor[0].AsDouble());
+      AreEqualDouble(0.0, cbor[0].AsDouble());
       cbor = FromJSON("[-0]", "double");
       Assert.AreEqual(1, cbor.Count);
       cbor = FromJSON("[1]", "double");
       Assert.AreEqual(1, cbor.Count);
-      Assert.AreEqual(1.0, cbor[0].AsDouble());
+      AreEqualDouble(1.0, cbor[0].AsDouble());
       cbor = FromJSON("[-1]", "double");
       Assert.AreEqual(1, cbor.Count);
-      Assert.AreEqual(-1.0, cbor[0].AsDouble());
+      AreEqualDouble(-1.0, cbor[0].AsDouble());
       cbor = FromJSON("[-1022,-1023,-1024,-1025,1022,1023,1024,1025]",
           "double");
       Assert.AreEqual(8, cbor.Count);
-      Assert.AreEqual(-1022.0, cbor[0].AsDouble());
-      Assert.AreEqual(-1023.0, cbor[1].AsDouble());
-      Assert.AreEqual(-1024.0, cbor[2].AsDouble());
-      Assert.AreEqual(-1025.0, cbor[3].AsDouble());
-      Assert.AreEqual(1022.0, cbor[4].AsDouble());
-      Assert.AreEqual(1023.0, cbor[5].AsDouble());
-      Assert.AreEqual(1024.0, cbor[6].AsDouble());
-      Assert.AreEqual(1025.0, cbor[7].AsDouble());
+      AreEqualDouble(-1022.0, cbor[0].AsDouble());
+      AreEqualDouble(-1023.0, cbor[1].AsDouble());
+      AreEqualDouble(-1024.0, cbor[2].AsDouble());
+      AreEqualDouble(-1025.0, cbor[3].AsDouble());
+      AreEqualDouble(1022.0, cbor[4].AsDouble());
+      AreEqualDouble(1023.0, cbor[5].AsDouble());
+      AreEqualDouble(1024.0, cbor[6].AsDouble());
+      AreEqualDouble(1025.0, cbor[7].AsDouble());
     }
 
     [Test]

CBORTest/CBORTest.cs

@@ -2412,7 +2412,7 @@ public void TestRandomSlightlyModified() {
       for (int i = 0; i < 2000; ++i) {
         CBORObject originalObject = CBORTestCommon.RandomCBORObject(rand);
         byte[] array = originalObject.EncodeToBytes();
-        Console.WriteLine("i=" + i + " obj=" + array.Length);
+        // Console.WriteLine("i=" + i + " obj=" + array.Length);
         TestRandomOne(SlightlyModify(array, rand));
       }
     }