Skip to content

best match corpus lookup algorithm #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2025
+1,666 −279
Merged

best match corpus lookup algorithm #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,8 @@ jobs:
- name: Generate Demos
run: |
set -x
declare -a generators=(
"adoc"
"xml"
Expand All @@ -670,7 +672,7 @@ jobs:
for generator in "${generators[@]}"; do
[[ $generator = xml && $variant = multi ]] && continue
[[ $variant = multi ]] && multipage="true" || multipage="false"
mrdocs --config="$(pwd)/boost/libs/url/doc/mrdocs.yml" "../CMakeLists.txt" --output="$(pwd)/demos/boost-url/$variant/$generator" --multipage=$multipage --generate="$generator"
mrdocs --config="$(pwd)/boost/libs/url/doc/mrdocs.yml" "../CMakeLists.txt" --output="$(pwd)/demos/boost-url/$variant/$generator" --multipage=$multipage --generate="$generator" --log-level=debug
echo "Number of files in demos/boost-url/$variant/$generator: $(find demos/boost-url/$variant/$generator -type f | wc -l)"
done
done
Expand Down
115 changes: 55 additions & 60 deletions src/lib/AST/ParseRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,14 @@ class RefParser
}
MRDOCS_CHECK_OR(parseComponents(), false);
skipWhitespace();
if (peek('('))
result_.HasFunctionParameters = peek('(', ' ');
if (result_.HasFunctionParameters)
{
ParsedMemberFunctionSuffix functionParameters;
MRDOCS_CHECK_OR(parseFunctionSuffix(functionParameters), false);
result_.FunctionParameters = std::move(functionParameters.Params);
result_.IsVariadic = functionParameters.IsVariadic;
result_.ExceptionSpec = std::move(functionParameters.ExceptionSpec);
result_.IsConst = functionParameters.IsConst;
result_.IsVolatile = functionParameters.IsVolatile;
result_.Kind = functionParameters.Kind;
Expand Down Expand Up @@ -647,6 +649,7 @@ class RefParser
// this? decl-specifier-seq

char const* start = ptr_;
skipWhitespace();
if (!parseLiteral('('))
{
ptr_ = start;
Expand Down Expand Up @@ -934,6 +937,8 @@ class RefParser
if (contains_any(specifiers, {"signed", "unsigned"}))
{
bool explicitlySigned = contains(specifiers, "signed");
std::string_view signStr = explicitlySigned ? "signed" : "unsigned";
// Infer basic fundamental type from "signed" or "unsigned"
if (!dest)
{
NamedTypeInfo NTI;
Expand All @@ -942,42 +947,29 @@ class RefParser
NTI.Name = NI;
dest = NTI;
}
else
// Check if the type is named
if (!dest->isNamed())
{
if (!dest->isNamed())
{
if (explicitlySigned)
{
setError("expected type for 'signed' specifier");
}
else
{
setError("expected type for 'unsigned' specifier");
}
ptr_ = start;
return false;
}
if (auto& namedParam = dynamic_cast<NamedTypeInfo&>(*dest);
namedParam.Name->Name != "int" &&
namedParam.Name->Name != "char")
{
if (explicitlySigned)
{
setError(start, "expected 'int' or 'char' for 'signed' specifier");
}
else
{
setError(start, "expected 'int' or 'char' for 'unsigned' specifier");
}
ptr_ = start;
return false;
}
setError(fmt::format("expected named type for '{}' specifier", signStr));
ptr_ = start;
return false;
}
// Check if the type is "int" or "char"
auto& namedParam = dynamic_cast<NamedTypeInfo&>(*dest);
if (!contains({"int", "char"}, namedParam.Name->Name))
{
setError(fmt::format("expected 'int' or 'char' for '{}' specifier", signStr));
ptr_ = start;
return false;
}
// Add the specifier to the type name
namedParam.Name->Name = fmt::format("{} {}", signStr, namedParam.Name->Name);
}

// - "short" can be combined with int.
if (contains(specifiers, "short"))
{
// Infer basic fundamental type from "short"
if (!dest)
{
NamedTypeInfo NTI;
Expand All @@ -986,27 +978,29 @@ class RefParser
NTI.Name = NI;
dest = NTI;
}
else
// Check if the type is named
if (!dest->isNamed())
{
if (!dest->isNamed())
{
setError(start, "expected type for 'short' specifier");
ptr_ = start;
return false;
}
if (auto& namedParam = dynamic_cast<NamedTypeInfo&>(*dest);
namedParam.Name->Name != "int")
{
setError(start, "expected 'int' for 'short' specifier");
ptr_ = start;
return false;
}
setError(start, "expected named type for 'short' specifier");
ptr_ = start;
return false;
}
// Check if the type is "int"
auto& namedParam = dynamic_cast<NamedTypeInfo&>(*dest);
if (!contains({"int", "signed int", "unsigned int"}, namedParam.Name->Name))
{
setError(start, "expected 'int' for 'short' specifier");
ptr_ = start;
return false;
}
// Add the specifier to the type name
namedParam.Name->Name = fmt::format("short {}", namedParam.Name->Name);
}

// - "long" can be combined with "int", "double" and "long"
if (contains(specifiers, "long"))
{
// Infer basic fundamental type from "long"
if (!dest)
{
NamedTypeInfo NTI;
Expand All @@ -1015,33 +1009,34 @@ class RefParser
NTI.Name = NI;
dest = NTI;
}
else
// Check if the type is named
if (!dest->isNamed())
{
if (!dest->isNamed())
{
setError(start, "expected type for 'long' specifier");
ptr_ = start;
return false;
}
if (auto& namedParam = dynamic_cast<NamedTypeInfo&>(*dest);
namedParam.Name->Name != "int" &&
namedParam.Name->Name != "double" &&
namedParam.Name->Name != "long")
{
setError(start, "expected 'int', 'double' or 'long' for 'long' specifier");
ptr_ = start;
return false;
}
setError(start, "expected named type for 'long' specifier");
ptr_ = start;
return false;
}
auto& namedParam = dynamic_cast<NamedTypeInfo&>(*dest);
if (!contains({"int", "signed int", "unsigned int", "double"}, namedParam.Name->Name))
{
setError(start, "expected 'int' or 'double' for 'long' specifier");
ptr_ = start;
return false;
}
// Add the specifier to the type name
bool const isLongLong = contains_n(specifiers, "long", 2);
namedParam.Name->Name = fmt::format("{} {}", isLongLong ? "long long" : "long", namedParam.Name->Name);
}

// Final check: if dest is still empty, we have an error
if (!dest)
{
ptr_ = start;
setError("expected parameter type");
return false;
}

// Set cv qualifiers
dest->IsConst = contains(specifiers, "const");
dest->IsVolatile = contains(specifiers, "volatile");

Expand Down
2 changes: 2 additions & 0 deletions src/lib/AST/ParseRef.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ struct ParsedRef {
llvm::SmallVector<ParsedRefComponent, 8> Components;

// The following are populated when the last element is a function
bool HasFunctionParameters = false;
llvm::SmallVector<Polymorphic<TypeInfo>, 8> FunctionParameters;
bool IsVariadic = false;
bool IsExplicitObjectMemberFunction = false;
ReferenceKind Kind = ReferenceKind::None;
bool IsConst = false;
bool IsVolatile = false;
NoexceptInfo ExceptionSpec;
};

Expected<ParsedRef>
Expand Down
Loading