X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fword.c;h=3b309671470d78b0333ccaa4ed985808e7a67bb3;hp=294c4d4d7b777feddae9ee9900bf872ecc845ce5;hb=b0f981469cdea23225ca5c3ef0ca6759d6a92b43;hpb=93cee61e8fc0ddfb3f23469ad840f3e77067eb48

diff --git a/src/word.c b/src/word.c
index 294c4d4..3b30967 100644
--- a/src/word.c
+++ b/src/word.c
@@ -1,9 +1,21 @@
 #include "word.h"
 
+/* wordのエラー定義 */
+CERRARRAY cerr_word[] = {
+    { 114, "not integer" },
+    { 115, "not hex" },
+    { 116, "out of hex range" },
+};
+bool addcerrlist_word()
+{
+    return addcerrlist(ARRAYSIZE(cerr_word), cerr_word);
+}
+
 /* 10進数の文字列をWORD値に変換 */
 WORD n2word(const char *str)
 {
     assert(isdigit(*str) || *str == '-');
+
     char *check;
     int n;
     /* WORD値に変換 */
@@ -23,6 +35,7 @@ WORD n2word(const char *str)
 WORD h2word(const char *str)
 {
     assert(*str == '#');
+
     WORD word = 0x0;
     char *check;
     str++;
@@ -42,6 +55,7 @@ WORD h2word(const char *str)
 /* 10進数または16進数の文字列をWORD値に変換 */
 WORD nh2word(const char *str)
 {
+    addcerrlist_word();
     WORD word;
     if(!isdigit(*str) && *str != '-' && *str != '#') {
         setcerr(114, str);    /* not integer */