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

capi: Use camelcase for FizzyErrorCode members #783

Merged
merged 1 commit into from
Apr 12, 2021
Merged

capi: Use camelcase for FizzyErrorCode members #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions include/fizzy/fizzy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ extern "C" {
/// Error codes.
typedef enum FizzyErrorCode
{
FIZZY_SUCCESS = 0,
FIZZY_ERROR_MALFORMED_MODULE,
FIZZY_ERROR_INVALID_MODULE,
FIZZY_ERROR_INSTANTIATION_FAILED,
FIZZY_ERROR_OTHER
FizzySuccess = 0,
FizzyErrorMalformedModule,
FizzyErrorInvalidModule,
FizzyErrorInstantiationFailed,
FizzyErrorOther
} FizzyErrorCode;

/// Error information.
Expand Down
12 changes: 6 additions & 6 deletions lib/fizzy/capi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ inline void set_success(FizzyError* error) noexcept
if (error == nullptr)
return;

error->code = FIZZY_SUCCESS;
error->code = FizzySuccess;
error->message[0] = '\0';
}

Expand Down Expand Up @@ -59,23 +59,23 @@ inline void set_error_from_current_exception(FizzyError* error) noexcept
}
catch (const fizzy::parser_error& e)
{
set_error_code_and_message(FIZZY_ERROR_MALFORMED_MODULE, e.what(), error);
set_error_code_and_message(FizzyErrorMalformedModule, e.what(), error);
}
catch (const fizzy::validation_error& e)
{
set_error_code_and_message(FIZZY_ERROR_INVALID_MODULE, e.what(), error);
set_error_code_and_message(FizzyErrorInvalidModule, e.what(), error);
}
catch (const fizzy::instantiate_error& e)
{
set_error_code_and_message(FIZZY_ERROR_INSTANTIATION_FAILED, e.what(), error);
set_error_code_and_message(FizzyErrorInstantiationFailed, e.what(), error);
}
catch (const std::exception& e)
{
set_error_code_and_message(FIZZY_ERROR_OTHER, e.what(), error);
set_error_code_and_message(FizzyErrorOther, e.what(), error);
}
catch (...)
{
set_error_code_and_message(FIZZY_ERROR_OTHER, "unknown error", error);
set_error_code_and_message(FizzyErrorOther, "unknown error", error);
}
}

Expand Down
44 changes: 22 additions & 22 deletions test/unittests/capi_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TEST(capi, validate)
// Success with FizzyError argument.
FizzyError success;
EXPECT_TRUE(fizzy_validate(wasm_prefix, sizeof(wasm_prefix), &success));
EXPECT_EQ(success.code, FIZZY_SUCCESS);
EXPECT_EQ(success.code, FizzySuccess);
EXPECT_STREQ(success.message, "");

wasm_prefix[7] = 1;
Expand All @@ -32,7 +32,7 @@ TEST(capi, validate)
// Parsing error with FizzyError argument.
FizzyError parsing_error;
EXPECT_FALSE(fizzy_validate(wasm_prefix, sizeof(wasm_prefix), &parsing_error));
EXPECT_EQ(parsing_error.code, FIZZY_ERROR_MALFORMED_MODULE);
EXPECT_EQ(parsing_error.code, FizzyErrorMalformedModule);
EXPECT_STREQ(parsing_error.message, "invalid wasm module prefix");

