Skip to content

Commit e427070

Browse files
committed
cleanup
1 parent aac2bc0 commit e427070

File tree

10 files changed

+1
-63
lines changed

10 files changed

+1
-63
lines changed

include/mrdox/Corpus.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ class MRDOX_VISIBLE
103103
MRDOX_DECL virtual bool visit(TypedefInfo const&);
104104
MRDOX_DECL virtual bool visit(EnumInfo const&);
105105
MRDOX_DECL virtual bool visit(VarInfo const&);
106-
// KRYSTIAN FIXME: is this correct? does it make sense to
107-
// visit a field as a non-member (a field *must* be class member)?
108106
MRDOX_DECL virtual bool visit(FieldInfo const&);
109107
MRDOX_DECL virtual bool visit(SpecializationInfo const&);
110108

include/mrdox/Metadata/Record.hpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ enum class RecordKeyKind
118118
{
119119
Struct,
120120
Class,
121-
Union,
122-
// KRYSTIAN NOTE: __interface is a Microsoft extension,
123-
// do we want to support it?
124-
Interface
121+
Union
125122
};
126123

127124
/** Metadata for struct, class, or union.

source/-XML/CXXTags.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ getTagName(Info const& I) noexcept
2929
case RecordKeyKind::Class: return classTagName;
3030
case RecordKeyKind::Struct: return structTagName;
3131
case RecordKeyKind::Union: return unionTagName;
32-
case RecordKeyKind::Interface: return interfaceTagName;
3332
default:
3433
break;
3534
}

source/-XML/CXXTags.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ constexpr llvm::StringRef javadocTagName = "doc";
4141
constexpr llvm::StringRef enumTagName = "enum";
4242
constexpr llvm::StringRef friendTagName = "friend";
4343
constexpr llvm::StringRef functionTagName = "function";
44-
constexpr llvm::StringRef interfaceTagName = "interface";
4544
constexpr llvm::StringRef namespaceTagName = "namespace";
4645
constexpr llvm::StringRef paramTagName = "param";
4746
constexpr llvm::StringRef returnTagName = "return";

source/-XML/XMLWriter.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,6 @@ writeRecord(
384384
case RecordKeyKind::Class: tagName = classTagName; break;
385385
case RecordKeyKind::Struct: tagName = structTagName; break;
386386
case RecordKeyKind::Union: tagName = unionTagName; break;
387-
case RecordKeyKind::Interface: tagName = interfaceTagName; break;
388387
default:
389388
Assert(false);
390389
}

source/-adoc/AdocWriter.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,6 @@ recordKeyToString(RecordKeyKind k) noexcept
852852
switch(k)
853853
{
854854
case RecordKeyKind::Struct: return "struct";
855-
case RecordKeyKind::Interface: return "__interface";
856855
case RecordKeyKind::Union: return "union";
857856
case RecordKeyKind::Class: return "class";
858857
default:

source/AST/ASTVisitor.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -773,11 +773,6 @@ buildRecord(
773773
case TagTypeKind::TTK_Union:
774774
I.KeyKind = RecordKeyKind::Union;
775775
break;
776-
// KRYSTIAN NOTE: do want to support __interface?
777-
// it is a Microsoft extension.
778-
case TagTypeKind::TTK_Interface:
779-
I.KeyKind = RecordKeyKind::Interface;
780-
break;
781776
default:
782777
llvm_unreachable("unsupported TagTypeKind");
783778
}

source/AST/BitcodeWriter.cpp

-15
Original file line numberDiff line numberDiff line change
@@ -140,21 +140,6 @@ static void MemberRefsAbbrev(
140140
llvm::BitCodeAbbrevOp::Fixed, 8) });
141141
}
142142

143-
#if 0
144-
static void SpecializedMemAbbrev(
145-
std::shared_ptr<llvm::BitCodeAbbrev>& Abbrev)
146-
{
147-
AbbrevGen(Abbrev, {
148-
// 0. Fixed-size array of 21-byte SymbolID pairs
149-
llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Array),
150-
llvm::BitCodeAbbrevOp(
151-
llvm::BitCodeAbbrevOp::Fixed, 8),
152-
llvm::BitCodeAbbrevOp(llvm::BitCodeAbbrevOp::Array),
153-
llvm::BitCodeAbbrevOp(
154-
llvm::BitCodeAbbrevOp::Fixed, 8) });
155-
}
156-
#endif
157-
158143
static void StringAbbrev(
159144
std::shared_ptr<llvm::BitCodeAbbrev>& Abbrev)
160145
{

source/AST/DecodeRecord.hpp

-31
Original file line numberDiff line numberDiff line change
@@ -129,37 +129,6 @@ decodeRecord(
129129
return Error::success();
130130
}
131131

132-
#if 0
133-
// vector<SpecializedMember>
134-
inline
135-
Error
136-
decodeRecord(
137-
Record const& R,
138-
std::vector<SpecializedMember>& f,
139-
llvm::StringRef blob)
140-
{
141-
constexpr auto SpecializedMemberSize =
142-
BitCodeConstants::USRHashSize * 2;
143-
if(R.empty())
144-
return Error("record is empty");
145-
auto n = R.size() / SpecializedMemberSize;
146-
if(R.size() != n * SpecializedMemberSize)
147-
return Error("record is short");
148-
auto src = R.begin();
149-
f.resize(n);
150-
auto* dest = &f[0];
151-
while(n--)
152-
{
153-
dest->Primary = SymbolID(src);
154-
src += BitCodeConstants::USRHashSize;
155-
dest->Specialized = SymbolID(src);
156-
src += BitCodeConstants::USRHashSize;
157-
++dest;
158-
}
159-
return Error::success();
160-
}
161-
#endif
162-
163132
inline
164133
Error
165134
decodeRecord(

source/Metadata/Info.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ symbolType() const noexcept
107107
return "class";
108108
case RecordKeyKind::Union:
109109
return "union";
110-
case RecordKeyKind::Interface:
111-
return "interface";
112110
default:
113111
llvm_unreachable("unknown RecordKeyKind");
114112
}

0 commit comments

Comments
 (0)