Skip to content
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

Jump to bottom

🐛 Enforce runtime evaluation of dynamic formatting strings to fix consteval contexts #585

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+59 −23
Open

🐛 Enforce runtime evaluation of dynamic formatting strings to fix consteval contexts #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cccfc9
:bug: Enforce runtime evaluation of dynamic formatting strings to fix…
marcelwa Nov 17, 2024
10b0924
:art: Address `clang-tidy` warning
marcelwa Nov 17, 2024
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
2 changes: 0 additions & 2 deletions include/fiction/io/print_layout.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

#include "fiction/layouts/bounding_box.hpp"
#include "fiction/technology/cell_technologies.hpp"
#include "fiction/technology/charge_distribution_surface.hpp"
#include "fiction/technology/sidb_charge_state.hpp"
#include "fiction/technology/sidb_defect_surface.hpp"
#include "fiction/technology/sidb_defects.hpp"
#include "fiction/technology/sidb_lattice.hpp"
#include "fiction/technology/sidb_lattice_orientations.hpp"
Expand Down
14 changes: 7 additions & 7 deletions include/fiction/io/write_svg_layout.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ class write_qca_layout_svg_impl
if (lyt.is_synchronization_element(c))
{
cell_descriptions
<< fmt::format(desc_col.first, desc_col.second,
<< fmt::format(fmt::runtime(desc_col.first), desc_col.second,
svg::STARTING_OFFSET_TILE_X + svg::STARTING_OFFSET_LATCH_CELL_X +
(c.x * svg::CELL_DISTANCE),
svg::STARTING_OFFSET_TILE_Y + svg::STARTING_OFFSET_LATCH_CELL_Y +
Expand All @@ -863,7 +863,7 @@ class write_qca_layout_svg_impl
if (!is_sync_elem)
{
cell_descriptions << fmt::format(
desc_col.first, desc_col.second,
fmt::runtime(desc_col.first), desc_col.second,
svg::STARTING_OFFSET_TILE_X + svg::STARTING_OFFSET_CELL_X + (c.x * svg::CELL_DISTANCE),
svg::STARTING_OFFSET_TILE_Y + svg::STARTING_OFFSET_CELL_Y + (c.y * svg::CELL_DISTANCE));
}
Expand Down Expand Up @@ -959,7 +959,7 @@ class write_qca_layout_svg_impl
if (const auto latch_delay = lyt.get_synchronization_element(c); latch_delay > 0)
{
coord_to_latch_cells[tile_coords] = current_cells.append(
fmt::format(desc_col.first, desc_col.second,
fmt::format(fmt::runtime(desc_col.first), desc_col.second,
svg::STARTING_OFFSET_LATCH_CELL_X + (in_tile.x * svg::CELL_DISTANCE),
svg::STARTING_OFFSET_LATCH_CELL_Y + (in_tile.y * svg::CELL_DISTANCE)));

Expand All @@ -970,7 +970,7 @@ class write_qca_layout_svg_impl
if (!is_sync_elem)
{
coord_to_cells[tile_coords] = current_cells.append(
fmt::format(desc_col.first, desc_col.second,
fmt::format(fmt::runtime(desc_col.first), desc_col.second,
svg::STARTING_OFFSET_CELL_X + (in_tile.x * svg::CELL_DISTANCE),
svg::STARTING_OFFSET_CELL_Y + (in_tile.y * svg::CELL_DISTANCE)));
}
Expand Down Expand Up @@ -1031,7 +1031,7 @@ class write_qca_layout_svg_impl
const double y_pos = svg::STARTING_OFFSET_TILE_Y + (coord.y * svg::TILE_DISTANCE);

const auto c_descr =
fmt::format(descr, x_pos, y_pos, tile_colors[czone], cell_descriptions,
fmt::format(fmt::runtime(descr), x_pos, y_pos, tile_colors[czone], cell_descriptions,
ps.simple ? "" : text_colors[czone], ps.simple ? "" : std::to_string(czone + 1));

tile_descriptions << c_descr;
Expand All @@ -1051,8 +1051,8 @@ class write_qca_layout_svg_impl
const double y_pos = svg::STARTING_OFFSET_LATCH_Y + (coord.y * svg::TILE_DISTANCE);

const auto t_descr =
fmt::format(descr, x_pos, y_pos, tile_colors[czone_lo], tile_colors[czone_up], cell_descriptions,
text_colors[czone_up], ps.simple ? "" : std::to_string(czone_up + 1),
fmt::format(fmt::runtime(descr), x_pos, y_pos, tile_colors[czone_lo], tile_colors[czone_up],
cell_descriptions, text_colors[czone_up], ps.simple ? "" : std::to_string(czone_up + 1),
text_colors[czone_lo], ps.simple ? "" : std::to_string(czone_lo + 1));

tile_descriptions << t_descr;
Expand Down
6 changes: 3 additions & 3 deletions include/fiction/layouts/coordinates.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,7 @@ struct formatter<fiction::offset::ucoord_t>
template <typename FormatContext>
auto format(const fiction::offset::ucoord_t& c, FormatContext& ctx) const
{
return format_to(ctx.out(), "({},{},{})", c.x, c.y, c.z);
return format_to(ctx.out(), runtime("({},{},{})"), c.x, c.y, c.z);
}
};
// make cube::coord_t compatible with fmt::format
Expand All @@ -1098,7 +1098,7 @@ struct formatter<fiction::cube::coord_t>
template <typename FormatContext>
auto format(const fiction::cube::coord_t& c, FormatContext& ctx) const
{
return format_to(ctx.out(), "({},{},{})", c.x, c.y, c.z);
return format_to(ctx.out(), runtime("({},{},{})"), c.x, c.y, c.z);
}
};
// make siqad::coord_t compatible with fmt::format
Expand All @@ -1114,7 +1114,7 @@ struct formatter<fiction::siqad::coord_t>
template <typename FormatContext>
auto format(const fiction::siqad::coord_t& c, FormatContext& ctx) const
{
return format_to(ctx.out(), "({},{},{})", c.x, c.y, c.z);
return format_to(ctx.out(), runtime("({},{},{})"), c.x, c.y, c.z);
}
};

Expand Down
60 changes: 49 additions & 11 deletions include/fiction/technology/cell_ports.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ struct formatter<fiction::port_position>
template <typename FormatContext>
auto format(const fiction::port_position& p, FormatContext& ctx) const
{
return format_to(ctx.out(), "({},{})", p.x, p.y);
return format_to(ctx.out(), runtime("({},{})"), p.x, p.y);
}
};
// make port_direction compatible with fmt::format
Expand All @@ -299,15 +299,53 @@ struct formatter<fiction::port_direction>
template <typename FormatContext>
auto format(const fiction::port_direction& p, FormatContext& ctx) const
{
return format_to(ctx.out(), p.dir == fiction::port_direction::NORTH ? "N" :
p.dir == fiction::port_direction::NORTH_EAST ? "NE" :
p.dir == fiction::port_direction::EAST ? "E" :
p.dir == fiction::port_direction::SOUTH_EAST ? "SE" :
p.dir == fiction::port_direction::SOUTH ? "S" :
p.dir == fiction::port_direction::SOUTH_WEST ? "SW" :
p.dir == fiction::port_direction::WEST ? "W" :
p.dir == fiction::port_direction::NORTH_WEST ? "NW" :
"?");
const auto* dir = "?";

switch (p.dir)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: switching on non-enum value without default case may not cover all cases [bugprone-switch-missing-default-case]

        switch (p.dir)
        ^

{
case fiction::port_direction::NORTH:
{
dir = "N";
break;
}
case fiction::port_direction::NORTH_EAST:
{
dir = "NE";
break;
}
case fiction::port_direction::EAST:
{
dir = "E";
break;
}
case fiction::port_direction::SOUTH_EAST:
{
dir = "SE";
break;
}
case fiction::port_direction::SOUTH:
{
dir = "S";
break;
}
case fiction::port_direction::SOUTH_WEST:
{
dir = "SW";
break;
}
case fiction::port_direction::WEST:
{
dir = "W";
break;
}
case fiction::port_direction::NORTH_WEST:
{
dir = "NW";
break;
}
}

return format_to(ctx.out(), dir);
}
};
// make port_list compatible with fmt::format
Expand All @@ -323,7 +361,7 @@ struct formatter<fiction::port_list<PortType>>
template <typename FormatContext>
auto format(const fiction::port_list<PortType>& pl, FormatContext& ctx) const
{
return format_to(ctx.out(), "inp: {}, out: {}", join(pl.inp, ", "), join(pl.out, ", "));
return format_to(ctx.out(), runtime("inp: {}, out: {}"), join(pl.inp, ", "), join(pl.out, ", "));
}
};
} // namespace fmt
Expand Down
Loading