変数名の整理

[YACASL2.git] / src / cerr.c

diff --git a/src/cerr.c b/src/cerr.c
index ceea3af..3f7887b 100644 (file)
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -1,70 +1,85 @@
 #include "cerr.h"
 
-CERRARRAY cerr[] = {
-    { 101, "label already defined" },
-    { 102, "label table is full" },
-    { 103, "label not found" },
-    { 104, "label length is too long" },
-    { 105, "no command in the line" },
-    { 106, "operand count mismatch" },
-    { 107, "no label in START" },
-    { 108, "not command of operand \"r\"" },
-    { 109, "not command of operand \"r1,r2\"" },
-    { 110, "not command of operand \"r,adr[,x]\"" },
-    { 111, "not command of operand \"adr[,x]\"" },
-    { 112, "not command of no operand" },
-    { 113, "command not defined" },
-    { 114, "not integer" },
-    { 115, "not hex" },
-    { 116, "out of hex range" },
-    { 117, "operand is too many" },
-    { 118, "operand length is too long" },
-    { 119, "out of COMET II memory" },
-    { 120, "GR0 in operand x" },
-    { 121, "cannot get operand token" },
-    { 122, "cannot create hash table" },
-    { 201, "execute - out of COMET II memory" },
-    { 202, "SVC input - out of Input memory" },
-    { 203, "SVC output - out of COMET II memory" },
-    { 204, "Program Register (PR) - out of COMET II memory" },
-    { 205, "Stack Pointer (SP) - cannot allocate stack buffer" },
-    { 206, "Address - out of COMET II memory" },
-    { 207, "Stack Pointer (SP) - out of COMET II memory" },
-};
+/* mallocを実行し、メモリを確保できない場合は */
+/* エラーを出力して終了 */
+void *malloc_chk(size_t size, char *tag)
+{
+    void *p;
+
+    if((p = malloc(size)) == NULL) {
+        fprintf(stderr, "%s: cannot allocate memory\n", tag);
+        exit(-1);
+    }
+    return p;
+}
+
+/* 現在のエラー */
+CERR *cerr;
+
+/* エラーリスト */
+CERRLIST *cerrlist;
+
+/* エラーリストを作成・追加する */
+bool addcerrlist(int newerrc, CERR newerrv[])
+{
+    int i;
+    CERRLIST *p, *q;
 
-/* エラー番号とエラーメッセージを設定する */
-void setcerr(int num, const char *val)
+    assert(newerrc > 0 && newerrv != NULL);
+    if(cerrlist == NULL) {
+        p = cerrlist = malloc_chk(sizeof(CERRLIST), "cerrlist");
+    } else {
+        for(p = cerrlist; p != NULL; p = p->next) {
+            q = p;
+        }
+        p = q->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
+    }
+    for(i = 0; i < newerrc; i++) {
+        p->cerr = &(newerrv[i]);
+        p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
+        q = p;
+        p = p->next;
+    }
+    q->next = NULL;
+    return true;
+}
+
+/* 現在のエラーを設定する */
+void setcerr(int num, const char *str)
 {
-    cerrno = num;
-    cerrmsg = malloc(MSGSIZE + 1);
-    if(val != NULL) {
-        strcpy(cerrmsg, val);
-        strcat(cerrmsg, ": ");
-        strcat(cerrmsg, getcerrmsg(cerrno));
+    cerr->num = num;
+    cerr->msg = malloc_chk(CERRMSGSIZE + 1, "cerr.msg");
+    if(str != NULL && strlen(str) <= CERRSTRSIZE) {
+        sprintf(cerr->msg, "%s: %s", str, getcerrmsg(cerr->num));
     } else {
-        strcpy(cerrmsg, getcerrmsg(cerrno));
+        strcpy(cerr->msg, getcerrmsg(cerr->num));
     }
 }
 
-/* エラー番号からメッセージを返す */
+/* エラーリストから、エラー番号に対応するメッセージを返す */
 char *getcerrmsg(int num)
 {
-    assert(num > 0);
-    int i;
-    for(i = 0; i < ARRAYSIZE(cerr); i++) {
-        if((&cerr[i])->num == num) {
-            return (&cerr[i])->msg;
+    CERRLIST *p;
+
+    for(p = cerrlist; p != NULL; p = p->next) {
+        if(num == p->cerr->num) {
+            return p->cerr->msg;
         }
     }
     return "unkown error";
 }
 
-/* エラーを解放する */
+/* ã\82¨ã\83©ã\83¼ã\83ªã\82¹ã\83\88ã\81¨ç\8f¾å\9c¨ã\81®ã\82¨ã\83©ã\83¼ã\82\92解æ\94¾ã\81\99ã\82\8b */
 void freecerr()
 {
-    assert(cerrno > 0);
-    cerrno = 0;
-    if(strlen(cerrmsg) > 0) {
-        free(cerrmsg);
+    CERRLIST *p = cerrlist, *q;
+
+    /* エラーリストを解放 */
+    while(p != NULL) {
+        q = p->next;
+        free(p);
+        p = q;
     }
+    /* 現在のエラーを解放 */
+    free(cerr);
 }