メモリ確保時のサイズを修正

[YACASL2.git] / src / cerr.c

diff --git a/src/cerr.c b/src/cerr.c
index 74dec44..c0146a2 100644 (file)
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -1,79 +1,66 @@
-#include "casl2.h"
+#include "cerr.h"
 
-/* エラーコードリスト */
-typedef struct {
-    int num;
-    char *msg;
-} CERRARRAY;
-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" },
-};
+/* エラー番号 */
+int cerrno = 0;
 
-/* WORD値を文字列に変換 */
-char *wtoa(WORD word)
+/* エラーメッセージ */
+char *cerrmsg;
+
+/* エラーリスト */
+CERRLIST *cerr;
+
+/* エラーリストを作成する */
+bool addcerrlist(int newerrc, CERRARRAY newerrv[])
 {
-    char *p = malloc(6), *q = malloc(6);
-    int i = 0, j;
-    do{
-        *(p + i++) = word % 10 + '0';
-    } while((word /= 10) > 0);
-    for(j = 0; j < i; j++) {
-        *(q + j) = *(p + (i - 1) - j);
+    int i;
+    CERRLIST *p, *q;
+
+    assert(newerrc > 0 && newerrv != NULL);
+    if(cerr != NULL) {
+        for(p = cerr; p != NULL; p = p->next) {
+            q = p;
+        }
+        if((p = q->next = malloc(sizeof(CERRLIST))) == NULL) {
+            goto addcerrlisterr;
+        }
+    } else if((p = cerr = malloc(sizeof(CERRLIST))) == NULL) {
+        goto addcerrlisterr;
+    }
+    for(i = 0; i < newerrc; i++) {
+        p->err = &(newerrv[i]);
+        if((p->next = malloc(sizeof(CERRLIST))) == NULL) {
+            goto addcerrlisterr;
+        }
+        q = p;
+        p = p->next;
     }
-    *(q + j + 1) = '\0';
-    return q;
+    q->next = NULL;
+    return true;
+addcerrlisterr:
+    fprintf(stderr, "addcerrlist: cannot allocate memory\n");
+    exit(-1);
 }
 
 /* エラー番号とエラーメッセージを設定する */
-void setcerr(int num, const char *val)
+void setcerr(int num, const char *str)
 {
     cerrno = num;
-    cerrmsg = malloc(256);
-    if(val != NULL) {
-        strcpy(cerrmsg, val);
-        strcat(cerrmsg, ": ");
-        strcat(cerrmsg, getcerrmsg(cerrno));
+    cerrmsg = malloc(CERRMSGSIZE + 1);
+    if(str != NULL && strlen(str) <= CERRSTRSIZE) {
+        sprintf(cerrmsg, "%s: %s", str, getcerrmsg(cerrno));
     } else {
         strcpy(cerrmsg, getcerrmsg(cerrno));
     }
 }
 
-/* ã\82¨ã\83©ã\83¼ç\95ªå\8f·ã\81\8bã\82\89メッセージを返す */
+/* ã\83ªã\82¹ã\83\88ã\81\8bã\82\89ã\80\81ã\82¨ã\83©ã\83¼ç\95ªå\8f·ã\81«å¯¾å¿\9cã\81\99ã\82\8bメッセージを返す */
 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 = cerr; p != NULL; p = p->next) {
+        if(num == p->err->num) {
+            return p->err->msg;
         }
     }
     return "unkown error";