v3.2.3

Author: ws-garcia

src/LO Basic/VBAExpressionsLib/VBAexpressions.xba

@@ -2171,7 +2171,7 @@ Private Function Compute() As String
             If Not EvalTree(B).CompArrCluster Then   'Function Argument
                 EvalTree(B).EvalResult = Join$(tmpResult, P_SEPARATORCHAR)
             Else        'Array function Argument
-                EvalTree(B).EvalResult = JoinArrFunctArg(tmpResult, EvalTree(B).ClusterArrBounds(0), EvalTree(B).ClusterArrBounds(1))
+                EvalTree(B).EvalResult = JoinArrFunctArg(tmpResult, EvalTree(B).ClusterArrBounds)
             End If
         End If
     Next B
@@ -2959,6 +2959,22 @@ Private Sub ExpandCBbuffer(ByRef aBuffer As ClusterBuffer)
     aBuffer.Storage = tmpBuffer
 End Sub
 
+Private Sub ExpandCompositeArg(ByRef outBuffer As ClusterTree, ByRef tmpReplacement As String, _
+                            ByRef ExpCopy As String, ByRef tmpArgs() As String, _
+                            ByRef taIcounter As Long, ByRef OperationIndex As Long)
+    outBuffer.ClusterArrBounds = SplitArrBranch(ExpCopy, tmpArgs)
+    If outBuffer.ClusterArrBounds(0) <> -1 Then  'Splitting argument success
+        For taIcounter = LBound(tmpArgs) To UBound(tmpArgs)
+            GetRootedTree tmpArgs(taIcounter), tmpReplacement, OperationIndex, outBuffer
+            AddToMap outBuffer.aindex, outBuffer
+        Next taIcounter
+        outBuffer.CompCluster = True
+        outBuffer.CompArrCluster = True
+    Else
+        'Todo: Code here for trap error of missing {} in a composite array input
+    End If
+End Sub
+
 Private Function ExpEuler(ByRef expression As String, ByRef fName As String) As String
     On Error GoTo err_Handler
     ExpEuler = CStr(Exp(CDbl(expression)))
