Remove unnecessary vref.Clone() uses; revert check

Author: Enkidu93

src/SIL.Machine/Corpora/ScriptureRef.cs

@@ -87,9 +87,7 @@ public ScriptureRef ToRelaxed()
 
         public ScriptureRef ChangeVersification(ScrVers versification)
         {
-            VerseRef vr = VerseRef.Clone();
-            vr = vr.ChangeVersificationWithSegments(versification);
-            return new ScriptureRef(vr, Path);
+            return new ScriptureRef(VerseRef.ChangeVersificationWithSegments(versification), Path);
         }
 
         int IComparable<ScriptureRef>.CompareTo(ScriptureRef other)

src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs

@@ -67,7 +67,7 @@ string pubNumber
         )
         {
             // Handle non-latin numbers
-            VerseRef verseRef = _curVerseRef.Clone();
+            VerseRef verseRef = _curVerseRef;
             verseRef.TrySetVerseUnicode(number);
 
             if (state.ChapterHasVerseZero && state.VerseRef.VerseNum == 0)
@@ -91,7 +91,7 @@ string pubNumber
             )
             {
                 // merge overlapping verse ranges in to one range
-                verseRef = _curVerseRef.Clone();
+                verseRef = _curVerseRef;
                 verseRef.TrySetVerseUnicode(CorporaUtils.MergeVerseRanges(number, _curVerseRef.Verse));
                 UpdateVerseRef(verseRef, marker);
                 return;

src/SIL.Machine/Corpora/UsfmVersificationErrorDetector.cs

@@ -289,7 +289,7 @@ string pubNumber
             _currentVerse = new VerseRef();
 
             // See whether the chapter number is invalid
-            VerseRef verseRef = state.VerseRef.Clone();
+            VerseRef verseRef = state.VerseRef;
             verseRef.Chapter = number;
             if (verseRef.ChapterNum == -1)
             {
@@ -336,7 +336,7 @@ string pubNumber
             if (!verseInError)
             {
                 // See whether the verse number is invalid
-                VerseRef verseRef = _currentVerse.Clone();
+                VerseRef verseRef = _currentVerse;
                 verseRef.Verse = number;
                 if (verseRef.VerseNum == -1)
                 {

src/SIL.Machine/Corpora/VerseRefComparer.cs

@@ -20,7 +20,8 @@ public VerseRefComparer(bool compareSegments = true)
 
         public int Compare(VerseRef x, VerseRef y)
         {
-            y = y.ChangeVersificationWithSegments(x.Versification);
+            if (x.Versification != y.Versification)
+                y = y.ChangeVersificationWithSegments(x.Versification);
 
             if (!x.HasMultiple && !y.HasMultiple)
             {

src/SIL.Machine/Corpora/VerseRefExtensions.cs

@@ -10,7 +10,7 @@ public static VerseRef RemoveSegments(this VerseRef verseRef)
         {
             if (string.IsNullOrEmpty(verseRef.Segment()))
             {
-                return verseRef.Clone();
+                return verseRef;
             }
             try
             {
@@ -21,15 +21,15 @@ public static VerseRef RemoveSegments(this VerseRef verseRef)
             }
             catch (VerseRefException)
             {
-                VerseRef newVerseRef = verseRef.Clone();
+                VerseRef newVerseRef = verseRef;
                 newVerseRef.Simplify();
                 return newVerseRef;
             }
         }
 
         public static VerseRef ChangeVersificationWithSegments(this VerseRef verseRef, ScrVers versification)
         {
-            VerseRef vr = verseRef.Clone();
+            VerseRef vr = verseRef;
             vr.ChangeVersification(versification);
             if (string.IsNullOrEmpty(vr.Segment()))
                 return vr;