[Lldb-commits] [lldb] r212246 - Add enumerations for additional languages from DWARF spec updates.

[Bruce Mitchener]

Author: brucem
Date: Wed Jul  2 19:49:08 2014
New Revision: 212246

URL: http://llvm.org/viewvc/llvm-project?rev=212246&view=rev
Log:
Add enumerations for additional languages from DWARF spec updates.

Modified:
    lldb/trunk/include/lldb/lldb-enumerations.h
    lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp
    lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
    lldb/trunk/source/Target/LanguageRuntime.cpp

Modified: lldb/trunk/include/lldb/lldb-enumerations.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-enumerations.h?rev=212246&r1=212245&r2=212246&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-enumerations.h (original)
+++ lldb/trunk/include/lldb/lldb-enumerations.h Wed Jul  2 19:49:08 2014
@@ -369,6 +369,15 @@ namespace lldb {
         eLanguageTypeUPC             = 0x0012,   ///< Unified Parallel C.
         eLanguageTypeD               = 0x0013,   ///< D.
         eLanguageTypePython          = 0x0014,   ///< Python.
+        eLanguageTypeOpenCL          = 0x0015,   ///< OpenCL.
+        eLanguageTypeGo              = 0x0016,   ///< Go.
+        eLanguageTypeModula3         = 0x0017,   ///< Modula 3.
+        eLanguageTypeHaskell         = 0x0018,   ///< Haskell.
+        eLanguageTypeC_plus_plus_03  = 0x0019,   ///< ISO C++:2003.
+        eLanguageTypeC_plus_plus_11  = 0x001a,   ///< ISO C++:2011.
+        eLanguageTypeOCaml           = 0x001b,   ///< OCaml.
+        eLanguageTypeRust            = 0x001c,   ///< Rust.
+        eLanguageTypeC11             = 0x001d,   ///< ISO C:2011.
         eNumLanguageTypes
     } LanguageType;
 

Modified: lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp?rev=212246&r1=212245&r2=212246&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp Wed Jul  2 19:49:08 2014
@@ -154,9 +154,12 @@ public:
                         case eLanguageTypeC89:
                         case eLanguageTypeC:
                         case eLanguageTypeC99:
+                        case eLanguageTypeC11:
                             m_language = eLanguageTypeC;
                             break;
                         case eLanguageTypeC_plus_plus:
+                        case eLanguageTypeC_plus_plus_03:
+                        case eLanguageTypeC_plus_plus_11:
                             m_language = eLanguageTypeC_plus_plus;
                             break;
                         case eLanguageTypeObjC:

Modified: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp?rev=212246&r1=212245&r2=212246&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp Wed Jul  2 19:49:08 2014
@@ -289,7 +289,9 @@ ItaniumABILanguageRuntime::CreateInstanc
 {
     // FIXME: We have to check the process and make sure we actually know that this process supports
     // the Itanium ABI.
-    if (language == eLanguageTypeC_plus_plus)
+    if (language == eLanguageTypeC_plus_plus ||
+        language == eLanguageTypeC_plus_plus_03 ||
+        language == eLanguageTypeC_plus_plus_11)
         return new ItaniumABILanguageRuntime (process);
     else
         return NULL;

Modified: lldb/trunk/source/Target/LanguageRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/LanguageRuntime.cpp?rev=212246&r1=212245&r2=212246&view=diff
==============================================================================
--- lldb/trunk/source/Target/LanguageRuntime.cpp (original)
+++ lldb/trunk/source/Target/LanguageRuntime.cpp Wed Jul  2 19:49:08 2014
@@ -307,6 +307,15 @@ struct language_name_pair language_names
     {   "upc",              eLanguageTypeUPC            },
     {   "d",                eLanguageTypeD              },
     {   "python",           eLanguageTypePython         },
+    {   "opencl",           eLanguageTypeOpenCL         },
+    {   "go",               eLanguageTypeGo             },
+    {   "modula3",          eLanguageTypeModula3        },
+    {   "haskell",          eLanguageTypeHaskell        },
+    {   "c++03",            eLanguageTypeC_plus_plus_03 },
+    {   "c++11",            eLanguageTypeC_plus_plus_11 },
+    {   "ocaml",            eLanguageTypeOCaml          },
+    {   "rust",             eLanguageTypeRust           },
+    {   "c11",              eLanguageTypeC11            },
     // Now synonyms, in arbitrary order
     {   "objc",             eLanguageTypeObjC           },
     {   "objc++",           eLanguageTypeObjC_plus_plus }