Merge pull request #7 from Theadd/dev-1.6.1

Dev 1.6.1

Author: Theadd

ArrayListLib.twinproj

@@ -32,12 +32,12 @@
 	"project.settingsVersion": 1,
 	"project.useProjectIdForTypeLibraryId": true,
 	"project.versionAutoIncrement": "Revision",
-	"project.versionBuild": 0,
+	"project.versionBuild": 1,
 	"project.versionLegalCopyright": "This is free and unencumbered software released into the public domain. For more information, please refer to <https://unlicense.org>",
 	"project.versionMajor": 1,
 	"project.versionMinor": 6,
 	"project.versionProductName": "ArrayList",
-	"project.versionRevision": 141,
+	"project.versionRevision": 151,
 	"project.warnings": {
 		"errors": [],
 		"ignored": []

ArrayListLib/Settings

@@ -307,8 +307,8 @@ Public Class ArrayList
         ReassignArrayTo ToArray, t
     End Function
 
-    Public Function ToString(Optional TextQualifier As String = "'") As String Implements IArrayList.ToString
-        Return CommonModule.Stringify(Me, TextQualifier)
+    Public Function ToString(Optional TextQualifier As String = """", Optional ByVal UseNullAsEmpty As Boolean = True) As String Implements IArrayList.ToString
+        Return CommonModule.Stringify(Me, TextQualifier, UseNullAsEmpty)
     End Function
 
     Public Sub AddRange(Target As Variant) Implements IArrayList.AddRange

ArrayListLib/Sources/ArrayList.twin

@@ -53,7 +53,7 @@ Public Interface IListRange Extends IList
     Sub RemoveRange(ByVal Index As Long, ByVal GetCount As Long)
     Sub SetRange(ByVal Index As Long, Target As Variant)
     Function ToArray() As Variant()
-    Function ToString(TextQualifier As String) As String
+    Function ToString(TextQualifier As String, ByVal UseNullAsEmpty As Boolean) As String
     [ Description ("Sorts the elements in a section of this list. The sort compares the elements to each other using the given IComparer interface.") ]
     Sub Sort(Optional ByVal Index As Variant, Optional ByVal GetCount As Variant, Optional ByRef Comparer As IComparer = Nothing)
     Function BinarySearch(ByVal Index As Long, ByVal GetCount As Long, ByRef Value As Variant, Optional ByRef Comparer As IComparer = Nothing) As Long

ArrayListLib/Sources/IArrayList.twin

@@ -331,8 +331,8 @@ Public Class ListRange
         ReassignArrayTo ToArray, t
     End Function
 
-    Public Function ToString(Optional TextQualifier As String = "'") As String Implements ArrayList.ToString, IArrayList.ToString
-        Return CommonModule.Stringify(Me, TextQualifier)
+    Public Function ToString(Optional TextQualifier As String = """", Optional ByVal UseNullAsEmpty As Boolean = True) As String Implements ArrayList.ToString, IArrayList.ToString
+        Return CommonModule.Stringify(Me, TextQualifier, UseNullAsEmpty)
     End Function
 
     #Region "HIDDEN METHODS IN MSCORLIB"

ArrayListLib/Sources/ListRange.twin

@@ -1,21 +1,22 @@
 Module CommonModule
 
     [ Hidden ]
-    Public Function Stringify(Value As Variant, TextQualifier As String) As String
+    Public Function Stringify(Value As Variant, TextQualifier As String, ByVal UseNullAsEmpty As Boolean) As String
         Select Case VarType(Value)
             Case vbString: Return TextQualifier & Replace(Value, TextQualifier, TextQualifier & TextQualifier) & TextQualifier
-            Case vbNull, vbEmpty, vbError: Return vbNullString
+            Case vbNull: Return "null"
+            Case vbEmpty, vbError: Return IIf(UseNullAsEmpty, "null", vbNullString)
             Case vbDate: Return TextQualifier & VBA.Format$(ToUTC(CDate(Value)), "yyyy-mm-ddTHH:mm:ss.000Z") & TextQualifier
             Case Is >= vbArray, vbObject
                 Dim v As Variant, s As String
                 On Error Resume Next
                 If IsObject(Value) AndAlso TypeOf Value Is ListRange Then
                     For Each v In CListRange(Value)
-                        s = s & ", " & Stringify(v, TextQualifier)
+                        s = s & ", " & Stringify(v, TextQualifier, UseNullAsEmpty)
                     Next v
                 Else
                     For Each v In Value
-                        s = s & ", " & Stringify(v, TextQualifier)
+                        s = s & ", " & Stringify(v, TextQualifier, UseNullAsEmpty)
                     Next v
                 End If
                 On Error GoTo 0