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

Fix typo in error name: Efeature_unavaliable... -> Efeature_unavailable #333

Closed
wants to merge 1 commit into from
Closed

Fix typo in error name: Efeature_unavaliable... -> Efeature_unavailable #333

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
2 changes: 1 addition & 1 deletion docs/manual/errors-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<tr><td>Einvalid_global_label</td><td>Global label definition contains an invalid label [%s].</td></tr>
<tr><td>Espc700_addr_out_of_range</td><td>Address %s out of range for instruction, valid range is 0000-1FFF</td></tr>
<tr><td>Elabel_ambiguous</td><td>Label (%s) location is ambiguous due to straddling optimization border.</td></tr>
<tr><td>Efeature_unavaliable_in_spcblock</td><td>This feature may not be used while an spcblock is active</td></tr>
<tr><td>Efeature_unavailable_in_spcblock</td><td>This feature may not be used while an spcblock is active</td></tr>
<tr><td>Eendspcblock_without_spcblock</td><td>Use of endspcblock without matching spcblock</td></tr>
<tr><td>Emissing_endspcblock</td><td>Use of endspcblock without matching spcblock</td></tr>
<tr><td>Espcblock_bad_arch</td><td>spcblock only valid inside spc700 arch</td></tr>
Expand Down
18 changes: 9 additions & 9 deletions src/asar/assembleblock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,7 +1625,7 @@ void assembleblock(const char * block, bool isspecialline)
else if (assemblemapper(word, numwords)) {}
else if (is1("org"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
freespaceend();
unsigned int num=getnum(par);
if (forwardlabel) asar_throw_error(0, error_type_block, error_id_org_label_forward);
Expand Down Expand Up @@ -1954,7 +1954,7 @@ void assembleblock(const char * block, bool isspecialline)
}
else if (is("freespace") || is("freecode") || is("freedata"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
if (emulatexkas) asar_throw_warning(0, warning_id_convert_to_asar);
string parstr;
if (numwords==1) parstr="\n";//crappy hack: impossible character to cut out extra commas
Expand Down Expand Up @@ -2047,7 +2047,7 @@ void assembleblock(const char * block, bool isspecialline)
}
else if (is1("prot"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
if (!confirmqpar(par)) asar_throw_error(0, error_type_block, error_id_mismatched_parentheses);
if (!ratsmetastate) asar_throw_error(2, error_type_block, error_id_prot_not_at_freespace_start);
if (ratsmetastate==ratsmeta_used) step(-5);
Expand Down Expand Up @@ -2080,7 +2080,7 @@ void assembleblock(const char * block, bool isspecialline)
}
else if (is1("autoclean") || is2("autoclean") || is1("autoclear") || is2("autoclear"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
if (is1("autoclear") || is2("autoclear")) asar_throw_warning(0, warning_id_autoclear_deprecated);
if (numwords==3)
{
Expand Down Expand Up @@ -2213,7 +2213,7 @@ void assembleblock(const char * block, bool isspecialline)
}
else if (is0("pushns"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
pushns[pushnsnum].ns = ns;
for(int i = 0; i < namespace_list.count; i++)
{
Expand All @@ -2228,7 +2228,7 @@ void assembleblock(const char * block, bool isspecialline)
}
else if (is0("pullns"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
if (!pushnsnum) asar_throw_error(0, error_type_block, error_id_pullns_without_pushns);
pushnsnum--;
ns = pushns[pushnsnum].ns;
Expand All @@ -2241,7 +2241,7 @@ void assembleblock(const char * block, bool isspecialline)
}
else if (is1("namespace") || is2("namespace"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
bool leave = false;
if (par)
{
Expand Down Expand Up @@ -2647,7 +2647,7 @@ void assembleblock(const char * block, bool isspecialline)
}
else if (is1("arch"))
{
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
if (emulatexkas) asar_throw_warning(0, warning_id_convert_to_asar);
if (!stricmp(par, "65816")) { arch=arch_65816; return; }
if (!stricmp(par, "spc700")) { arch=arch_spc700; return; }
Expand Down Expand Up @@ -2786,7 +2786,7 @@ bool assemblemapper(char** word, int numwords)
}
else return false;

if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavaliable_in_spcblock);
if(in_spcblock) asar_throw_error(0, error_type_block, error_id_feature_unavailable_in_spcblock);
if(!mapper_set){
mapper_set = true;
}else if(previous_mapper != mapper){
Expand Down
2 changes: 1 addition & 1 deletion src/asar/errors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static asar_error_mapping asar_errors[] =
{ ERR(spc700_addr_out_of_range), "Address %s out of range for instruction, valid range is 0000-1FFF" },
{ ERR(label_ambiguous), "Label (%s) location is ambiguous due to straddling optimization border." },

{ ERR(feature_unavaliable_in_spcblock), "This feature may not be used while an spcblock is active" },
{ ERR(feature_unavailable_in_spcblock), "This feature may not be used while an spcblock is active" },
{ ERR(endspcblock_without_spcblock), "Use of endspcblock without matching spcblock" },
{ ERR(missing_endspcblock), "Use of endspcblock without matching spcblock" },
{ ERR(spcblock_bad_arch), "spcblock only valid inside spc700 arch" },
Expand Down
2 changes: 1 addition & 1 deletion src/asar/errors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ enum asar_error_id : int
error_id_spc700_addr_out_of_range,
error_id_label_ambiguous,

error_id_feature_unavaliable_in_spcblock,
error_id_feature_unavailable_in_spcblock,
error_id_endspcblock_without_spcblock,
error_id_missing_endspcblock,
error_id_spcblock_bad_arch,
Expand Down
Loading