Skip to content

Commit

Permalink
Rename clang_type -> compiler_type for variables.
Browse files Browse the repository at this point in the history 
Reviewers: clayborg

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D13102

llvm-svn: 248461
  • Loading branch information
@waywardmonkeys
waywardmonkeys committed Sep 24, 2015
1 parent 74621cc commit 3ad353f
Show file tree
Hide file tree
Showing 69 changed files with 685 additions and 685 deletions.
4 changes: 2 additions & 2 deletions lldb/include/lldb/Core/Value.h
View file
Expand Up @@ -136,7 +136,7 @@ class Value
GetCompilerType();

void
SetCompilerType (const CompilerType &clang_type);
SetCompilerType (const CompilerType &compiler_type);

ValueType
GetValueType() const;
Expand Down Expand Up @@ -288,7 +288,7 @@ class Value
protected:
Scalar m_value;
Vector m_vector;
CompilerType m_clang_type;
CompilerType m_compiler_type;
void * m_context;
ValueType m_value_type;
ContextType m_context_type;
Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/Core/ValueObject.h
View file
Expand Up @@ -408,7 +408,7 @@ class ValueObject : public UserID
GetObjectRuntimeLanguage();

virtual uint32_t
GetTypeInfo (CompilerType *pointee_or_element_clang_type = NULL);
GetTypeInfo (CompilerType *pointee_or_element_compiler_type = NULL);

virtual bool
IsPointerType ();
Expand Down Expand Up @@ -746,7 +746,7 @@ class ValueObject : public UserID
GetCPPVTableAddress(AddressType &address_type);

virtual lldb::ValueObjectSP
Cast (const CompilerType &clang_ast_type);
Cast (const CompilerType &compiler_type);

virtual lldb::ValueObjectSP
CastPointerType (const char *name,
Expand Down
6 changes: 3 additions & 3 deletions lldb/include/lldb/Core/ValueObjectChild.h
View file
Expand Up @@ -92,10 +92,10 @@ class ValueObjectChild : public ValueObject
virtual CompilerType
GetCompilerTypeImpl ()
{
return m_clang_type;
return m_compiler_type;
}

CompilerType m_clang_type;
CompilerType m_compiler_type;
ConstString m_type_name;
uint64_t m_byte_size;
int32_t m_byte_offset;
Expand All @@ -114,7 +114,7 @@ class ValueObjectChild : public ValueObject
friend class ValueObjectConstResult;
friend class ValueObjectConstResultImpl;
ValueObjectChild (ValueObject &parent,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
uint64_t byte_size,
int32_t byte_offset,
Expand Down
14 changes: 7 additions & 7 deletions lldb/include/lldb/Core/ValueObjectConstResult.h
View file
Expand Up @@ -34,14 +34,14 @@ class ValueObjectConstResult : public ValueObject

static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
const DataExtractor &data,
lldb::addr_t address = LLDB_INVALID_ADDRESS);

static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
const lldb::DataBufferSP &result_data_sp,
lldb::ByteOrder byte_order,
Expand All @@ -50,7 +50,7 @@ class ValueObjectConstResult : public ValueObject

static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
lldb::addr_t address,
AddressType address_type,
Expand Down Expand Up @@ -132,7 +132,7 @@ class ValueObjectConstResult : public ValueObject
GetPreferredDisplayLanguage ();

virtual lldb::ValueObjectSP
Cast (const CompilerType &clang_ast_type);
Cast (const CompilerType &compiler_type);

protected:
virtual bool
Expand All @@ -154,21 +154,21 @@ class ValueObjectConstResult : public ValueObject
lldb::addr_t address);

ValueObjectConstResult (ExecutionContextScope *exe_scope,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
const DataExtractor &data,
lldb::addr_t address);

ValueObjectConstResult (ExecutionContextScope *exe_scope,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
const lldb::DataBufferSP &result_data_sp,
lldb::ByteOrder byte_order,
uint32_t addr_size,
lldb::addr_t address);

ValueObjectConstResult (ExecutionContextScope *exe_scope,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
lldb::addr_t address,
AddressType address_type,
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectConstResultCast.h
View file
Expand Up @@ -58,7 +58,7 @@ class ValueObjectConstResultCast : public ValueObjectCast
uint32_t item_count = 1) override;

lldb::ValueObjectSP
Cast (const CompilerType &clang_ast_type) override;
Cast (const CompilerType &compiler_type) override;