@@ -3198,10 +3214,12 @@ End Function
 
 Private Function FormatEntry(expression As String) As String
     FormatEntry = ReplaceImpliedMult( _
-                                Replace(Replace(Replace(RemoveDupNegation(ApplyLawOfSigns _
-                                (ReconstructLiteralStrings(CStr(expression), _
-                                Join(Split(expression, d_Space), vbNullString)))), "()", "('')"), "{{", "({{"), "}}", "}})") _
-                                )
+                                Replace( _
+                                    RemoveDupNegation( _
+                                        ApplyLawOfSigns( _
+                                        ReconstructLiteralStrings( _
+                                        expression, Join$(Split(expression, d_Space), vbNullString)))), _
+                                    "()", "('')"))
 End Function
 
 Private Function FormatLiteralString(ByRef aString As String, _
@@ -5330,30 +5348,78 @@ err_Handler:
     err.Clear
 End Function
 
-Private Function JoinArrFunctArg(ByRef DecompArray() As String, ByRef MaxRowIndex As Long, ByRef MaxColIndex As Long) As String
+Private Function JoinArrFunctArg(ByRef DecompArray() As String, ByRef MapedIdx() As Long) As String
     Dim tmpResult As String
+    Dim tmpArray As String
+    Dim MaxRowIndex As Long
+    Dim MaxColIndex As Long
     Dim i As Long, j As Long
-    
-    If MaxColIndex > -1 Then
-        For i = 0 To MaxRowIndex
-            For j = 0 To MaxColIndex
-                If j = 0 Then
-                    tmpResult = tmpResult & d_lCurly & DecompArray(j + (i * (MaxColIndex + 1)))
+    Dim k As Long
+    Dim UB As Long
+    Dim wIdx As Long
+    
+    UB = UBound(MapedIdx)
+    For k = LBound(MapedIdx) To UB
+        If MapedIdx(k) <> -2 Then
+            MaxRowIndex = MapedIdx(k)
+            If MapedIdx(k + 1) <> -3 Then '2D Array
+                MaxColIndex = MapedIdx(k + 1)
+            Else 'Vector
+                MaxColIndex = 0
+            End If
+            tmpArray = vbNullString
+            For i = 0 To MaxRowIndex
+                If MapedIdx(k + 1) <> -3 And MaxColIndex > 0 Then
+                    For j = 0 To MaxColIndex
+                        If j = 0 Then
+                            tmpArray = tmpArray & d_lCurly & _
+                                                DecompArray(j + (i * (MaxColIndex + 1)) + wIdx)
+                        Else
+                            tmpArray = tmpArray & P_SEPARATORCHAR & DecompArray(j + (i * (MaxColIndex + 1)) + wIdx)
+                        End If
+                        If j = MaxColIndex Then
+                            tmpArray = tmpArray & d_rCurly
+                        End If
+                    Next j
                 Else
-                    tmpResult = tmpResult & P_SEPARATORCHAR & DecompArray(j + (i * (MaxColIndex + 1)))
+                    If i = 0 Then
+                        tmpArray = tmpArray & d_lCurly & DecompArray((i * (MaxColIndex + 1)) + wIdx)
+                    Else
+                        tmpArray = tmpArray & DecompArray((i * (MaxColIndex + 1)) + wIdx)
+                    End If
+                    If i = MaxRowIndex Then
+                        tmpArray = tmpArray & d_rCurly
+                    End If
                 End If
-                If j = MaxColIndex Then
-                    tmpResult = tmpResult & d_rCurly
+                If i < MaxRowIndex Then
+                    tmpArray = tmpArray & P_SEPARATORCHAR
                 End If
-            Next j
-            If i < MaxRowIndex Then
-                tmpResult = tmpResult & P_SEPARATORCHAR
+            Next i
+            If MapedIdx(k + 1) <> -3 Then
+                tmpArray = d_lCurly & tmpArray & d_rCurly
+                If MaxColIndex > 0 Then
+                    wIdx = wIdx + i * j
+                Else
+                    wIdx = wIdx + i
+                End If
+            Else
+                wIdx = wIdx + i
             End If
-        Next i
-    Else
-        tmpResult = d_lCurly & Join$(DecompArray, P_SEPARATORCHAR) & d_rCurly
-    End If
-    JoinArrFunctArg = d_lCurly & tmpResult & d_rCurly
+            tmpResult = tmpResult & tmpArray
+            k = k + 1
+        Else
+            If tmpResult <> vbNullString Then
+                tmpResult = tmpResult & DecompArray(wIdx)
+            Else
+                tmpResult = DecompArray(wIdx)
+            End If
+            wIdx = wIdx + 1
+        End If
+        If k < UB Then
+            tmpResult = tmpResult & P_SEPARATORCHAR
+        End If
+    Next k
+    JoinArrFunctArg = tmpResult
 End Function
 
 Private Function LCase_(ByRef expression As String, ByRef fName As String) As String
@@ -8188,24 +8254,75 @@ End Function
 ''' <param name="outArr">Array to be scanned and overwritten.</param>
 Private Function SplitArrBranch(ByRef Argument As String, ByRef outArr() As String) As Variant
     Dim tmpArr() As String
-    Dim tmpResult(0 To 1) As Long
-    
-    tmpArr() = ArrayFromString(Argument)
-    If IsArrayAllocated(tmpArr) Then 'Transform success
-        If Is2Darray(tmpArr) Then
-            outArr = ArraySTR1DFrom2DArr(tmpArr)
-            tmpResult(0) = UBound(tmpArr)   'Rows in the array
-            tmpResult(1) = UBound(tmpArr, 2)  'Columns in each row
+    Dim tmpArgs() As String
+    Dim tmpResult() As Long
+    Dim tmpOutArr() As String
+    Dim i As Long
+    Dim j As Long
+    Dim k As Long
+    Dim m As Long
+    Dim n As Long
+    Dim UB As Long
+    Dim usedIdx As Long
+    
+    tmpArgs() = SplitArgs(Argument)
+    UB = UBound(tmpArgs)
+    ReDim tmpResult(0 To 2 * (UB + 1))
+    ReDim outArr(0 To 0)
+    For i = 0 To UB
+        If (tmpArgs(i) Like "{{*}}") Then ' Array
+            tmpArr() = ArrayFromString(tmpArgs(i))
+            If IsArrayAllocated(tmpArr) Then 'Transform success
+                If Is2Darray(tmpArr) Then
+                    tmpOutArr = ArraySTR1DFrom2DArr(tmpArr)
+                    tmpResult(j) = UBound(tmpArr)   'Rows in the array
+                    tmpResult(j + 1) = UBound(tmpArr, 2) 'Columns in each row
+                Else
+                    tmpOutArr = tmpArr
+                    tmpResult(j) = UBound(tmpArr)
+                    tmpResult(j + 1) = 0
+                End If
+                j = j + 2 'Worked array elements
+            Else
+                GoTo Err_return
+            End If
         Else
-            outArr = tmpArr
-            tmpResult(0) = UBound(tmpArr)
-            tmpResult(1) = -1
+            If (tmpArgs(i) Like "{*}") Then ' Vector
+                tmpArr() = Split(strVBA.MidB(tmpArgs(i), 3, strVBA.LenB2(tmpArgs(i)) - 4), P_SEPARATORCHAR)
+                If IsArrayAllocated(tmpArr) Then
+                    tmpOutArr = tmpArr
+                    tmpResult(j) = UBound(tmpArr)
+                    tmpResult(j + 1) = -3
+                    j = j + 2
+                Else
+                    GoTo Err_return
+                End If
+            Else ' Single data
+                ReDim tmpArr(0 To 0)
+                tmpArr(0) = tmpArgs(i)
+                tmpOutArr = tmpArr
+                tmpResult(j) = -2 'Single data type
+                j = j + 1
+            End If
         End If
-    Else
-        tmpResult(0) = -1   'Return error values
-        tmpResult(1) = -1
-    End If
+        m = UBound(outArr)
+        n = UBound(tmpOutArr) + 1
+        ReDim Preserve outArr(0 To m + n)
+        For k = 0 To n - 1
+            outArr(usedIdx) = tmpOutArr(k)
+            usedIdx = usedIdx + 1
+        Next k
+    Next i
+    ReDim Preserve tmpResult(0 To j - 1)
+    ReDim Preserve outArr(0 To usedIdx - 1)
+nReturn:
     SplitArrBranch = tmpResult
+    Exit Function
+Err_return:
+    ReDim tmpResult(0 To 1)
+    tmpResult(0) = -1   'Return error values
+    tmpResult(1) = -1
+    Resume nReturn
 End Function
 
 Private Sub SplitToken(ByRef expression As String, ByRef oArray() As String, ByRef OPtoken As OperatorToken)
@@ -8784,31 +8901,25 @@ Private Sub TokenizeSubExpr(ByRef expression As String, ByRef SubExpressionsData
     ExpCopy = expression
     tmpReplacement = GetSubstStr(OperationIndex)
     If Not (ExpCopy Like "*{{*}}*") Then
-        Select Case strVBA.InStrB(1, ExpCopy, P_SEPARATORCHAR)
+        Select Case strVBA.InstrB(1, ExpCopy, P_SEPARATORCHAR)
             Case 0 'Regular sub-expression
                 GetRootedTree ExpCopy, tmpReplacement, OperationIndex, outBuffer
                 outBuffer.CompCluster = False
             Case Else 'Composite function argument
-                tmpArgs() = SplitArgs(ExpCopy)
-                For taIcounter = LBound(tmpArgs) To UBound(tmpArgs)
-                    GetRootedTree tmpArgs(taIcounter), tmpReplacement, OperationIndex, outBuffer
-                    AddToMap outBuffer.aindex, outBuffer
-                Next taIcounter
-                outBuffer.CompCluster = True
-                outBuffer.CompArrCluster = False
+                If Not (ExpCopy Like "*{*}*") Then
+                    tmpArgs() = SplitArgs(ExpCopy)
+                    For taIcounter = LBound(tmpArgs) To UBound(tmpArgs)
+                        GetRootedTree tmpArgs(taIcounter), tmpReplacement, OperationIndex, outBuffer
+                        AddToMap outBuffer.aindex, outBuffer
+                    Next taIcounter
+                    outBuffer.CompCluster = True
+                    outBuffer.CompArrCluster = False
+                Else
+                    ExpandCompositeArg outBuffer, tmpReplacement, ExpCopy, tmpArgs, taIcounter, OperationIndex
+                End If
         End Select
     Else    'Composite array function argument
-        outBuffer.ClusterArrBounds = SplitArrBranch(ExpCopy, tmpArgs)
-        If outBuffer.ClusterArrBounds(0) <> -1 Then 'Splitting argument success
-            For taIcounter = LBound(tmpArgs) To UBound(tmpArgs)
-                GetRootedTree tmpArgs(taIcounter), tmpReplacement, OperationIndex, outBuffer
-                AddToMap outBuffer.aindex, outBuffer
-            Next taIcounter
-            outBuffer.CompCluster = True
-            outBuffer.CompArrCluster = True
-        Else
-            'Todo: Code here for trap error of missing () in a composite array and standard input
-        End If
+        ExpandCompositeArg outBuffer, tmpReplacement, ExpCopy, tmpArgs, taIcounter, OperationIndex
     End If
 End Sub