tdf#68339 Other: BASIC Syntax error

Allow expressions (operands) of comparison operators prefixed with the
Logical Operator "Not".

Change-Id: I1b070e2288dac26b1f1186d38cf5d2f4ad99a406
Reviewed-on: https://gerrit.libreoffice.org/71332
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Jens Carl <j.carl43@gmx.de>

basic/CppunitTest_basic_macros.mk

@@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basic_macros, \
 	basic/qa/cppunit/basictest \
 	basic/qa/cppunit/basic_coverage \
 	basic/qa/cppunit/test_append \
+	basic/qa/cppunit/test_language_conditionals \
 	basic/qa/cppunit/test_nested_struct \
 	basic/qa/cppunit/test_vba \
 ))

basic/qa/cppunit/test_language_conditionals.cxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "basictest.hxx"
+#include <rtl/ustring.hxx>
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+namespace
+{
+class Language_Conditionals : public CppUnit::TestFixture
+{
+public:
+    void testIfNot();
+    void testIfAndNot();
+    void testNENot();
+
+    CPPUNIT_TEST_SUITE(Language_Conditionals);
+
+    CPPUNIT_TEST(testIfNot);
+    CPPUNIT_TEST(testIfAndNot);
+    CPPUNIT_TEST(testNENot);
+
+    CPPUNIT_TEST_SUITE_END();
+};
+
+void Language_Conditionals::testIfNot()
+{
+    { // need a block to ensure MacroSnippet is cleaned properly
+        const OUString aSnippet("Option VBASupport 1\n"
+                                "Option Explicit\n"
+                                "\n"
+                                "Function doUnitTest() As Integer\n"
+                                "Dim op1 As Boolean\n"
+                                "op1 = False\n"
+                                "If Not op1 Then\n"
+                                "doUnitTest = 1\n"
+                                "Else\n"
+                                "doUnitTest = 0\n"
+                                "End If\n"
+                                "End Function\n");
+        MacroSnippet myMacro(aSnippet);
+        myMacro.Compile();
+        CPPUNIT_ASSERT(!myMacro.HasError());
+        SbxVariableRef pNew = myMacro.Run();
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
+    }
+    { // need a block to ensure MacroSnippet is cleaned properly
+        const OUString aSnippet("Option VBASupport 0\n"
+                                "Option Explicit\n"
+                                "\n"
+                                "Function doUnitTest() As Integer\n"
+                                "Dim op1 As Boolean\n"
+                                "op1 = False\n"
+                                "If Not op1 Then\n"
+                                "doUnitTest = 1\n"
+                                "Else\n"
+                                "doUnitTest = 0\n"
+                                "End If\n"
+                                "End Function\n");
+        MacroSnippet myMacro(aSnippet);
+        myMacro.Compile();
+        CPPUNIT_ASSERT(!myMacro.HasError());
+        SbxVariableRef pNew = myMacro.Run();
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
+    }
+}
+
+void Language_Conditionals::testIfAndNot()
+{
+    { // need a block to ensure MacroSnippet is cleaned properly
+        const OUString aSnippet("Option VBASupport 1\n"
+                                "Option Explicit\n"
+                                "\n"
+                                "Function doUnitTest() As Integer\n"
+                                "Dim op1 As Boolean\n"
+                                "Dim op2 As Boolean\n"
+                                "op1 = True\n"
+                                "op2 = False\n"
+                                "If op1 And Not op2 Then\n"
+                                "doUnitTest = 1\n"
+                                "Else\n"
+                                "doUnitTest = 0\n"
+                                "End If\n"
+                                "End Function\n");
+        MacroSnippet myMacro(aSnippet);
+        myMacro.Compile();
+        CPPUNIT_ASSERT(!myMacro.HasError());
+        SbxVariableRef pNew = myMacro.Run();
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
+    }
+    { // need a block to ensure MacroSnippet is cleaned properly
+        const OUString aSnippet("Option VBASupport 0\n"
+                                "Option Explicit\n"
+                                "\n"
+                                "Function doUnitTest() As Integer\n"
+                                "Dim op1 As Boolean\n"
+                                "Dim op2 As Boolean\n"
+                                "op1 = True\n"
+                                "op2 = False\n"
+                                "If op1 And Not op2 Then\n"
+                                "doUnitTest = 1\n"
+                                "Else\n"
+                                "doUnitTest = 0\n"
+                                "End If\n"
+                                "End Function\n");
+        MacroSnippet myMacro(aSnippet);
+        myMacro.Compile();
+        CPPUNIT_ASSERT(!myMacro.HasError());
+        SbxVariableRef pNew = myMacro.Run();
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
+    }
+}
+
+void Language_Conditionals::testNENot()
+{
+    { // need a block to ensure MacroSnippet is cleaned properly
+        const OUString aSnippet("Option VBASupport 1\n"
+                                "Option Explicit\n"
+                                "\n"
+                                "Function doUnitTest() As Integer\n"
+                                "Dim op1 As Boolean\n"
+                                "Dim op2 As Boolean\n"
+                                "op1 = False\n"
+                                "op2 = False\n"
+                                "If op1 <> Not op2 Then\n"
+                                "doUnitTest = 1\n"
+                                "Else\n"
+                                "doUnitTest = 0\n"
+                                "End If\n"
+                                "End Function\n");
+        MacroSnippet myMacro(aSnippet);
+        myMacro.Compile();
+        CPPUNIT_ASSERT(!myMacro.HasError());
+        SbxVariableRef pNew = myMacro.Run();
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
+    }
+    { // need a block to ensure MacroSnippet is cleaned properly
+        const OUString aSnippet("Option VBASupport 0\n"
+                                "Option Explicit\n"
+                                "\n"
+                                "Function doUnitTest() As Integer\n"
+                                "Dim op1 As Boolean\n"
+                                "Dim op2 As Boolean\n"
+                                "op1 = False\n"
+                                "op2 = False\n"
+                                "If op1 <> Not op2 Then\n"
+                                "doUnitTest = 1\n"
+                                "Else\n"
+                                "doUnitTest = 0\n"
+                                "End If\n"
+                                "End Function\n");
+        MacroSnippet myMacro(aSnippet);
+        myMacro.Compile();
+        CPPUNIT_ASSERT(!myMacro.HasError());
+        SbxVariableRef pNew = myMacro.Run();
+        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
+    }
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Language_Conditionals);
+
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

basic/qa/cppunit/test_scanner.cxx

@@ -178,6 +178,7 @@ namespace
     const OUString sourceEE("==");
     const OUString sourceNE("<>");
     const OUString sourceA(":=");
+    const OUString sourceNot("Not");
 
     std::vector<Symbol> symbols;
 
@@ -238,6 +239,13 @@ namespace
     CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
     CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
     CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
+
+    symbols = getSymbols(sourceNot);
+    CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
+    CPPUNIT_ASSERT_EQUAL(sourceNot, symbols[0].text);
+    CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
+    CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
+    CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
   }
 
   void ScannerTest::testAlphanum()

basic/source/comp/exprtree.cxx

@@ -500,6 +500,9 @@ std::unique_ptr<SbiExprNode> SbiExpression::Operand( bool bUsedForTypeOf )
         break;
     case DOT:   // .with
         pRes = Term(); break;
+    case NOT:
+        pRes = VBA_Not();
+        break;
     case NUMBER:
         pParser->Next();
         pRes = std::make_unique<SbiExprNode>( pParser->GetDbl(), pParser->GetType() );