v3.2.7

Author: ws-garcia

src/LO Basic/VBAExpressionsLib/TestVBAExpr.xba renamed to src/LO Basic/VBAExpressionsLib/TestRunner.xba

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="TestVBAExpr" script:language="StarBasic">Option Explicit
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="TestRunner" script:language="StarBasic">Option Explicit
 Private Evaluator As Object
 Private actual As String
 Private sAcum As Long
@@ -459,20 +459,4 @@ TestFail:
     SF_Exception.debugprint(&quot;Test &quot; &amp; testName &amp; &quot; raised an error: #&quot; &amp; err.Number &amp; &quot; - &quot; &amp; err.Description)
     Resume TestExit			
 End Sub
-sub testOver
-	&apos;msgbox (&quot;a{2}&quot; Like &quot;[A-Zaz]*{*}&quot;)
-	SF_Exception.consoleClear()
-&apos;	Run( _
-&apos;			&quot;IRR_ function test&quot;, _
-&apos;			&quot;FORMAT(IRR({{-70000;12000;15000}};true);&apos;Percent&apos;)&quot;, _
-&apos;			&quot;&apos;-44.35%&apos;&quot; _
-&apos;		)
-	Run( _
-			&quot;Variables overloading&quot;, _
-			&quot;SUM(C[0;0];C[1;1])&quot;, _
-			&quot;14&quot;, _
-			&quot;C = {{-1;13};{6;15}}&quot; _
-		)
-	SF_Exception.console()
-end sub
 </script:module>

src/LO Basic/VBAExpressionsLib/VBAexpressions.xba

@@ -2219,7 +2219,8 @@ Public Function Create(ByRef aExpression As Variant, Optional resetScope As Bool
             Else
                 ParseVariables(ExprToEval)
             End If
-            ExprToEval = SBracketsNotationToNominal(ReplaceImpliedMult(ExprToEval))
+            ExprToEval = ReconstructLiteralStrings(P_EXPRESSION, _
+                                SBracketsNotationToNominal(ReplaceImpliedMult(ExprToEval)))
             Parse(ExprToEval)
         End If
         AssignedExpression = True

src/LO Basic/VBAExpressionsLib/script.xlb

@@ -3,8 +3,8 @@
 <library:library xmlns:library="http://openoffice.org/2000/library" library:name="VBAExpressionsLib" library:readonly="false" library:passwordprotected="false">
  <library:element library:name="VBAexpressionsScope"/>
  <library:element library:name="VBAstrHelper"/>
- <library:element library:name="TestVBAExpr"/>
+ <library:element library:name="UDFunctions"/>
  <library:element library:name="VBAexpressions"/>
  <library:element library:name="VBAcallBack"/>
- <library:element library:name="UDFunctions"/>
+ <library:element library:name="TestRunner"/>
 </library:library>

src/LO Basic/release-notes_en.txt

@@ -1,5 +1,3 @@
-# Reaffirmation!
+# A note on!
 ## Bug Fix
-- [x] Resolved several collisions when analysing expressions with implicit functions and multiplications.
-## Changes
-- [x] Added update functionality for the LO extension.
+- [x] Resolved error when parsing literal strings with reserved grammar tokens.

src/VBAexpressions.cls

@@ -2241,7 +2241,8 @@ Public Function Create(ByRef aExpression As Variant, Optional resetScope As Bool
             Else
                 ParseVariables ExprToEval
             End If
-            ExprToEval = SBracketsNotationToNominal(ReplaceImpliedMult(ExprToEval))
+            ExprToEval = ReconstructLiteralStrings(P_EXPRESSION, _
+                                SBracketsNotationToNominal(ReplaceImpliedMult(ExprToEval)))
             Parse ExprToEval
         End If
         AssignedExpression = True