The GETS function now support list arguments.

Author: ws-garcia

src/LO Basic/VBAExpressionsLib/VBAexpressions.xba

@@ -4954,13 +4954,21 @@ Private Function GETS(ByRef expression As String, ByRef fName As String) As Stri
  UB = UBound(tmpData)
  argsCount = UB - LB + 1
  Select Case argsCount
- Case 2
- tmpEval = tmpData(UB)
- P_SCOPE.LetVarValue(FormatLiteralString(tmpData(LB), True), tmpData(UB))
  Case 1
  Dim varName As String
  varName = FormatLiteralString(tmpData(LB), True)
  tmpEval = P_SCOPE.GetVarValue(varName)
+ Case 2
+ tmpEval = tmpData(UB)
+ P_SCOPE.LetVarValue(FormatLiteralString(tmpData(LB), True), tmpData(UB))
+ Case Is > 2 'List of elements
+ Dim i As Long
+ 
+ tmpEval = tmpData(LB + 1)
+ For i = LB + 2 To UB
+ tmpEval = tmpEval & P_SEPARATORCHAR & tmpData(i)
+ Next i
+ P_SCOPE.LetVarValue(FormatLiteralString(tmpData(LB), True), tmpEval)
  Case Else
  tmpEval = e_ValueError
  BuildErrMessage errMissingArgsOrTooManyArgs, d_lCurly & fName & d_rCurly

src/LO Basic/VBAExpressionsLib/VBAexpressionsScope.xba

@@ -335,15 +335,13 @@ Public Function CopyToScope() As Object
  Dim i As Long
  Dim tmpValue As String
  Dim tmpName As String
- Dim tmpScope As Object
- Dim ConstKey As String
+ Dim tmpScope As VBAexpressionsScope
 
  Set tmpScope = New VBAexpressionsScope
  For i = 0 To P_EXPR_VARIABLES.aindex
  tmpName = P_EXPR_VARIABLES.Storage(i).aName
  tmpValue = P_EXPR_VARIABLES.Storage(i).value
  If tmpValue <> vbNullString Then
-	tmpScope.AddVariable(tmpName, ConstKey)
  tmpScope.LetVarValue(tmpName, tmpValue)
  End If
  Next
@@ -359,24 +357,6 @@ Private Sub ExpandCBbuffer(ByRef aBuffer As ClusterBuffer)
  aBuffer.Storage = tmpBuffer
 End Sub
 
-Public Sub ExtendScope(ByRef sourceScope As Object)
-Dim i As Long
-Dim tmpVar() As String
-Dim varLB As Long
-Dim cKey As String
-Dim cValue As String
-
-With sourceScope
-tmpVar() = Split(.CurrentVariables, "; ")
-varLB = LBound(tmpVar)
-For i=VarLB To UBound(tmpVar)
-AddVariable tmpVar(i), cKey
-cValue = .GetVarValue(tmpVar(i))
-LetVarValue tmpVar(i), cValue
-Next i
-End With
-End Sub
-
 Public Sub FillPredefinedVars()
  Dim i As Long
  Dim tmpIdx As Long

src/VBAexpressions.cls

@@ -4994,13 +4994,21 @@ Private Function GETS(ByRef expression As String, ByRef fName As String) As Stri
  UB = UBound(tmpData)
  argsCount = UB - LB + 1
  Select Case argsCount
- Case 2
- tmpEval = tmpData(UB)
- P_SCOPE.VarValue(FormatLiteralString(tmpData(LB), True)) = tmpData(UB)
  Case 1
  Dim varName As String
  varName = FormatLiteralString(tmpData(LB), True)
  tmpEval = P_SCOPE.VarValue(varName)
+ Case 2
+ tmpEval = tmpData(UB)
+ P_SCOPE.VarValue(FormatLiteralString(tmpData(LB), True)) = tmpData(UB)
+ Case Is > 2 'List of elements
+ Dim i As Long
+ 
+ tmpEval = tmpData(LB + 1)
+ For i = LB + 2 To UB
+ tmpEval = tmpEval & P_SEPARATORCHAR & tmpData(i)
+ Next i
+ P_SCOPE.VarValue(FormatLiteralString(tmpData(LB), True)) = tmpEval
  Case Else
  tmpEval = e_ValueError
  BuildErrMessage errMissingArgsOrTooManyArgs, d_lCurly & fName & d_rCurly