From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Sat, 8 Sep 2007 20:55:15 +0000 (+0000)
Subject: Rename remaining instances of 'abort' to 'except'.
X-Git-Tag: 1.0.0~434
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=7c03b1e47ddefae9577cfe0d2dd3f6fff83b57ec;p=bertos.git

Rename remaining instances of 'abort' to 'except'.


git-svn-id: https://src.develer.com/svnoss/bertos/trunk@807 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/mware/except.h b/mware/except.h
index fc7f1421..af4c0644 100755
--- a/mware/except.h
+++ b/mware/except.h
@@ -33,13 +33,13 @@ extern jmp_buf except_stack[EXCEPT_CONTEXTS];
 extern int except_top;
 
 #ifdef _DEBUG
-#	define PUSH_ABORT	ASSERT(abort_top < ABORT_CONTEXTS), setjmp(abort_stack[abort_top++]))
-#	define POP_ABORT	(ASSERT(abort_top > 0), --abort_top)
-#	define DO_ABORT		(ASSERT(abort_top > 0), longjmp(abort_stack[--abort_top], true))
+#	define PUSH_EXCEPT	ASSERT(except_top < EXCEPT_CONTEXTS), setjmp(except_stack[except_top++]))
+#	define POP_EXCEPT	(ASSERT(except_top > 0), --except_top)
+#	define DO_EXCEPT	(ASSERT(except_top > 0), longjmp(except_stack[--except_top], true))
 #else
-#	define PUSH_ABORT	(setjmp(abort_stack[abort_top++]))
-#	define POP_ABORT	(--abort_top)
-#	define DO_ABORT		(longjmp(abort_stack[--abort_top], true))
+#	define PUSH_EXCEPT	(setjmp(except_stack[except_top++]))
+#	define POP_EXCEPT	(--except_top)
+#	define DO_EXCEPT	(longjmp(except_stack[--except_top], true))
 #endif
 
 /**
@@ -92,15 +92,15 @@ extern int except_top;
  *    EXCEPT_DEFINE;
  * \endcode
  */
-#define TRY          if (PUSH_ABORT) { {
-#define TRY_END      } POP_ABORT; }
-#define CATCH        } POP_ABORT; } else {
+#define TRY          if (PUSH_EXCEPT) { {
+#define TRY_END      } POP_EXCEPT; }
+#define CATCH        } POP_EXCEPT; } else {
 #define CATCH_END    }
-#define THROW        DO_ABORT
+#define THROW        DO_EXCEPT
 
 
 #define EXCEPT_DEFINE \
-	jmp_buf abort_stack[ABORT_CONTEXTS]; \
-	int abort_top;
+	jmp_buf except_stack[EXCEPT_CONTEXTS]; \
+	int except_top;
 
 #endif /* MWARE_EXCEPT_H */