mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-12-01 06:53:39 +08:00
fbaa5d193d
Found with gcc's -Wmissing-declarations which gives warnings like
../src/tinyexpr.cpp:61:5: warning: no previous declaration for ‘int get_arity(int)’ [-Wmissing-declarations]
61 | int get_arity(const int type) {
The same warnings show up for builtin functions like builtin_bg because they
currently don't include their own headers. I left that.
Also reformat the touched files.
42 lines
1.1 KiB
C++
42 lines
1.1 KiB
C++
// Library for pooling common strings.
|
|
#include "config.h" // IWYU pragma: keep
|
|
|
|
#include "intern.h"
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <algorithm>
|
|
#include <cwchar>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "common.h"
|
|
#include "fallback.h" // IWYU pragma: keep
|
|
|
|
static bool string_less_than_string(const wchar_t *a, const wchar_t *b) {
|
|
return std::wcscmp(a, b) < 0;
|
|
}
|
|
|
|
/// The table of intern'd strings.
|
|
owning_lock<std::vector<const wchar_t *>> string_table;
|
|
|
|
static const wchar_t *intern_with_dup(const wchar_t *in, bool dup) {
|
|
if (!in) return nullptr;
|
|
|
|
auto table = string_table.acquire();
|
|
|
|
const wchar_t *result;
|
|
auto iter = std::lower_bound(table->begin(), table->end(), in, string_less_than_string);
|
|
if (iter != table->end() && std::wcscmp(*iter, in) == 0) {
|
|
result = *iter;
|
|
} else {
|
|
result = dup ? wcsdup(in) : in;
|
|
table->insert(iter, result);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
const wchar_t *intern(const wchar_t *in) { return intern_with_dup(in, true); }
|
|
|
|
const wchar_t *intern_static(const wchar_t *in) { return intern_with_dup(in, false); }
|