X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=test%2Funit%2Fprint_cmdtype_code%2Fprint_cmdtype_code.c;h=70bcd782ed3f66a4ef5a9813ed6fac35e13c11e1;hp=9410051342780576384db3d427048ab06aceacbd;hb=c5e30b2f26ebc174c49c52c67121f3be81b5bd43;hpb=8734038470680c50615c8f71bd4934f44c5f39f6

diff --git a/test/unit/print_cmdtype_code/print_cmdtype_code.c b/test/unit/print_cmdtype_code/print_cmdtype_code.c
index 9410051..70bcd78 100644
--- a/test/unit/print_cmdtype_code/print_cmdtype_code.c
+++ b/test/unit/print_cmdtype_code/print_cmdtype_code.c
@@ -1,11 +1,52 @@
 #include "casl2.h"
-int main(){
-    puts("== CMDTYPE_CODE TABLE ==");
+#include "cerr.h"
+#include <string.h>
+
+int compare_code(const void *a, const void *b)
+{
+    const CMD ca = **(const CMD **)a;
+    const CMD cb = **(const CMD **)b;
+    int diff;
+
+    if((diff = strcmp(ca.name, cb.name)) == 0) {
+        return ca.type - cb.type;
+    } else {
+        return diff;
+    }
+}
+
+/* 命令と命令タイプがキーのハッシュ表を表示する */
+void print_cmdtype_code()
+{
+    int i, j = 0;
+    CMDTAB *np;
+    CMD **ar;
+    ar = malloc(sizeof(*ar) * comet2cmdsize);
+    for(i = 0; i < comet2cmdsize; i++) {
+        np = cmdtype_code[i];
+        while(np != NULL) {
+            ar[j++] = np->cmd;
+            np = np->next;
+        }
+    }
+    qsort(ar, comet2cmdsize, sizeof(*ar), (int (*)(const void*, const void*))compare_code);
+    for(i = 0; i < comet2cmdsize; i++) {
+        fprintf(stdout, "%s\t0%02o\t#%04X\n", ar[i]->name, ar[i]->type, ar[i]->code);
+    }
+}
+
+int main()
+{
+    /* エラーの初期化 */
+    cerr = malloc_chk(sizeof(CERR), "cerr");
+    /* ハッシュ表作成 */
     create_cmdtype_code();
+    /* 命令表の表示 */
     print_cmdtype_code();
+    /* ハッシュ表解放 */
     free_cmdtype_code();
-    if(cerrno != 0) {
-        printf("\terror - %d: %s\n", cerrno, cerrmsg);
+    if(cerr->num != 0) {
+        printf("\terror - %d: %s\n", cerr->num, cerr->msg);
         freecerr();
         exit(-1);
     }