protected:
ValueObjectConstResultImpl m_impl;
Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/Core/ValueObjectConstResultChild.h
View file
Expand Up @@ -27,7 +27,7 @@ class ValueObjectConstResultChild : public ValueObjectChild
public:

ValueObjectConstResultChild (ValueObject &parent,
const CompilerType &clang_type,
const CompilerType &compiler_type,
const ConstString &name,
uint32_t byte_size,
int32_t byte_offset,
Expand Down Expand Up @@ -63,7 +63,7 @@ class ValueObjectConstResultChild : public ValueObjectChild
uint32_t item_count = 1) override;

lldb::ValueObjectSP
Cast (const CompilerType &clang_ast_type) override;
Cast (const CompilerType &compiler_type) override;

protected:
ValueObjectConstResultImpl m_impl;
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectConstResultImpl.h
View file
Expand Up @@ -54,7 +54,7 @@ class ValueObjectConstResultImpl
}

lldb::ValueObjectSP
Cast (const CompilerType &clang_ast_type);
Cast (const CompilerType &compiler_type);

void
SetLiveAddress(lldb::addr_t addr = LLDB_INVALID_ADDRESS,
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectMemory.h
View file
Expand Up @@ -71,7 +71,7 @@ class ValueObjectMemory : public ValueObject

Address m_address; ///< The variable that this value object is based upon
lldb::TypeSP m_type_sp;
CompilerType m_clang_type;
CompilerType m_compiler_type;

private:
ValueObjectMemory (ExecutionContextScope *exe_scope,
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectRegister.h
View file
Expand Up @@ -177,7 +177,7 @@ class ValueObjectRegister : public ValueObject
RegisterInfo m_reg_info;
RegisterValue m_reg_value;
ConstString m_type_name;
CompilerType m_clang_type;
CompilerType m_compiler_type;

private:
void
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Expression/ASTDumper.h
View file
Expand Up @@ -27,7 +27,7 @@ class ASTDumper
ASTDumper (const clang::Type *type);
ASTDumper (clang::QualType type);
ASTDumper (lldb::opaque_compiler_type_t type);
ASTDumper (const CompilerType &clang_type);
ASTDumper (const CompilerType &compiler_type);

const char *GetCString();
void ToSTDERR();
Expand Down
6 changes: 3 additions & 3 deletions lldb/include/lldb/Expression/ClangASTSource.h
View file
Expand Up @@ -389,7 +389,7 @@ class ClangASTSource :
/// The source AST context, typically the AST context of whatever
/// symbol file the type was found in.
///
/// @param[in] clang_type
/// @param[in] src_type
/// The source type.
///
/// @return
Expand Down Expand Up @@ -495,10 +495,10 @@ struct NameSearchContext {
/// Create a TypeDecl with the name being searched for and the provided
/// type and register it in the right places.
///
/// @param[in] type
/// @param[in] compiler_type
/// The opaque QualType for the TypeDecl being registered.
//------------------------------------------------------------------
clang::NamedDecl *AddTypeDecl(const CompilerType &clang_type);
clang::NamedDecl *AddTypeDecl(const CompilerType &compiler_type);


//------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/Expression/ExpressionVariable.h
View file
Expand Up @@ -95,9 +95,9 @@ class ExpressionVariable :
}

void
SetCompilerType(const CompilerType &clang_type)
SetCompilerType(const CompilerType &compiler_type)
{
m_frozen_sp->GetValue().SetCompilerType(clang_type);
m_frozen_sp->GetValue().SetCompilerType(compiler_type);
}

void
Expand Down
14 changes: 7 additions & 7 deletions lldb/include/lldb/Symbol/ClangASTContext.h
View file
Expand Up @@ -253,7 +253,7 @@ class ClangASTContext : public TypeSystem
CompilerType
GetTypeForIdentifier (const ConstString &type_name)
{
CompilerType clang_type;
CompilerType compiler_type;

if (type_name.GetLength())
{
Expand All @@ -269,12 +269,12 @@ class ClangASTContext : public TypeSystem
{
clang::NamedDecl *named_decl = result[0];
if (const RecordDeclType *record_decl = llvm::dyn_cast<RecordDeclType>(named_decl))
clang_type.SetCompilerType(ast, clang::QualType(record_decl->getTypeForDecl(), 0));
compiler_type.SetCompilerType(ast, clang::QualType(record_decl->getTypeForDecl(), 0));
}
}
}

return clang_type;
return compiler_type;
}

CompilerType
Expand Down Expand Up @@ -707,7 +707,7 @@ class ClangASTContext : public TypeSystem
GetTypeName (lldb::opaque_compiler_type_t type) override;

uint32_t
GetTypeInfo (lldb::opaque_compiler_type_t type, CompilerType *pointee_or_element_clang_type) override;
GetTypeInfo (lldb::opaque_compiler_type_t type, CompilerType *pointee_or_element_compiler_type) override;

lldb::LanguageType
GetMinimumLanguage (lldb::opaque_compiler_type_t type) override;
Expand Down Expand Up @@ -959,12 +959,12 @@ class ClangASTContext : public TypeSystem

static bool
SetObjCSuperClass (const CompilerType& type,
const CompilerType &superclass_clang_type);
const CompilerType &superclass_compiler_type);

