RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 09:37:34 +00:00
Code Issues Activity Actions

Userland: Change static const variables to static constexpr

Browse source 
`static const` variables can be computed and initialized at run-time
during initialization or the first time a function is called. Change
them to `static constexpr` to ensure they are computed at
compile-time.

This allows some removal of `strlen` because the length of the
`StringView` can be used which is pre-computed at compile-time.
This commit is contained in:
Lenny Maiorani 2022-03-13 16:09:41 -06:00 • committed by Andreas Kling
parent 31515a9147
commit f912a48315
23 changed files with 111 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Demos/Fire/Fire.cpp
View file

@ -23,6 +23,7 @@
* [ ] handle fire bitmap edges better * [ ] handle fire bitmap edges better
*/ */
#include <AK/Array.h>
#include <LibCore/ElapsedTimer.h> #include <LibCore/ElapsedTimer.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
@ -45,7 +46,7 @@
#define FIRE_HEIGHT 200 #define FIRE_HEIGHT 200
#define FIRE_MAX 29 #define FIRE_MAX 29
static const Color s_palette[] = { static constexpr Array<Color, 30> s_palette = {
Color(0x07, 0x07, 0x07), Color(0x1F, 0x07, 0x07), Color(0x2F, 0x0F, 0x07), Color(0x07, 0x07, 0x07), Color(0x1F, 0x07, 0x07), Color(0x2F, 0x0F, 0x07),
Color(0x47, 0x0F, 0x07), Color(0x57, 0x17, 0x07), Color(0x67, 0x1F, 0x07), Color(0x47, 0x0F, 0x07), Color(0x57, 0x17, 0x07), Color(0x67, 0x1F, 0x07),
Color(0x77, 0x1F, 0x07), Color(0x9F, 0x2F, 0x07), Color(0xAF, 0x3F, 0x07), Color(0x77, 0x1F, 0x07), Color(0x9F, 0x2F, 0x07), Color(0xAF, 0x3F, 0x07),

6
Userland/Demos/VirGLDemo/CommandBufferBuilder.cpp
View file

@ -1,9 +1,11 @@
/* /*
* Copyright (c) 2022, Sahan Fernando <sahan.h.fernando@gmail.com> * Copyright (c) 2022, Sahan Fernando <sahan.h.fernando@gmail.com>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/StringView.h>
#include <Kernel/API/VirGL.h> #include <Kernel/API/VirGL.h>
#include <sys/ioctl_numbers.h> #include <sys/ioctl_numbers.h>
@ -235,9 +237,9 @@ void CommandBufferBuilder::append_set_constant_buffer(Vector<float> const& const
} }
} }
void CommandBufferBuilder::append_create_shader(ObjectHandle handle, Gallium::ShaderType shader_type, const char* shader_data) void CommandBufferBuilder::append_create_shader(ObjectHandle handle, Gallium::ShaderType shader_type, StringView shader_data)
{ {
size_t shader_len = strlen(shader_data) + 1; // Need to remember to copy null terminator as well if needed size_t shader_len = shader_data.length() + 1; // Need to remember to copy null terminator as well if needed
CommandBuilder builder(m_buffer, Protocol::VirGLCommand::CREATE_OBJECT, to_underlying(Protocol::ObjectType::SHADER)); CommandBuilder builder(m_buffer, Protocol::VirGLCommand::CREATE_OBJECT, to_underlying(Protocol::ObjectType::SHADER));
builder.appendu32(handle.value()); // VIRGL_OBJ_CREATE_HANDLE builder.appendu32(handle.value()); // VIRGL_OBJ_CREATE_HANDLE
builder.appendu32(to_underlying(shader_type)); builder.appendu32(to_underlying(shader_type));

4
Userland/Demos/VirGLDemo/CommandBufferBuilder.h
View file

@ -1,11 +1,13 @@
/* /*
* Copyright (c) 2022, Sahan Fernando <sahan.h.fernando@gmail.com> * Copyright (c) 2022, Sahan Fernando <sahan.h.fernando@gmail.com>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#pragma once #pragma once
#include <AK/StringView.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <sys/ioctl_numbers.h> #include <sys/ioctl_numbers.h>
@ -28,7 +30,7 @@ public:
void append_gl_viewport(); void append_gl_viewport();
void append_set_framebuffer_state_no_attach(); void append_set_framebuffer_state_no_attach();
void append_set_constant_buffer(Vector<float> const& constant_buffer); void append_set_constant_buffer(Vector<float> const& constant_buffer);
void append_create_shader(ObjectHandle handle, Gallium::ShaderType shader_type, const char* shader_data); void append_create_shader(ObjectHandle handle, Gallium::ShaderType shader_type, StringView shader_data);
void append_bind_shader(ObjectHandle handle, Gallium::ShaderType shader_type); void append_bind_shader(ObjectHandle handle, Gallium::ShaderType shader_type);
void append_create_rasterizer(ObjectHandle handle); void append_create_rasterizer(ObjectHandle handle);
void append_bind_rasterizer(ObjectHandle handle); void append_bind_rasterizer(ObjectHandle handle);

45
Userland/Demos/VirGLDemo/VirGLDemo.cpp
View file

@ -1,10 +1,13 @@
/* /*
* Copyright (c) 2022, Sahan Fernando <sahan.h.fernando@gmail.com> * Copyright (c) 2022, Sahan Fernando <sahan.h.fernando@gmail.com>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Array.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/StringView.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <Kernel/API/VirGL.h> #include <Kernel/API/VirGL.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
@ -23,26 +26,26 @@
#include "VirGLProtocol.h" #include "VirGLProtocol.h"
#include "Widget.h" #include "Widget.h"
static const char* frag_shader = "FRAG\n" static constexpr StringView frag_shader = "FRAG\n"
"PROPERTY FS_COLOR0_WRITES_ALL_CBUFS 1\n" "PROPERTY FS_COLOR0_WRITES_ALL_CBUFS 1\n"
"DCL IN[0], COLOR, COLOR\n" "DCL IN[0], COLOR, COLOR\n"
"DCL OUT[0], COLOR\n" "DCL OUT[0], COLOR\n"
" 0: MOV OUT[0], IN[0]\n" " 0: MOV OUT[0], IN[0]\n"
" 1: END\n"; " 1: END\n";
static const char* vert_shader = "VERT\n" static constexpr StringView vert_shader = "VERT\n"
"DCL IN[0]\n" "DCL IN[0]\n"
"DCL IN[1]\n" "DCL IN[1]\n"
"DCL OUT[0], POSITION\n" "DCL OUT[0], POSITION\n"
"DCL OUT[1], COLOR\n" "DCL OUT[1], COLOR\n"
"DCL CONST[0..3]\n" "DCL CONST[0..3]\n"
"DCL TEMP[0..1]\n" "DCL TEMP[0..1]\n"
" 0: MUL TEMP[0], IN[0].xxxx, CONST[0]\n" " 0: MUL TEMP[0], IN[0].xxxx, CONST[0]\n"
" 1: MAD TEMP[1], IN[0].yyyy, CONST[1], TEMP[0]\n" " 1: MAD TEMP[1], IN[0].yyyy, CONST[1], TEMP[0]\n"
" 2: MAD TEMP[0], IN[0].zzzz, CONST[2], TEMP[1]\n" " 2: MAD TEMP[0], IN[0].zzzz, CONST[2], TEMP[1]\n"
" 3: MAD OUT[0], IN[0].wwww, CONST[3], TEMP[0]\n" " 3: MAD OUT[0], IN[0].wwww, CONST[3], TEMP[0]\n"
" 4: MOV_SAT OUT[1], IN[1]\n" " 4: MOV_SAT OUT[1], IN[1]\n"
" 5: END\n"; " 5: END\n";
struct VertexData { struct VertexData {
float r; float r;
@ -92,7 +95,7 @@ static ResourceID create_virgl_resource(VirGL3DResourceSpec& spec)
static Vector<VertexData> gen_vertex_data() static Vector<VertexData> gen_vertex_data()
{ {
Vector<VertexData> data; Vector<VertexData> data;
static const VertexData vertices[8] = { static constexpr Array<VertexData, 8> vertices = {
VertexData { .r = 0, .g = 0, .b = 0, .x = -0.5, .y = -0.5, .z = -0.5 }, VertexData { .r = 0, .g = 0, .b = 0, .x = -0.5, .y = -0.5, .z = -0.5 },
VertexData { .r = 0, .g = 0, .b = 0, .x = 0.5, .y = -0.5, .z = -0.5 }, VertexData { .r = 0, .g = 0, .b = 0, .x = 0.5, .y = -0.5, .z = -0.5 },
VertexData { .r = 0, .g = 0, .b = 0, .x = -0.5, .y = 0.5, .z = -0.5 }, VertexData { .r = 0, .g = 0, .b = 0, .x = -0.5, .y = 0.5, .z = -0.5 },
@ -102,7 +105,7 @@ static Vector<VertexData> gen_vertex_data()
VertexData { .r = 0, .g = 0, .b = 0, .x = -0.5, .y = 0.5, .z = 0.5 }, VertexData { .r = 0, .g = 0, .b = 0, .x = -0.5, .y = 0.5, .z = 0.5 },
VertexData { .r = 0, .g = 0, .b = 0, .x = 0.5, .y = 0.5, .z = 0.5 }, VertexData { .r = 0, .g = 0, .b = 0, .x = 0.5, .y = 0.5, .z = 0.5 },
}; };
size_t tris[36] = { static constexpr Array<size_t, 36> tris = {
0, 1, 2, 1, 3, 2, // Top 0, 1, 2, 1, 3, 2, // Top
4, 0, 6, 0, 2, 6, // Left 4, 0, 6, 0, 2, 6, // Left
4, 5, 0, 5, 1, 0, // Up 4, 5, 0, 5, 1, 0, // Up

4
Userland/Games/Breakout/Game.h
View file

@ -16,8 +16,8 @@ class Game final : public GUI::Widget {
C_OBJECT(Game); C_OBJECT(Game);
public: public:
static const int game_width = 480; static constexpr int game_width = 480;
static const int game_height = 500; static constexpr int game_height = 500;
virtual ~Game() override = default; virtual ~Game() override = default;

4
Userland/Games/FlappyBug/Game.h
View file

@ -22,8 +22,8 @@ class Game final : public GUI::Frame {
C_OBJECT(Game); C_OBJECT(Game);
public: public:
static const int game_width = 560; static constexpr int game_width = 560;
static const int game_height = 480; static constexpr int game_height = 480;
Function<u32(u32)> on_game_end; Function<u32(u32)> on_game_end;

4
Userland/Games/Pong/Game.h
View file

@ -23,8 +23,8 @@ class Game final : public GUI::Widget
C_OBJECT(Game); C_OBJECT(Game);
public: public:
static const int game_width = 560; static constexpr int game_width = 560;
static const int game_height = 480; static constexpr int game_height = 480;
virtual ~Game() override = default; virtual ~Game() override = default;

3
Userland/Libraries/LibAudio/Loader.h
View file

@ -20,8 +20,7 @@
namespace Audio { namespace Audio {
static const String empty_string = ""; static constexpr StringView no_plugin_error = "No loader plugin available";
static String no_plugin_error = "No loader plugin available";
using LoaderSamples = Result<NonnullRefPtr<Buffer>, LoaderError>; using LoaderSamples = Result<NonnullRefPtr<Buffer>, LoaderError>;
using MaybeLoaderError = Result<void, LoaderError>; using MaybeLoaderError = Result<void, LoaderError>;

13
Userland/Libraries/LibGUI/Calendar.cpp
View file

@ -5,6 +5,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Array.h>
#include <LibCore/DateTime.h> #include <LibCore/DateTime.h>
#include <LibGUI/Calendar.h> #include <LibGUI/Calendar.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
@ -16,21 +17,21 @@ REGISTER_WIDGET(GUI, Calendar);
namespace GUI { namespace GUI {
static const char* long_day_names[] = { static constexpr Array<StringView, 7> long_day_names = {
"Sunday", "Monday", "Tuesday", "Wednesday", "Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday" "Thursday", "Friday", "Saturday"
}; };
static const char* short_day_names[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; static constexpr Array<StringView, 7> short_day_names = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
static const char* mini_day_names[] = { "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" }; static constexpr Array<StringView, 7> mini_day_names = { "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" };
static const char* micro_day_names[] = { "S", "M", "T", "W", "T", "F", "S" }; static constexpr Array<StringView, 7> micro_day_names = { "S", "M", "T", "W", "T", "F", "S" };
static const char* long_month_names[] = { static constexpr Array<StringView, 12> long_month_names = {
"January", "February", "March", "April", "May", "June", "January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December" "July", "August", "September", "October", "November", "December"
}; };
static const char* short_month_names[] = { static constexpr Array<StringView, 12> short_month_names = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
}; };

6
Userland/Libraries/LibGUI/CheckBox.cpp
View file

@ -16,9 +16,9 @@ REGISTER_WIDGET(GUI, CheckBox)
namespace GUI { namespace GUI {
static const int s_box_width = 13; static constexpr int s_box_width = 13;
static const int s_box_height = 13; static constexpr int s_box_height = 13;
static const int s_horizontal_padding = 6; static constexpr int s_horizontal_padding = 6;
CheckBox::CheckBox(String text) CheckBox::CheckBox(String text)
: AbstractButton(move(text)) : AbstractButton(move(text))

7
Userland/Libraries/LibGUI/FileIconProvider.cpp
View file

@ -1,9 +1,11 @@
/* /*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Array.h>
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/String.h> #include <AK/String.h>
#include <LibCore/ConfigFile.h> #include <LibCore/ConfigFile.h>
@ -178,7 +180,10 @@ Icon FileIconProvider::icon_for_executable(const String& path)
int image_size; int image_size;
}; };
static const IconSection icon_sections[] = { { .section_name = "serenity_icon_s", .image_size = 16 }, { .section_name = "serenity_icon_m", .image_size = 32 } }; static constexpr Array<IconSection, 2> icon_sections = {
IconSection { .section_name = "serenity_icon_s", .image_size = 16 },
IconSection { .section_name = "serenity_icon_m", .image_size = 32 }
};
bool had_error = false; bool had_error = false;
for (const auto& icon_section : icon_sections) { for (const auto& icon_section : icon_sections) {

3
Userland/Libraries/LibGUI/LinkLabel.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2020, Alex McGrath <amk@amk.ie> * Copyright (c) 2020, Alex McGrath <amk@amk.ie>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -48,7 +49,7 @@ void LinkLabel::set_hovered(bool hover)
void LinkLabel::mousemove_event(MouseEvent& event) void LinkLabel::mousemove_event(MouseEvent& event)
{ {
static const int extra_target_width = 3; constexpr int extra_target_width = 3;
set_hovered(event.position().x() <= font().width(text()) + extra_target_width); set_hovered(event.position().x() <= font().width(text()) + extra_target_width);
} }

5
Userland/Libraries/LibGfx/GIFLoader.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -16,8 +17,8 @@
namespace Gfx { namespace Gfx {
// Row strides and offsets for each interlace pass. // Row strides and offsets for each interlace pass.
static const int INTERLACE_ROW_STRIDES[] = { 8, 8, 4, 2 }; static constexpr Array<int, 4> INTERLACE_ROW_STRIDES = { 8, 8, 4, 2 };
static const int INTERLACE_ROW_OFFSETS[] = { 0, 4, 2, 1 }; static constexpr Array<int, 4> INTERLACE_ROW_OFFSETS = { 0, 4, 2, 1 };
struct GIFImageDescriptor { struct GIFImageDescriptor {
u16 x { 0 }; u16 x { 0 };

6
Userland/Libraries/LibGfx/PNGLoader.cpp
View file

@ -1,9 +1,11 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Array.h>
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/Endian.h> #include <AK/Endian.h>
#include <AK/Vector.h> #include <AK/Vector.h>
@ -17,7 +19,7 @@
namespace Gfx { namespace Gfx {
static const u8 png_header[8] = { 0x89, 'P', 'N', 'G', 13, 10, 26, 10 }; static constexpr Array<u8, 8> png_header = { 0x89, 'P', 'N', 'G', 13, 10, 26, 10 };
struct PNG_IHDR { struct PNG_IHDR {
NetworkOrdered<u32> width; NetworkOrdered<u32> width;
@ -516,7 +518,7 @@ static bool decode_png_header(PNGLoadingContext& context)
return false; return false;
} }
if (memcmp(context.data, png_header, sizeof(png_header)) != 0) { if (memcmp(context.data, png_header.span().data(), sizeof(png_header)) != 0) {
dbgln_if(PNG_DEBUG, "Invalid PNG header"); dbgln_if(PNG_DEBUG, "Invalid PNG header");
context.state = PNGLoadingContext::State::Error; context.state = PNGLoadingContext::State::Error;
return false; return false;

10
Userland/Libraries/LibJS/Runtime/NumberPrototype.cpp
View file

@ -1,10 +1,12 @@
/* /*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Linus Groh <linusg@serenityos.org> * Copyright (c) 2021, Linus Groh <linusg@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Array.h>
#include <AK/Function.h> #include <AK/Function.h>
#include <AK/TypeCasts.h> #include <AK/TypeCasts.h>
#include <LibJS/Runtime/AbstractOperations.h> #include <LibJS/Runtime/AbstractOperations.h>
@ -19,7 +21,7 @@
namespace JS { namespace JS {
static const u8 max_precision_for_radix[37] = { static constexpr AK::Array<u8, 37> max_precision_for_radix = {
// clang-format off // clang-format off
0, 0, 52, 32, 26, 22, 20, 18, 17, 16, 0, 0, 52, 32, 26, 22, 20, 18, 17, 16,
15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12,
@ -28,7 +30,11 @@ static const u8 max_precision_for_radix[37] = {
// clang-format on // clang-format on
}; };
static char digits[] = "0123456789abcdefghijklmnopqrstuvwxyz"; static constexpr AK::Array<char, 36> digits = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
};
static String decimal_digits_to_string(double number) static String decimal_digits_to_string(double number)
{ {

31
Userland/Libraries/LibM/math.cpp
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Mițca Dumitru <dumitru0mitca@gmail.com> * Copyright (c) 2021, Mițca Dumitru <dumitru0mitca@gmail.com>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -63,11 +64,11 @@ union FloatExtractor;
// This assumes long double is 80 bits, which is true with GCC on Intel platforms // This assumes long double is 80 bits, which is true with GCC on Intel platforms
template<> template<>
union FloatExtractor<long double> { union FloatExtractor<long double> {
static const int mantissa_bits = 64; static constexpr int mantissa_bits = 64;
static const unsigned long long mantissa_max = ~0u; static constexpr unsigned long long mantissa_max = ~0u;
static const int exponent_bias = 16383; static constexpr int exponent_bias = 16383;
static const int exponent_bits = 15; static constexpr int exponent_bits = 15;
static const unsigned exponent_max = 32767; static constexpr unsigned exponent_max = 32767;
struct { struct {
unsigned long long mantissa; unsigned long long mantissa;
unsigned exponent : 15; unsigned exponent : 15;
@ -79,11 +80,11 @@ union FloatExtractor<long double> {
template<> template<>
union FloatExtractor<double> { union FloatExtractor<double> {
static const int mantissa_bits = 52; static constexpr int mantissa_bits = 52;
static const unsigned long long mantissa_max = (1ull << 52) - 1; static constexpr unsigned long long mantissa_max = (1ull << 52) - 1;
static const int exponent_bias = 1023; static constexpr int exponent_bias = 1023;
static const int exponent_bits = 11; static constexpr int exponent_bits = 11;
static const unsigned exponent_max = 2047; static constexpr unsigned exponent_max = 2047;
struct { struct {
unsigned long long mantissa : 52; unsigned long long mantissa : 52;
unsigned exponent : 11; unsigned exponent : 11;
@ -94,11 +95,11 @@ union FloatExtractor<double> {
template<> template<>
union FloatExtractor<float> { union FloatExtractor<float> {
static const int mantissa_bits = 23; static constexpr int mantissa_bits = 23;
static const unsigned mantissa_max = (1 << 23) - 1; static constexpr unsigned mantissa_max = (1 << 23) - 1;
static const int exponent_bias = 127; static constexpr int exponent_bias = 127;
static const int exponent_bits = 8; static constexpr int exponent_bits = 8;
static const unsigned exponent_max = 255; static constexpr unsigned exponent_max = 255;
struct { struct {
unsigned long long mantissa : 23; unsigned long long mantissa : 23;
unsigned exponent : 8; unsigned exponent : 8;

3
Userland/Libraries/LibPthread/forward.cpp
View file

@ -1,12 +1,13 @@
/* /*
* Copyright (c) 2021, Gunnar Beutner <gunnar@beutner.name> * Copyright (c) 2021, Gunnar Beutner <gunnar@beutner.name>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibC/bits/pthread_forward.h> #include <LibC/bits/pthread_forward.h>
static const PthreadFunctions s_functions = { static constexpr PthreadFunctions s_functions = {
.pthread_mutex_trylock = pthread_mutex_trylock, .pthread_mutex_trylock = pthread_mutex_trylock,
.pthread_mutex_destroy = pthread_mutex_destroy, .pthread_mutex_destroy = pthread_mutex_destroy,

4
Userland/Libraries/LibSQL/AST/Expression.cpp
View file

@ -1,16 +1,18 @@
/* /*
* Copyright (c) 2021, Jan de Visser <jan@de-visser.net> * Copyright (c) 2021, Jan de Visser <jan@de-visser.net>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/StringView.h>
#include <LibRegex/Regex.h> #include <LibRegex/Regex.h>
#include <LibSQL/AST/AST.h> #include <LibSQL/AST/AST.h>
#include <LibSQL/Database.h> #include <LibSQL/Database.h>
namespace SQL::AST { namespace SQL::AST {
static const String s_posix_basic_metacharacters = ".^$*[]+\\"; static constexpr StringView s_posix_basic_metacharacters = ".^$*[]+\\";
ResultOr<Value> NumericLiteral::evaluate(ExecutionContext&) const ResultOr<Value> NumericLiteral::evaluate(ExecutionContext&) const
{ {

4
Userland/Libraries/LibWeb/CSS/Parser/Tokenizer.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2021, the SerenityOS developers. * Copyright (c) 2020-2022, the SerenityOS developers.
* Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org> * Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
@ -15,7 +15,7 @@
// U+FFFD REPLACEMENT CHARACTER (<28>) // U+FFFD REPLACEMENT CHARACTER (<28>)
#define REPLACEMENT_CHARACTER 0xFFFD #define REPLACEMENT_CHARACTER 0xFFFD
static const u32 TOKENIZER_EOF = 0xFFFFFFFF; static constexpr u32 TOKENIZER_EOF = 0xFFFFFFFF;
static inline void log_parse_error(const SourceLocation& location = SourceLocation::current()) static inline void log_parse_error(const SourceLocation& location = SourceLocation::current())
{ {

8
Userland/Libraries/LibX86/Instruction.h
View file

@ -29,9 +29,9 @@ protected:
template<typename T> template<typename T>
struct TypeTrivia { struct TypeTrivia {
static const size_t bits = sizeof(T) * 8; static constexpr size_t bits = sizeof(T) * 8;
static const T sign_bit = 1 << (bits - 1); static constexpr T sign_bit = 1 << (bits - 1);
static const T mask = MakeUnsigned<T>(-1); static constexpr T mask = MakeUnsigned<T>(-1);
}; };
template<typename T, typename U> template<typename T, typename U>
@ -189,7 +189,7 @@ enum InstructionFormat {
OP_NEAR_imm, OP_NEAR_imm,
}; };
static const unsigned CurrentAddressSize = 0xB33FBABE; static constexpr unsigned CurrentAddressSize = 0xB33FBABE;
struct InstructionDescriptor { struct InstructionDescriptor {
InstructionHandler handler { nullptr }; InstructionHandler handler { nullptr };

2
Userland/Services/WindowServer/Window.cpp
View file

@ -19,7 +19,7 @@
namespace WindowServer { namespace WindowServer {
const static Gfx::IntSize s_default_normal_minimum_size = { 50, 50 }; static constexpr Gfx::IntSize s_default_normal_minimum_size = { 50, 50 };
static String default_window_icon_path() static String default_window_icon_path()
{ {

8
Userland/Utilities/ddate.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, the SerenityOS developers. * Copyright (c) 2021-2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -43,9 +43,9 @@ public:
} }
private: private:
static const int m_days_in_week = 5; static constexpr int m_days_in_week = 5;
static const int m_days_in_season = 73; static constexpr int m_days_in_season = 73;
static const int m_st_tibs_day_of_yold = 60; static constexpr int m_st_tibs_day_of_yold = 60;
Core::DateTime m_gregorian_date; Core::DateTime m_gregorian_date;
String m_day_of_week; String m_day_of_week;
String m_season; String m_season;

10
Userland/Utilities/lspci.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -9,6 +10,7 @@
#include <AK/JsonObject.h> #include <AK/JsonObject.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/StringUtils.h> #include <AK/StringUtils.h>
#include <AK/StringView.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/File.h> #include <LibCore/File.h>
@ -19,9 +21,9 @@
static bool flag_show_numerical = false; static bool flag_show_numerical = false;
static bool flag_verbose = false; static bool flag_verbose = false;
static const char* format_numerical = "{:04x}:{:02x}:{:02x}.{} {}: {}:{} (rev {:02x})"; static constexpr StringView format_numerical = "{:04x}:{:02x}:{:02x}.{} {}: {}:{} (rev {:02x})";
static const char* format_textual = "{:04x}:{:02x}:{:02x}.{} {}: {} {} (rev {:02x})"; static constexpr StringView format_textual = "{:04x}:{:02x}:{:02x}.{} {}: {} {} (rev {:02x})";
static const char* format_region = "\tBAR {}: {} region @ {:#x}"; static constexpr StringView format_region = "\tBAR {}: {} region @ {:#x}";
static u32 read_hex_string_from_bytebuffer(ByteBuffer const& buf) static u32 read_hex_string_from_bytebuffer(ByteBuffer const& buf)
{ {
@ -50,7 +52,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(flag_verbose, "Show verbose info on devices", "verbose", 'v'); args_parser.add_option(flag_verbose, "Show verbose info on devices", "verbose", 'v');
args_parser.parse(arguments); args_parser.parse(arguments);
const char* format = flag_show_numerical ? format_numerical : format_textual; auto const format = flag_show_numerical ? format_numerical : format_textual;
RefPtr<PCIDB::Database> db; RefPtr<PCIDB::Database> db;
if (!flag_show_numerical) { if (!flag_show_numerical) {