Added support for "bool", "true", and "false" to

the expression parser (also wchar_t) and added a
test case.

llvm-svn: 166131

diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp
index 3d82b12..91db729 100644 (file)
--- a/lldb/source/Expression/ClangExpressionParser.cpp
+++ b/lldb/source/Expression/ClangExpressionParser.cpp
@@ -274,6 +274,8 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
         break;
     }
     
+    m_compiler->getLangOpts().Bool = true;
+    m_compiler->getLangOpts().WChar = true;
     m_compiler->getLangOpts().DebuggerSupport = true; // Features specifically for debugger clients
     if (expr.DesiredResultType() == ClangExpression::eResultTypeId)
         m_compiler->getLangOpts().DebuggerCastResultToId = true;

diff --git a/lldb/test/lang/cpp/bool/Makefile b/lldb/test/lang/cpp/bool/Makefile
new file mode 100644 (file)
index 0000000..314f1cb
--- /dev/null
+++ b/lldb/test/lang/cpp/bool/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules

diff --git a/lldb/test/lang/cpp/bool/TestCPPBool.py b/lldb/test/lang/cpp/bool/TestCPPBool.py
new file mode 100644 (file)
index 0000000..8e1f35d
--- /dev/null
+++ b/lldb/test/lang/cpp/bool/TestCPPBool.py
@@ -0,0 +1,49 @@
+"""
+Tests that bool types work
+"""
+import lldb
+from lldbtest import *
+import lldbutil
+
+class CPPBoolTestCase(TestBase):
+    
+    mydir = os.path.join("lang", "cpp", "bool")
+    
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @dsym_test
+    def test_with_dsym_and_run_command(self):
+        """Test that bool types work in the expression parser"""
+        self.buildDsym()
+        self.static_method_commands()
+
+    @dwarf_test
+    def test_with_dwarf_and_run_command(self):
+        """Test that bool types work in the expression parser"""
+        self.buildDwarf()
+        self.static_method_commands()
+
+    def setUp(self):
+        TestBase.setUp(self)
+    
+    def set_breakpoint(self, line):
+        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", line, num_expected_locations=1, loc_exact=False)
+
+    def static_method_commands(self):
+        """Test that bool types work in the expression parser"""
+        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+
+        self.set_breakpoint(line_number('main.cpp', '// breakpoint 1'))
+
+        self.runCmd("process launch", RUN_SUCCEEDED)
+
+        self.expect("expression -- bool second_bool = my_bool; second_bool",
+                    startstr = "(bool) $0 = false")
+
+        self.expect("expression -- my_bool = true",
+                    startstr = "(bool) $1 = true")
+        
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()

diff --git a/lldb/test/lang/cpp/bool/main.cpp b/lldb/test/lang/cpp/bool/main.cpp
new file mode 100644 (file)
index 0000000..88d02d5
--- /dev/null
+++ b/lldb/test/lang/cpp/bool/main.cpp
@@ -0,0 +1,17 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <stdio.h>
+
+int main()
+{
+  bool my_bool = false;
+
+  printf("%s\n", my_bool ? "true" : "false"); // breakpoint 1
+}