Merge pull request #4 from Theadd/dev-baseIndex

Custom BaseIndex + Enumerator fix

Author: Theadd

ArrayListLib.twinproj

@@ -4,16 +4,18 @@
 	"optimizer.constantFunctionFolding": true,
 	"project.appTitle": "ArrayList",
 	"project.buildPath": "${SourcePath}\\Build\\${ProjectName}_${Architecture}.${FileExtension}",
-	"project.buildType": "ActiveX DLL",
+	"project.buildType": "Package TWINPACK",
 	"project.description": "mscorlib's ArrayList drop-in replacement",
+	"project.disablePackageVBA": false,
+	"project.disablePackageVBRUN": true,
 	"project.dllRegisterLocalMachine": false,
 	"project.exportPathIsV2": true,
 	"project.id": "{8647345A-521F-4728-84BC-0D28FA583254}",
 	"project.isConsoleApplication": true,
 	"project.licence": "Unlicense",
 	"project.name": "ArrayListLib",
 	"project.optionExplicit": true,
-	"project.packageVisibility": "PRIVATE",
+	"project.packageVisibility": "PUBLIC",
 	"project.references": [
 		{
 			"id": "{00020430-0000-0000-C000-000000000046}",
@@ -29,7 +31,7 @@
 	"project.settingsVersion": 1,
 	"project.useProjectIdForTypeLibraryId": true,
 	"project.versionAutoIncrement": "Build",
-	"project.versionBuild": 132,
+	"project.versionBuild": 134,
 	"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": 4,

ArrayListLib/Settings

@@ -31,6 +31,7 @@ Public Class Enumerator
     Private Items() As Variant
     Private CStep As Long
     Private NStep As Long
+    Private IsEnumerating As Boolean
     Private Const E_INVALIDARGS As Long = &H80070057
     Private Const S_OK As Long = 0
     Private Const S_FALSE As Long = 1
@@ -53,6 +54,8 @@ Public Class Enumerator
         PutMem4 ArrPtr(Items) + SAFEARRAY_CELEMENTS_OFFSET, Value
     End Property
 
+    Public Property Get IsAvailable() As Boolean: IsAvailable = Not IsEnumerating: End Property
+    
     Public Sub New()
     End Sub
 
@@ -74,8 +77,13 @@ Public Class Enumerator
         End With
         VBA.PutMemPtr VarPtrArr(Items), VarPtr(sa)
         CStep = GetStep
+        NStep = 0
         MaxValue = GetCount
-        If CStep < 0 Then CIndex = GetCount - 1
+        If CStep < 0 Then
+            CIndex = GetCount - 1
+        Else
+            CIndex = 0
+        End If
     End Sub
 
     [ Enumerator ]
@@ -98,6 +106,7 @@ Public Class Enumerator
                 Err.ReturnHResult = S_OK
             Else
                 If VarPtr(pceltFetched) <> 0 Then pceltFetched = 0
+                IsEnumerating = False
                 Err.ReturnHResult = S_FALSE
             End If
         End If
@@ -114,6 +123,8 @@ Public Class Enumerator
 
     Private Sub Reset() Implements IEnumerator.Reset
         CIndex = If(CStep < 0, MaxValue - 1, 0)
+        NStep = 0
+        IsEnumerating = True
     End Sub
 
     Private Sub Clone(ByRef ppenum As IEnumVARIANT) Implements IEnumerator.Clone

ArrayListLib/Sources/ArrayList.twin

@@ -35,7 +35,7 @@ Public Interface IList Extends ICollection
     Property Get IsReadOnly() As Boolean
     Property Get IsFixedSize() As Boolean
     [ Description ("Returns the index of a particular item. Returns -1 if the item isn't in the list.") ]
-    Function IndexOf(Value As Variant, Optional ByVal Index As Long = 0, Optional ByVal GetCount As Variant) As Long
+    Function IndexOf(Value As Variant, Optional ByVal Index As Variant, Optional ByVal GetCount As Variant) As Long
     [ Description ("Inserts value into the list at position Index. Index must be non-negative and less than or equal to the number of elements in the list. If Index equals the number of items in the list, then value is appended to the end.") ]
     Sub Insert(ByVal Index As Long, Value As Variant)
     [ Description ("Removes an item from the list.") ]
@@ -54,7 +54,7 @@ Public Interface IListRange Extends IList
     Sub SetRange(ByVal Index As Long, Target As Variant)
     Function ToArray() As Variant()
     [ 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 Long = 0, Optional ByVal GetCount As Variant, Optional ByRef Comparer As IComparer = Nothing)
+    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
     [ Hidden ]
     Function GetAddressOfItemAt(Index As Long) As LongPtr
@@ -65,6 +65,8 @@ Public Interface IArrayList Extends IListRange
     Implements ICloneable
 
     Function Clone() As Variant Implements ICloneable.Clone
+    Property Get BaseIndex() As Long
+    Property Let BaseIndex(Value As Long)
     [ Hidden ]
     Property Get Version() As Long
     Property Get Capacity() As Long
@@ -75,5 +77,5 @@ Public Interface IArrayList Extends IListRange
     [ Hidden ]
     Sub CloneTo(ByVal Target As IArrayList, ByRef Source As IArrayList, ByVal Index As Long, ByVal GetCount As Long)
     Function LastIndexOf(ByRef Value As Variant, Optional ByVal Index As Variant, Optional ByVal GetCount As Variant) As Long
-    Sub Reverse(Optional ByVal Index As Long = 0, Optional ByVal GetCount As Variant)
+    Sub Reverse(Optional ByVal Index As Variant, Optional ByVal GetCount As Variant)
 End Interface

ArrayListLib/Sources/Enumerator.twin

@@ -30,14 +30,14 @@ Public Module LibMemoryEx
         With sASrc
             .cDims = 1
             .cbElements = ArrayElementSize
-            .fFeatures = IIf(ArrayElementSize = VARIANT_SIZE, FADF_VARIANT, 0)
+            .fFeatures = Iif(ArrayElementSize = VARIANT_SIZE, FADF_VARIANT, 0)
             .pvData = SourceAddress
             .rgsabound0.cElements = GetCount
         End With
         With sADst
             .cDims = 1
             .cbElements = ArrayElementSize
-            .fFeatures = IIf(ArrayElementSize = VARIANT_SIZE, FADF_VARIANT Or FADF_EMBEDDED, FADF_EMBEDDED)
+            .fFeatures = Iif(ArrayElementSize = VARIANT_SIZE, FADF_VARIANT Or FADF_EMBEDDED, FADF_EMBEDDED)
             .pvData = DestinationAddress
             .rgsabound0.cElements = GetCount
         End With