Merge commit '4fe5775e57bcf3d5b6c7df13f11a1f7c3c3615cb' into develop
This commit is contained in:
commit
6a3055587e
@ -1282,22 +1282,27 @@ Interpreter::~Interpreter(void) {
|
|||||||
case 1: {
|
case 1: {
|
||||||
auto table = static_cast<CSETable<FixedKey<1>>*>(cse[i]);
|
auto table = static_cast<CSETable<FixedKey<1>>*>(cse[i]);
|
||||||
table->destroy(this);
|
table->destroy(this);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 2: {
|
case 2: {
|
||||||
auto table = static_cast<CSETable<FixedKey<2>>*>(cse[i]);
|
auto table = static_cast<CSETable<FixedKey<2>>*>(cse[i]);
|
||||||
table->destroy(this);
|
table->destroy(this);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 3: {
|
case 3: {
|
||||||
auto table = static_cast<CSETable<FixedKey<3>>*>(cse[i]);
|
auto table = static_cast<CSETable<FixedKey<3>>*>(cse[i]);
|
||||||
table->destroy(this);
|
table->destroy(this);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 4: {
|
case 4: {
|
||||||
auto table = static_cast<CSETable<FixedKey<4>>*>(cse[i]);
|
auto table = static_cast<CSETable<FixedKey<4>>*>(cse[i]);
|
||||||
table->destroy(this);
|
table->destroy(this);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
auto table = static_cast<CSETable<VariadicKey>*>(cse[i]);
|
auto table = static_cast<CSETable<VariadicKey>*>(cse[i]);
|
||||||
table->destroy(this);
|
table->destroy(this);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1432,22 +1437,27 @@ size_t Trail::save_state(MiniZinc::Interpreter* interpreter) {
|
|||||||
case 1: {
|
case 1: {
|
||||||
auto table = static_cast<CSETable<FixedKey<1>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<1>>*>(interpreter->cse[i]);
|
||||||
table->push(interpreter, !last_operation_pop);
|
table->push(interpreter, !last_operation_pop);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 2: {
|
case 2: {
|
||||||
auto table = static_cast<CSETable<FixedKey<2>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<2>>*>(interpreter->cse[i]);
|
||||||
table->push(interpreter, !last_operation_pop);
|
table->push(interpreter, !last_operation_pop);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 3: {
|
case 3: {
|
||||||
auto table = static_cast<CSETable<FixedKey<3>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<3>>*>(interpreter->cse[i]);
|
||||||
table->push(interpreter, !last_operation_pop);
|
table->push(interpreter, !last_operation_pop);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 4: {
|
case 4: {
|
||||||
auto table = static_cast<CSETable<FixedKey<4>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<4>>*>(interpreter->cse[i]);
|
||||||
table->push(interpreter, !last_operation_pop);
|
table->push(interpreter, !last_operation_pop);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
auto table = static_cast<CSETable<VariadicKey>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<VariadicKey>*>(interpreter->cse[i]);
|
||||||
table->push(interpreter, !last_operation_pop);
|
table->push(interpreter, !last_operation_pop);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1511,22 +1521,27 @@ void Trail::untrail(MiniZinc::Interpreter* interpreter) {
|
|||||||
case 1: {
|
case 1: {
|
||||||
auto table = static_cast<CSETable<FixedKey<1>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<1>>*>(interpreter->cse[i]);
|
||||||
table->pop(interpreter);
|
table->pop(interpreter);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 2: {
|
case 2: {
|
||||||
auto table = static_cast<CSETable<FixedKey<2>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<2>>*>(interpreter->cse[i]);
|
||||||
table->pop(interpreter);
|
table->pop(interpreter);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 3: {
|
case 3: {
|
||||||
auto table = static_cast<CSETable<FixedKey<3>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<3>>*>(interpreter->cse[i]);
|
||||||
table->pop(interpreter);
|
table->pop(interpreter);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 4: {
|
case 4: {
|
||||||
auto table = static_cast<CSETable<FixedKey<4>>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<FixedKey<4>>*>(interpreter->cse[i]);
|
||||||
table->pop(interpreter);
|
table->pop(interpreter);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
auto table = static_cast<CSETable<VariadicKey>*>(interpreter->cse[i]);
|
auto table = static_cast<CSETable<VariadicKey>*>(interpreter->cse[i]);
|
||||||
table->pop(interpreter);
|
table->pop(interpreter);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user