Skip to content

Commit

Permalink
using clang version 18.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@AbrarQuazi
AbrarQuazi committed Jan 16, 2025
1 parent a41823b commit a635a39
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 66 deletions.
8 changes: 4 additions & 4 deletions src/runtime/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct VersionPolicy {
static void set(VersionPolicy& p, const JAST& json);
static void set_input(VersionPolicy& p, const input_type& v) { p.*value = v; }
static void emit(const VersionPolicy& p, std::ostream& os) { os << p.*value; }
static void set_env_var(VersionPolicy& p, const char* env_var){};
static void set_env_var(VersionPolicy& p, const char* env_var) {};
};

struct UserConfigPolicy {
Expand Down Expand Up @@ -113,7 +113,7 @@ struct LogHeaderPolicy {
static void set(LogHeaderPolicy& p, const JAST& json);
static void set_input(LogHeaderPolicy& p, const input_type& v) { p.*value = v; }
static void emit(const LogHeaderPolicy& p, std::ostream& os) { os << p.*value; }
static void set_env_var(LogHeaderPolicy& p, const char* env_var){};
static void set_env_var(LogHeaderPolicy& p, const char* env_var) {};
};

struct LogHeaderSourceWidthPolicy {
Expand All @@ -133,7 +133,7 @@ struct LogHeaderSourceWidthPolicy {
static void set(LogHeaderSourceWidthPolicy& p, const JAST& json);
static void set_input(LogHeaderSourceWidthPolicy& p, const input_type& v) { p.*value = v; }
static void emit(const LogHeaderSourceWidthPolicy& p, std::ostream& os) { os << p.*value; }
static void set_env_var(LogHeaderSourceWidthPolicy& p, const char* env_var){};
static void set_env_var(LogHeaderSourceWidthPolicy& p, const char* env_var) {};
};

struct LabelFilterPolicy {
Expand All @@ -158,7 +158,7 @@ struct LabelFilterPolicy {
static void emit(const LabelFilterPolicy& p, std::ostream& os) {
os << p.label_filter->pattern();
}
static void set_env_var(LogHeaderSourceWidthPolicy& p, const char* value){};
static void set_env_var(LogHeaderSourceWidthPolicy& p, const char* value) {};
};

struct SharedCacheMissOnFailure {
Expand Down
11 changes: 3 additions & 8 deletions src/runtime/database.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1115,9 +1115,7 @@ JAST JobReflection::to_simple_json() const {

std::stringstream tags_stream;
for (const auto &tag : tags) {
tags_stream << "{<br>"
<< " job: " << tag.job << ",<br>"
<< " uri: " << tag.uri << ",<br>"
tags_stream << "{<br>" << " job: " << tag.job << ",<br>" << " uri: " << tag.uri << ",<br>"
<< " content: " << tag.content << "<br>},<br>";
}
json.add("tags", tags_stream.str());
Expand Down Expand Up @@ -1241,8 +1239,7 @@ JAST JobReflection::to_json() const {
json.add("stderr_payload", err_stream.c_str());

std::stringstream usage_stream;
usage_stream << "status: " << usage.status << "<br>"
<< "runtime: " << usage.runtime << "<br>"
usage_stream << "status: " << usage.status << "<br>" << "runtime: " << usage.runtime << "<br>"
<< "cputime: " << usage.cputime << "<br>"
<< "membytes: " << std::to_string(usage.membytes) << "<br>"
<< "ibytes: " << std::to_string(usage.ibytes) << "<br>"
Expand All @@ -1269,9 +1266,7 @@ JAST JobReflection::to_json() const {

std::stringstream tags_stream;
for (const auto &tag : tags) {
tags_stream << "{<br>"
<< " job: " << tag.job << ",<br>"
<< " uri: " << tag.uri << ",<br>"
tags_stream << "{<br>" << " job: " << tag.job << ",<br>" << " uri: " << tag.uri << ",<br>"
<< " content: " << tag.content << "<br>},<br>";
}
json.add("tags", tags_stream.str());
Expand Down
3 changes: 1 addition & 2 deletions src/runtime/status.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,7 @@ static void status_redraw(bool idle) {
if (idle) {
os << " ." << std::endl;
} else {
os << " "
<< "/-\\|"[ticks] << std::endl;
os << " " << "/-\\|"[ticks] << std::endl;
ticks = (ticks + spinner_update) & 3;
}
++used;
Expand Down
2 changes: 1 addition & 1 deletion src/util/rank.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#define SAMPLE_RATE 1024 // sampling rate

#define DIV_UP(x, y) (((x) + (y)-1) / (y))
#define DIV_UP(x, y) (((x) + (y) - 1) / (y))

void RankBuilder::set(uint32_t x) {
size_t off = x / 64;
Expand Down
93 changes: 48 additions & 45 deletions tools/wake-format/emitter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1691,22 +1691,23 @@ wcl::doc Emitter::walk_if(ctx_t ctx, CSTElement node) {
MEMO_RET(fits_no_nl);
}

MEMO_RET(fmt()
.token(TOKEN_KW_IF)
.consume_wsnlc()
.space()
.ctx([](ctx_t ctx) { return ctx.binop(); },
fmt().walk(is_expression, WALK_NODE)) // if cond
.consume_wsnlc()
.space()
.token(TOKEN_KW_THEN)
.consume_wsnlc()
.nest(fmt().freshline().walk(is_expression, WALK_NODE)) // true body
.consume_wsnlc()
.freshline()
.token(TOKEN_KW_ELSE)
.consume_wsnlc()
// clang-format off
MEMO_RET(
fmt()
.token(TOKEN_KW_IF)
.consume_wsnlc()
.space()
.ctx([](ctx_t ctx) { return ctx.binop(); },
fmt().walk(is_expression, WALK_NODE)) // if cond
.consume_wsnlc()
.space()
.token(TOKEN_KW_THEN)
.consume_wsnlc()
.nest(fmt().freshline().walk(is_expression, WALK_NODE)) // true body
.consume_wsnlc()
.freshline()
.token(TOKEN_KW_ELSE)
.consume_wsnlc()
// clang-format off
// False body
.match(
pred(ConstPredicate(false), fmt())
Expand All @@ -1715,8 +1716,8 @@ wcl::doc Emitter::walk_if(ctx_t ctx, CSTElement node) {
.pred(is_expression, fmt().nest(fmt().freshline().walk(WALK_NODE)))
// fallthrough is fail
)
// clang-format on
.format(ctx, node.firstChildElement(), token_traits));
// clang-format on
.format(ctx, node.firstChildElement(), token_traits));
}

wcl::doc Emitter::walk_import(ctx_t ctx, CSTElement node) {
Expand All @@ -1725,25 +1726,26 @@ wcl::doc Emitter::walk_import(ctx_t ctx, CSTElement node) {

auto id_list_fmt = fmt().walk(WALK_NODE).fmt_if(TOKEN_WS, fmt().ws());

MEMO_RET(fmt()
.token(TOKEN_KW_FROM)
.ws()
.walk(CST_ID, WALK_NODE)
.ws()
.token(TOKEN_KW_IMPORT)
.ws()
.fmt_if(CST_KIND, fmt().walk(WALK_NODE).ws())
.fmt_if(CST_ARITY, fmt().walk(WALK_NODE).ws())
// clang-format off
MEMO_RET(
fmt()
.token(TOKEN_KW_FROM)
.ws()
.walk(CST_ID, WALK_NODE)
.ws()
.token(TOKEN_KW_IMPORT)
.ws()
.fmt_if(CST_KIND, fmt().walk(WALK_NODE).ws())
.fmt_if(CST_ARITY, fmt().walk(WALK_NODE).ws())
// clang-format off
.fmt_if_else(
TOKEN_P_HOLE,
fmt().walk(WALK_TOKEN),
fmt().fmt_while(
CST_IDEQ,
id_list_fmt))
// clang-format on
.consume_wsnlc()
.format(ctx, node.firstChildElement(), token_traits));
// clang-format on
.consume_wsnlc()
.format(ctx, node.firstChildElement(), token_traits));
}

wcl::doc Emitter::walk_interpolate(ctx_t ctx, CSTElement node) {
Expand Down Expand Up @@ -2161,24 +2163,25 @@ wcl::doc Emitter::walk_tuple(ctx_t ctx, CSTElement node) {
MEMO(ctx, node);
FMT_ASSERT(node.id() == CST_TUPLE, node, "Expected CST_TUPLE");

MEMO_RET(fmt()
.fmt_if(CST_FLAG_GLOBAL, fmt().walk(WALK_NODE).ws())
.fmt_if(CST_FLAG_EXPORT, fmt().walk(WALK_NODE).ws())
.token(TOKEN_KW_TUPLE)
.ws()
.walk(is_expression, WALK_NODE)
.consume_wsnlc()
.space()
.token(TOKEN_P_EQUALS)
.consume_wsnlc()
// clang-format off
MEMO_RET(
fmt()
.fmt_if(CST_FLAG_GLOBAL, fmt().walk(WALK_NODE).ws())
.fmt_if(CST_FLAG_EXPORT, fmt().walk(WALK_NODE).ws())
.token(TOKEN_KW_TUPLE)
.ws()
.walk(is_expression, WALK_NODE)
.consume_wsnlc()
.space()
.token(TOKEN_P_EQUALS)
.consume_wsnlc()
// clang-format off
.nest(fmt().fmt_while({CST_TUPLE_ELT}, fmt()
.freshline()
.walk(WALK_NODE)
.consume_wsnlc()))
// clang-format on
.consume_wsnlc()
.format(ctx, node.firstChildElement(), token_traits));
// clang-format on
.consume_wsnlc()
.format(ctx, node.firstChildElement(), token_traits));
}

wcl::doc Emitter::walk_tuple_elt(ctx_t ctx, CSTElement node) {
Expand Down
10 changes: 4 additions & 6 deletions tools/wake-unit/unit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,8 @@ struct TestLogger {
err->test_name = test_name;
err->file = file;
err->line = line;
err->predicate_error << "Expected:\n\t"
<< "(" << expected.size() << ")" << term_colour(TERM_MAGENTA) << '"'
<< json_escape(expected) << '"';
err->predicate_error << "Expected:\n\t" << "(" << expected.size() << ")"
<< term_colour(TERM_MAGENTA) << '"' << json_escape(expected) << '"';
err->predicate_error << term_normal() << "\nBut got:\n\t";
err->predicate_error << "(" << actual.size() << ")" << term_colour(TERM_MAGENTA) << '"'
<< json_escape(actual) << '"';
Expand All @@ -262,9 +261,8 @@ struct TestLogger {
err->test_name = test_name;
err->file = file;
err->line = line;
err->predicate_error << "Expected:\n\t"
<< "(" << expected.size() << ")" << term_colour(TERM_MAGENTA) << '"'
<< json_escape(expected) << '"';
err->predicate_error << "Expected:\n\t" << "(" << expected.size() << ")"
<< term_colour(TERM_MAGENTA) << '"' << json_escape(expected) << '"';
err->predicate_error << term_normal() << "\nBut got:\n\t";
err->predicate_error << "(" << actual.size() << ")" << term_colour(TERM_MAGENTA) << '"'
<< json_escape(actual) << '"';
Expand Down

0 comments on commit a635a39

Please sign in to comment.