ユニットテストの更新

[YACASL2.git] / test / unit / linetok / cmd.c

diff --git a/test/unit/linetok/cmd.c b/test/unit/linetok/cmd.c
index 28555cd..d858c62 100644 (file)
--- a/test/unit/linetok/cmd.c
+++ b/test/unit/linetok/cmd.c
@@ -1,12 +1,13 @@
 #include <stdio.h>
-#include <malloc.h>
-#include "casl2.h"
 #include "assemble.h"
+#include "cmem.h"
+#include "cerr.h"
+#include "word.h"
 
 int main(){
     int i, j;
     char *testline[] = {
-        "IOTEST START\n",
+        /* "IOTEST START\n", */
         "      OUT OBUF1,OLEN1\n",
         "      OUT OBUF2,OLEN2 ;comment\n",
         "      OUT OBUF1,OLEN1 \n",
@@ -15,13 +16,14 @@ int main(){
         "      OUT OBUF1, OLEN1 \n",
         "BEGIN LD      GR1, A\n",
         "\n",
+        ";comment\n",
         "      ;comment\n"
     };
 
     CMDLINE *testcl = malloc(sizeof(CMDLINE));
-    cerr = malloc_chk(sizeof(CERR), "cerr");    /* エラーの初期化 */
-    addcerrlist_assemble();
+    addcerrlist_tok();
     for(i = 0; i < sizeof testline /sizeof testline[0]; i++) {
+        cerr_init();    /* エラーの初期化 */
         printf("%d: %s", i, testline[i]);
         testcl = linetok(testline[i]);
         if(testcl == NULL) {