Skip to content

Commit 5456f30

Browse files
committed
Update VBAexpressions.cls
1 parent 250cb4f commit 5456f30

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/VBAexpressions.cls

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,9 @@ err_Handler:
601601
End Function
602602

603603
''' <summary>
604-
''' Method to obtain abstract expressions that do not contemplate the intermediate
605-
''' assignments.
604+
''' Returns an array containing two elements: assignments and expression to be evaluated.
605+
''' The expression to be evaluated must comply with the premise that all assignments are made
606+
''' prior to the expression statement.
606607
''' </summary>
607608
Public Function AbstractAssignments(ByRef aExpression As Variant) As String()
608609
Dim strToEvaluate As String
@@ -666,19 +667,19 @@ Public Function AbstractAssignments(ByRef aExpression As Variant) As String()
666667
Exit Do
667668
End If
668669
Loop
670+
tmpStrAssignments = Join$(Split(tmpStrAssignments, "#"), op_equal) 'Fix representation
669671
If n Then 'Isolate assigments
670672
If n < 2 Then
671673
tmpResult(0) = tmpStrAssignments
672-
tmpResult(1) = Replace(strToEvaluate, Join$(Split(tmpStrAssignments, _
673-
"#"), op_equal) & op_equal, _
674+
tmpResult(1) = Replace(strToEvaluate, tmpStrAssignments & op_equal, _
674675
vbNullString)
675676
Else 'Expressions cannot be assigned a value.
676677
tmpResult(0) = e_InvalidAssignment
677678
tmpResult(1) = e_InvalidAssignment
678679
End If
679680
Else
680-
tmpResult(0) = e_NAError
681-
tmpResult(1) = strToEvaluate
681+
tmpResult(0) = tmpStrAssignments
682+
tmpResult(1) = e_NAError
682683
End If
683684
AbstractAssignments = tmpResult
684685
End Function

0 commit comments

Comments
 (0)