X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcerr.c;h=24f620d9b19736a06cbc4dea57bda759b4eff66b;hp=dca936535cffe9d05994283907945f9f2f77e68d;hb=6b04961e3a699efa011258cc1b1166df71b4c078;hpb=0e3065564e83037d5fbbb3e0e1595e7ce95ce8eb

diff --git a/src/cerr.c b/src/cerr.c
index dca9365..24f620d 100644
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -1,70 +1,118 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdbool.h>
 #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" },
-};
+/**
+ * エラーの初期化
+ */
+void cerr_init()
+{
+    cerr = malloc_chk(sizeof(CERR), "cerr");
+    cerr->num = 0;
+}
+
+/**
+ * 現在のエラー
+ */
+CERR *cerr;
 
-/* エラー番号とエラーメッセージを設定する */
-void setcerr(int num, const char *val)
+/**
+ * エラーリスト
+ */
+CERRLIST *cerrlist;
+
+/**
+ * エラーリストを作成または追加する
+ */
+bool addcerrlist(int newerrc, CERR newerrv[])
 {
-    cerrno = num;
-    cerrmsg = malloc(256);
-    if(val != NULL) {
-        strcpy(cerrmsg, val);
-        strcat(cerrmsg, ": ");
-        strcat(cerrmsg, getcerrmsg(cerrno));
+    int i;
+    CERRLIST *p, *q;
+
+    assert(newerrc > 0 && newerrv != NULL);
+    if(cerrlist == NULL) {
+        p = cerrlist = malloc_chk(sizeof(CERRLIST), "cerrlist");
     } else {
-        strcpy(cerrmsg, getcerrmsg(cerrno));
+        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];
+        q = p;
+        p = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
     }
+    q->next = NULL;
+    return true;
 }
 
-/* エラー番号からメッセージを返す */
+/**
+ * エラーリストを表示する
+ */
+void printcerrlist()
+{
+    CERRLIST *p;
+
+    if(cerrlist == NULL) {
+        puts("error list is null.");
+    } else {
+        for(p = cerrlist; p != NULL; p = p->next) {
+            printf("%d: %s\n", p->cerr->num, p->cerr->msg);
+        }
+    }
+}
+
+/**
+ * 現在のエラーを設定する
+ */
+void setcerr(int num, const char *str)
+{
+    /* 現在のエラー番号を設定  */
+    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(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;
+    char *msg = "unknown error";
+
+    for(p = cerrlist; p != NULL; p = p->next) {
+        if(num == p->cerr->num) {
+            msg = p->cerr->msg;
+            break;
         }
     }
-    return "unkown error";
+    return msg;
 }
 
-/* エラーを解放する */
+/**
+ * エラーリストと現在のエラーを解放する
+ */
 void freecerr()
 {
-    assert(cerrno > 0);
-    cerrno = 0;
-    if(strlen(cerrmsg) > 0) {
-        free(cerrmsg);
+    CERRLIST *p = cerrlist, *q;
+
+    /* 現在のエラーメッセージを解放 */
+    free_chk(cerr->msg, "cerr.msg");
+    /* 現在のエラーを解放 */
+    free_chk(cerr, "cerr");
+    /* エラーリストを解放 */
+    for(p = cerrlist; p != NULL; p = q) {
+        q = p->next;
+        free_chk(p, "freecerr.p");
     }
 }