/* wat2wasm --no-check
Expand All @@ -45,7 +45,7 @@ TEST(capi, validate)
// Validation error with FizzyError argument.
FizzyError validation_error;
EXPECT_FALSE(fizzy_validate(wasm.data(), wasm.size(), &validation_error));
EXPECT_EQ(validation_error.code, FIZZY_ERROR_INVALID_MODULE);
EXPECT_EQ(validation_error.code, FizzyErrorInvalidModule);
EXPECT_STREQ(validation_error.message, "too many results");
}

Expand All @@ -55,20 +55,20 @@ TEST(capi, error_reuse)

FizzyError error;
EXPECT_TRUE(fizzy_validate(wasm_prefix, sizeof(wasm_prefix), &error));
EXPECT_EQ(error.code, FIZZY_SUCCESS);
EXPECT_EQ(error.code, FizzySuccess);
EXPECT_STREQ(error.message, "");

wasm_prefix[7] = 1;
EXPECT_FALSE(fizzy_validate(wasm_prefix, sizeof(wasm_prefix), &error));
EXPECT_EQ(error.code, FIZZY_ERROR_MALFORMED_MODULE);
EXPECT_EQ(error.code, FizzyErrorMalformedModule);
EXPECT_STREQ(error.message, "invalid wasm module prefix");

/* wat2wasm --no-check
(func (i32.const 0))
*/
const auto wasm = from_hex("0061736d01000000010401600000030201000a0601040041000b");
EXPECT_FALSE(fizzy_validate(wasm.data(), wasm.size(), &error));
EXPECT_EQ(error.code, FIZZY_ERROR_INVALID_MODULE);
EXPECT_EQ(error.code, FizzyErrorInvalidModule);
EXPECT_STREQ(error.message, "too many results");
}

Expand Down Expand Up @@ -99,7 +99,7 @@ TEST(capi, truncated_error_message)

