mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 15:40:26 +00:00
Code Issues Releases Wiki Activity

removed mismatch_error to multiple error causes

Browse Source
This commit is contained in:
Zeno Rogue 2021-08-19 13:19:01 +02:00
parent 19f65644e7
commit 881b262174
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rulegen.cpp
View File

@ -944,10 +944,6 @@ EX pair<int, int> get_code(tcell *c) {
/* == rule generation == */ /* == rule generation == */
struct mismatch_error : rulegen_retry {
mismatch_error() : rulegen_retry("mismatch error") {}
};
EX int rule_root; EX int rule_root;
vector<int> gen_rule(twalker cwmain); vector<int> gen_rule(twalker cwmain);
@ -1039,7 +1035,7 @@ void rules_iteration_for(tcell *c) {
extend_analyzer(cwmain, z, k, mismatches, treestates[id].giver); extend_analyzer(cwmain, z, k, mismatches, treestates[id].giver);
mismatches++; mismatches++;
throw mismatch_error(); throw rulegen_retry("mismatch error");
} }
} }
} }
@ -1047,7 +1043,7 @@ void rules_iteration_for(tcell *c) {
debuglist = { cwmain, ts.giver }; debuglist = { cwmain, ts.giver };
if(mismatches) if(mismatches)
throw mismatch_error(); throw rulegen_retry("mismatch error");
throw rulegen_failure("no mismatches?!"); throw rulegen_failure("no mismatches?!");
} }
@ -1305,7 +1301,7 @@ void find_single_live_branch(twalker at) {
int t = at.at->type; int t = at.at->type;
auto& r = treestates[id].rules; auto& r = treestates[id].rules;
int q = 0; int q = 0;
if(r.empty()) { important.push_back(at.at); throw mismatch_error(); } if(r.empty()) { important.push_back(at.at); throw rulegen_retry("no giver in find_single_live_branch"); }
for(int i=0; i<t; i++) if(r[i] >= 0) { for(int i=0; i<t; i++) if(r[i] >= 0) {
if(treestates[r[i]].is_live) q++; if(treestates[r[i]].is_live) q++;
} }
@ -1427,13 +1423,13 @@ EX void rules_iteration() {
handle_distance_errors(); handle_distance_errors();
if(isize(important) != N) if(isize(important) != N)
throw mismatch_error(); throw rulegen_retry("need more rules after examine");
minimize_rules(); minimize_rules();
find_possible_parents(); find_possible_parents();
if(isize(important) != N) if(isize(important) != N)
throw mismatch_error(); throw rulegen_retry("need more rules after minimize");
handle_distance_errors(); handle_distance_errors();
} }