fix: incorrect behavior

ArgonLang · Jan 24, 2024 · c46bf8b · c46bf8b
1 parent b1ad5b4
commit c46bf8b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/argon/vm/datatype/arobject.cpp b/argon/vm/datatype/arobject.cpp
@@ -375,9 +375,12 @@ ArObject *argon::vm::datatype::Compare(const ArObject *self, const ArObject *oth
  result = rc(other, self, reverse[(int) mode]);
 
  if (result == nullptr) {
- if (mode != CompareMode::EQ) {
- ErrorFormat(kNotImplementedError[0], kNotImplementedError[2], str_mode[(int) mode],
- AR_TYPE_NAME(self), AR_TYPE_NAME(other));
+ if (mode != CompareMode::EQ && !IsPanickingFrame()) {
+ ErrorFormat(kNotImplementedError[0],
+ kNotImplementedError[2],
+ str_mode[(int) mode],
+ AR_TYPE_NAME(self),
+ AR_TYPE_NAME(other));
  return nullptr;
  }
 
@@ -858,8 +861,6 @@ bool ExportDefaultMethod(TypeInfo *type) {
 
  FunctionDef fdef{};
 
- ArObject *tmp;
-
  bool exists;
 
  fdef.method = true;

diff --git a/argon/vm/panic.cpp b/argon/vm/panic.cpp
@@ -23,7 +23,10 @@ void argon::vm::PanicFill(Panic *panic, Panic *prev, Frame *frame, ArObject *obj
  panic->frame = frame;
  panic->object = IncRef(object);
  panic->recovered = false;
- panic->aborted = prev != nullptr;
+ panic->aborted = false;
+
+ if (prev != nullptr)
+ prev->aborted = true;
 
  if (panic->frame != nullptr)
  panic->frame->counter++;