FizzyError error;
EXPECT_FALSE(fizzy_validate(wasm.data(), wasm.size(), &error));
EXPECT_EQ(error.code, FIZZY_ERROR_INVALID_MODULE);
EXPECT_EQ(error.code, FizzyErrorInvalidModule);
EXPECT_EQ(strlen(error.message), 255);
EXPECT_STREQ(error.message,
"duplicate export name Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do "
Expand Down Expand Up @@ -128,7 +128,7 @@ TEST(capi, truncated_error_message)
// clang-format on

EXPECT_FALSE(fizzy_validate(wasm_trunc.data(), wasm_trunc.size(), &error));
EXPECT_EQ(error.code, FIZZY_ERROR_INVALID_MODULE);
EXPECT_EQ(error.code, FizzyErrorInvalidModule);
EXPECT_EQ(strlen(error.message), 255);
EXPECT_STREQ(error.message,
"duplicate export name Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do "
Expand All @@ -148,7 +148,7 @@ TEST(capi, parse)
FizzyError success;
module = fizzy_parse(wasm_prefix, sizeof(wasm_prefix), &success);
EXPECT_NE(module, nullptr);
EXPECT_EQ(success.code, FIZZY_SUCCESS);
EXPECT_EQ(success.code, FizzySuccess);
EXPECT_STREQ(success.message, "");
fizzy_free_module(module);

Expand All @@ -159,7 +159,7 @@ TEST(capi, parse)
// Parsing error with FizzyError argument.
FizzyError parsing_error;
EXPECT_FALSE(fizzy_parse(wasm_prefix, sizeof(wasm_prefix), &parsing_error));
EXPECT_EQ(parsing_error.code, FIZZY_ERROR_MALFORMED_MODULE);
EXPECT_EQ(parsing_error.code, FizzyErrorMalformedModule);
EXPECT_STREQ(parsing_error.message, "invalid wasm module prefix");

/* wat2wasm --no-check
Expand All @@ -172,7 +172,7 @@ TEST(capi, parse)
// Validation error with FizzyError argument.
FizzyError validation_error;
EXPECT_FALSE(fizzy_parse(wasm.data(), wasm.size(), &validation_error));
EXPECT_EQ(validation_error.code, FIZZY_ERROR_INVALID_MODULE);
EXPECT_EQ(validation_error.code, FizzyErrorInvalidModule);
EXPECT_STREQ(validation_error.message, "too many results");
}

Expand Down Expand Up @@ -687,7 +687,7 @@ TEST(capi, instantiate)
FizzyError success;
instance = fizzy_instantiate(module, nullptr, 0, nullptr, nullptr, nullptr, 0, &success);
EXPECT_NE(instance, nullptr);
EXPECT_EQ(success.code, FIZZY_SUCCESS);
EXPECT_EQ(success.code, FizzySuccess);
EXPECT_STREQ(success.message, "");
fizzy_free_instance(instance);
}
Expand All @@ -711,7 +711,7 @@ TEST(capi, instantiate_imported_function)
// Error with FizzyError argument.
FizzyError error;
EXPECT_EQ(fizzy_instantiate(module, nullptr, 0, nullptr, nullptr, nullptr, 0, &error), nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "module requires 1 imported functions, 0 provided");

module = fizzy_parse(wasm.data(), wasm.size(), nullptr);
Expand Down Expand Up @@ -769,14 +769,14 @@ TEST(capi, instantiate_imported_globals)
ASSERT_NE(module, nullptr);
FizzyError error;
EXPECT_EQ(fizzy_instantiate(module, nullptr, 0, nullptr, nullptr, nullptr, 0, &error), nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "module requires 4 imported globals, 0 provided");

// Not enough globals provided.
module = fizzy_parse(wasm.data(), wasm.size(), nullptr);
ASSERT_NE(module, nullptr);
EXPECT_EQ(fizzy_instantiate(module, nullptr, 0, nullptr, nullptr, globals, 3, &error), nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "module requires 4 imported globals, 3 provided");

// Incorrect order or globals.
Expand All @@ -790,7 +790,7 @@ TEST(capi, instantiate_imported_globals)
EXPECT_EQ(
fizzy_instantiate(module, nullptr, 0, nullptr, nullptr, globals_incorrect_order, 4, &error),
nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "global 2 value type doesn't match module's global type");

// Global type mismatch.
Expand All @@ -804,7 +804,7 @@ TEST(capi, instantiate_imported_globals)
EXPECT_EQ(
fizzy_instantiate(module, nullptr, 0, nullptr, nullptr, globals_type_mismatch, 4, &error),
nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "global 0 value type doesn't match module's global type");
}

Expand Down Expand Up @@ -852,7 +852,7 @@ TEST(capi, resolve_instantiate_no_imports)
instance =
fizzy_resolve_instantiate(module, nullptr, 0, nullptr, nullptr, nullptr, 0, &success);
EXPECT_NE(instance, nullptr);
EXPECT_EQ(success.code, FIZZY_SUCCESS);
EXPECT_EQ(success.code, FizzySuccess);
EXPECT_STREQ(success.message, "");

fizzy_free_instance(instance);
Expand Down Expand Up @@ -902,7 +902,7 @@ TEST(capi, resolve_instantiate_functions)
FizzyError error;
EXPECT_EQ(fizzy_resolve_instantiate(module, nullptr, 0, nullptr, nullptr, &mod1g1, 1, &error),
nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "imported function mod1.foo1 is required");

module = fizzy_parse(wasm.data(), wasm.size(), nullptr);
Expand Down Expand Up @@ -967,7 +967,7 @@ TEST(capi, resolve_instantiate_functions)
EXPECT_EQ(
fizzy_resolve_instantiate(module, host_funcs, 3, nullptr, nullptr, &mod1g1, 1, &error),
nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "imported function mod2.foo2 is required");
}

Expand Down Expand Up @@ -1023,7 +1023,7 @@ TEST(capi, resolve_instantiate_globals)
FizzyError error;
EXPECT_EQ(fizzy_resolve_instantiate(module, nullptr, 0, nullptr, nullptr, nullptr, 0, &error),
nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "imported function mod1.foo1 is required");

module = fizzy_parse(wasm.data(), wasm.size(), nullptr);
Expand Down Expand Up @@ -1097,7 +1097,7 @@ TEST(capi, resolve_instantiate_globals)
EXPECT_EQ(fizzy_resolve_instantiate(
module, &mod1foo1, 1, nullptr, nullptr, host_globals_extra, 3, &error),
nullptr);
EXPECT_EQ(error.code, FIZZY_ERROR_INSTANTIATION_FAILED);
EXPECT_EQ(error.code, FizzyErrorInstantiationFailed);
EXPECT_STREQ(error.message, "imported global mod2.g2 is required");
}

Expand Down