Re-enable GCC builds (#738)

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Feb 10, 2024 · 0b6459b · 0b6459b
1 parent c95692f
commit 0b6459b
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,10 +20,9 @@ jobs:
           - os: ubuntu-latest
             cc: clang
             cxx: clang++
-          # TODO: Re-enable this
-          # - os: ubuntu-latest
-            # cc: gcc
-            # cxx: g++
+          - os: ubuntu-latest
+            cc: gcc
+            cxx: g++
           - os: windows-latest
 
           # Sanitizers

diff --git a/src/canonicalizer/utils.h b/src/canonicalizer/utils.h
@@ -39,7 +39,7 @@ auto is_null_schema(const sourcemeta::jsontoolkit::JSON &schema,
 }
 
 auto is_unique(const sourcemeta::jsontoolkit::JSON &document) -> bool {
-  auto copy{document};
+  auto copy = document;
   std::sort(copy.as_array().begin(), copy.as_array().end());
   return std::unique(copy.as_array().begin(), copy.as_array().end()) ==
          copy.as_array().end();

diff --git a/src/cli/command_decode.cc b/src/cli/command_decode.cc
@@ -34,7 +34,7 @@ static auto decode_from_stream(sourcemeta::jsontoolkit::JSON &schema,
   const sourcemeta::jsonbinpack::Encoding encoding{
       sourcemeta::jsonbinpack::parse(schema)};
   sourcemeta::jsonbinpack::Decoder decoder{stream};
-  const sourcemeta::jsontoolkit::JSON result{decoder.decode(encoding)};
+  const sourcemeta::jsontoolkit::JSON result = decoder.decode(encoding);
   sourcemeta::jsontoolkit::stringify(result, std::cout);
   return EXIT_SUCCESS;
 }

diff --git a/src/mapper/rules/enum_8_bit.h b/src/mapper/rules/enum_8_bit.h
@@ -22,8 +22,7 @@ class Enum8Bit final : public sourcemeta::jsontoolkit::SchemaTransformRule {
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
-    options.assign("choices", sourcemeta::jsontoolkit::JSON(
-                                  transformer.schema().at("enum")));
+    options.assign("choices", transformer.schema().at("enum"));
     make_encoding(transformer, "BYTE_CHOICE_INDEX", options);
   }
 };

diff --git a/src/mapper/rules/enum_8_bit_top_level.h b/src/mapper/rules/enum_8_bit_top_level.h
@@ -23,8 +23,7 @@ class Enum8BitTopLevel final
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
-    options.assign("choices", sourcemeta::jsontoolkit::JSON(
-                                  transformer.schema().at("enum")));
+    options.assign("choices", transformer.schema().at("enum"));
     make_encoding(transformer, "TOP_LEVEL_BYTE_CHOICE_INDEX", options);
   }
 };

diff --git a/src/mapper/rules/enum_arbitrary.h b/src/mapper/rules/enum_arbitrary.h
@@ -24,8 +24,7 @@ class EnumArbitrary final
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
-    options.assign("choices", sourcemeta::jsontoolkit::JSON(
-                                  transformer.schema().at("enum")));
+    options.assign("choices", transformer.schema().at("enum"));
     make_encoding(transformer, "LARGE_CHOICE_INDEX", options);
   }
 };

diff --git a/src/mapper/rules/enum_singleton.h b/src/mapper/rules/enum_singleton.h
@@ -23,8 +23,7 @@ class EnumSingleton final
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
-    options.assign("value", sourcemeta::jsontoolkit::JSON(
-                                transformer.schema().at("enum").at(0)));
+    options.assign("value", transformer.schema().at("enum").at(0));
     make_encoding(transformer, "CONST_NONE", options);
   }
 };

diff --git a/src/mapper/rules/integer_bounded_8_bit.h b/src/mapper/rules/integer_bounded_8_bit.h
@@ -26,8 +26,8 @@ class IntegerBounded8Bit final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto minimum{transformer.schema().at("minimum")};
-    auto maximum{transformer.schema().at("maximum")};
+    auto minimum = transformer.schema().at("minimum");
+    auto maximum = transformer.schema().at("maximum");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("minimum", std::move(minimum));
     options.assign("maximum", std::move(maximum));

diff --git a/src/mapper/rules/integer_bounded_greater_than_8_bit.h b/src/mapper/rules/integer_bounded_greater_than_8_bit.h
@@ -27,7 +27,7 @@ class IntegerBoundedGreaterThan8Bit final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto minimum{transformer.schema().at("minimum")};
+    auto minimum = transformer.schema().at("minimum");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("minimum", std::move(minimum));
     options.assign("multiplier", sourcemeta::jsontoolkit::JSON{1});

diff --git a/src/mapper/rules/integer_bounded_multiplier_8_bit.h b/src/mapper/rules/integer_bounded_multiplier_8_bit.h
@@ -32,9 +32,9 @@ class IntegerBoundedMultiplier8Bit final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto minimum{transformer.schema().at("minimum")};
-    auto maximum{transformer.schema().at("maximum")};
-    auto multiplier{transformer.schema().at("multipleOf")};
+    auto minimum = transformer.schema().at("minimum");
+    auto maximum = transformer.schema().at("maximum");
+    auto multiplier = transformer.schema().at("multipleOf");
 
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("minimum", std::move(minimum));

