commit 0e0984eebb0314f980ee9d2737e3b93ecab13d5a
author Jim Ingham <jingham@apple.com> Wed Sep 02 01:06:46 2015 +0000
committer Jim Ingham <jingham@apple.com> Wed Sep 02 01:06:46 2015 +0000
tree 53327574c5cf5de54f7ec37839266f2d24de6e8b
parent bb0cef6e9c97c09889a0a9af93d4d1e82549a812

Move things from the LanguageRuntime that obviously belong in the new Language plugin instead.

llvm-svn: 246611

lldb/source/Core/FormatEntity.cpp

diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp
index 4e02588..fd68e57 100644
--- a/lldb/source/Core/FormatEntity.cpp
+++ b/lldb/source/Core/FormatEntity.cpp
@@ -31,7 +31,7 @@
 #include "lldb/Symbol/Symbol.h"
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/LanguageRuntime.h"
+#include "lldb/Target/Language.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/SectionLoadList.h"
@@ -1529,7 +1529,7 @@
                 CompileUnit *cu = sc->comp_unit;
                 if (cu)
                 {
-                    const char *lang_name = LanguageRuntime::GetNameForLanguageType(cu->GetLanguage());
+                    const char *lang_name = Language::GetNameForLanguageType(cu->GetLanguage());
                     if (lang_name)
                     {
                         s.PutCString(lang_name);

lldb/source/Core/Module.cpp

diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index 23d426d..90c9aad 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -29,6 +29,7 @@
 #include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Symbol/SymbolVendor.h"
 #include "lldb/Target/CPPLanguageRuntime.h"
+#include "lldb/Target/Language.h"
 #include "lldb/Target/ObjCLanguageRuntime.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/SectionLoadList.h"
@@ -1783,17 +1784,17 @@
         if (CPPLanguageRuntime::IsCPPMangledName (name_cstr))
             lookup_name_type_mask = eFunctionNameTypeFull;
         else if ((language == eLanguageTypeUnknown ||
-                  LanguageRuntime::LanguageIsObjC(language)) &&
+                  Language::LanguageIsObjC(language)) &&
                  ObjCLanguageRuntime::IsPossibleObjCMethodName (name_cstr))
             lookup_name_type_mask = eFunctionNameTypeFull;
-        else if (LanguageRuntime::LanguageIsC(language))
+        else if (Language::LanguageIsC(language))
         {
             lookup_name_type_mask = eFunctionNameTypeFull;
         }
         else
         {
             if ((language == eLanguageTypeUnknown ||
-                 LanguageRuntime::LanguageIsObjC(language)) &&
+                 Language::LanguageIsObjC(language)) &&
                 ObjCLanguageRuntime::IsPossibleObjCSelector(name_cstr))
                 lookup_name_type_mask |= eFunctionNameTypeSelector;