static bool
AddObjCClassProperty (const CompilerType& type,
const char *property_name,
const CompilerType &property_clang_type,
const CompilerType &property_compiler_type,
clang::ObjCIvarDecl *ivar_decl,
const char *property_setter_name,
const char *property_getter_name,
Expand All @@ -974,7 +974,7 @@ class ClangASTContext : public TypeSystem
static clang::ObjCMethodDecl *
AddMethodToObjCObjectType (const CompilerType& type,
const char *name, // the full symbol name as seen in the symbol table (lldb::opaque_compiler_type_t type, "-[NString stringWithCString:]")
const CompilerType &method_clang_type,
const CompilerType &method_compiler_type,
lldb::AccessType access,
bool is_artificial);

Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/Symbol/CompilerType.h
View file
Expand Up @@ -220,7 +220,7 @@ class CompilerType
GetDisplayTypeName () const;

uint32_t
GetTypeInfo (CompilerType *pointee_or_element_clang_type = NULL) const;
GetTypeInfo (CompilerType *pointee_or_element_compiler_type = NULL) const;

lldb::LanguageType
GetMinimumLanguage ();
Expand Down Expand Up @@ -413,7 +413,7 @@ class CompilerType

uint32_t
GetIndexOfFieldWithName (const char* name,
CompilerType* field_clang_type = NULL,
CompilerType* field_compiler_type = NULL,
uint64_t *bit_offset_ptr = NULL,
uint32_t *bitfield_bit_size_ptr = NULL,
bool *is_bitfield_ptr = NULL) const;
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Symbol/GoASTContext.h
View file
Expand Up @@ -198,7 +198,7 @@ class GoASTContext : public TypeSystem

virtual ConstString GetTypeName(lldb::opaque_compiler_type_t type) override;

virtual uint32_t GetTypeInfo(lldb::opaque_compiler_type_t type, CompilerType *pointee_or_element_clang_type = NULL) override;
virtual uint32_t GetTypeInfo(lldb::opaque_compiler_type_t type, CompilerType *pointee_or_element_compiler_type = NULL) override;

virtual lldb::LanguageType GetMinimumLanguage(lldb::opaque_compiler_type_t type) override;

Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Symbol/SymbolFile.h
View file
Expand Up @@ -130,7 +130,7 @@ class SymbolFile :
virtual size_t ParseTypes (const SymbolContext& sc) = 0;
virtual size_t ParseVariablesForContext (const SymbolContext& sc) = 0;
virtual Type* ResolveTypeUID (lldb::user_id_t type_uid) = 0;
virtual bool CompleteType (CompilerType &clang_type) = 0;
virtual bool CompleteType (CompilerType &compiler_type) = 0;
virtual void ParseDeclsForContext (CompilerDeclContext decl_ctx) {}
virtual CompilerDecl GetDeclForUID (lldb::user_id_t uid) { return CompilerDecl(); }
virtual CompilerDeclContext GetDeclContextForUID (lldb::user_id_t uid) { return CompilerDeclContext(); }
Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/Symbol/TaggedASTType.h
View file
Expand Up @@ -20,8 +20,8 @@ namespace lldb_private
template <unsigned int C> class TaggedASTType : public CompilerType
{
public:
TaggedASTType (const CompilerType &clang_type) :
CompilerType(clang_type)
TaggedASTType (const CompilerType &compiler_type) :
CompilerType(compiler_type)
{
}

Expand Down

0 comments on commit 3ad353f

Please sign in to comment.