diff --git a/src/mapper/rules/integer_bounded_multiplier_greater_than_8_bit.h b/src/mapper/rules/integer_bounded_multiplier_greater_than_8_bit.h
@@ -36,8 +36,8 @@ class IntegerBoundedMultiplierGreaterThan8Bit final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto minimum{transformer.schema().at("minimum")};
-    auto multiplier{transformer.schema().at("multipleOf")};
+    auto minimum = transformer.schema().at("minimum");
+    auto multiplier = transformer.schema().at("multipleOf");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("minimum", std::move(minimum));
     options.assign("multiplier", std::move(multiplier));

diff --git a/src/mapper/rules/integer_lower_bound.h b/src/mapper/rules/integer_lower_bound.h
@@ -24,7 +24,7 @@ class IntegerLowerBound final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto minimum{transformer.schema().at("minimum")};
+    auto minimum = transformer.schema().at("minimum");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("minimum", std::move(minimum));
     options.assign("multiplier", sourcemeta::jsontoolkit::JSON{1});

diff --git a/src/mapper/rules/integer_lower_bound_multiplier.h b/src/mapper/rules/integer_lower_bound_multiplier.h
@@ -25,8 +25,8 @@ class IntegerLowerBoundMultiplier final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto minimum{transformer.schema().at("minimum")};
-    auto multiplier{transformer.schema().at("multipleOf")};
+    auto minimum = transformer.schema().at("minimum");
+    auto multiplier = transformer.schema().at("multipleOf");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("minimum", std::move(minimum));
     options.assign("multiplier", std::move(multiplier));

diff --git a/src/mapper/rules/integer_unbound_multiplier.h b/src/mapper/rules/integer_unbound_multiplier.h
@@ -25,7 +25,7 @@ class IntegerUnboundMultiplier final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto multiplier{transformer.schema().at("multipleOf")};
+    auto multiplier = transformer.schema().at("multipleOf");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("multiplier", std::move(multiplier));
     make_encoding(transformer, "ARBITRARY_MULTIPLE_ZIGZAG_VARINT", options);

diff --git a/src/mapper/rules/integer_upper_bound.h b/src/mapper/rules/integer_upper_bound.h
@@ -24,7 +24,7 @@ class IntegerUpperBound final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto maximum{transformer.schema().at("maximum")};
+    auto maximum = transformer.schema().at("maximum");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("maximum", std::move(maximum));
     options.assign("multiplier", sourcemeta::jsontoolkit::JSON{1});

diff --git a/src/mapper/rules/integer_upper_bound_multiplier.h b/src/mapper/rules/integer_upper_bound_multiplier.h
@@ -25,8 +25,8 @@ class IntegerUpperBoundMultiplier final
 
   auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) const
       -> void override {
-    auto maximum{transformer.schema().at("maximum")};
-    auto multiplier{transformer.schema().at("multipleOf")};
+    auto maximum = transformer.schema().at("maximum");
+    auto multiplier = transformer.schema().at("multipleOf");
     auto options = sourcemeta::jsontoolkit::JSON::make_object();
     options.assign("maximum", std::move(maximum));
     options.assign("multiplier", std::move(multiplier));

diff --git a/test/canonicalizer/2020_12_any_test.cc b/test/canonicalizer/2020_12_any_test.cc
@@ -393,7 +393,7 @@ TEST(CanonicalizerAny_2020_12, implicit_type_union_1) {
 
 TEST(CanonicalizerAny_2020_12, boolean_schema_1) {
   sourcemeta::jsonbinpack::Canonicalizer canonicalizer;
-  sourcemeta::jsontoolkit::JSON schema{sourcemeta::jsontoolkit::JSON{true}};
+  sourcemeta::jsontoolkit::JSON schema{true};
 
   canonicalizer.apply(schema, sourcemeta::jsontoolkit::default_schema_walker,
                       sourcemeta::jsontoolkit::official_resolver,
@@ -434,7 +434,7 @@ TEST(CanonicalizerAny_2020_12, boolean_schema_1) {
 
 TEST(CanonicalizerAny_2020_12, boolean_schema_2) {
   sourcemeta::jsonbinpack::Canonicalizer canonicalizer;
-  sourcemeta::jsontoolkit::JSON schema{sourcemeta::jsontoolkit::JSON{false}};
+  sourcemeta::jsontoolkit::JSON schema{false};
 
   canonicalizer.apply(schema, sourcemeta::jsontoolkit::default_schema_walker,
                       sourcemeta::jsontoolkit::official_resolver,

diff --git a/test/runtime/decode_enum_test.cc b/test/runtime/decode_enum_test.cc
@@ -139,8 +139,8 @@ TEST(Decoder, LARGE_CHOICE_INDEX_non_scalar_1) {
   choices.push_back(sourcemeta::jsontoolkit::parse("{ \"bar\": 1 }"));
   const sourcemeta::jsontoolkit::JSON result =
       decoder.LARGE_CHOICE_INDEX({std::move(choices)});
-  const sourcemeta::jsontoolkit::JSON expected{
-      sourcemeta::jsontoolkit::parse("{ \"foo\": 1 }")};
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse("{ \"foo\": 1 }");
   EXPECT_EQ(result, expected);
 }