ソースの推敲

[YACASL2.git] / src / assemble.c

diff --git a/src/assemble.c b/src/assemble.c
index c9dd43b..33fd93e 100644 (file)
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -320,9 +320,9 @@ WORD getadr(const char *prog, const char *str, PASS pass)
 {
     WORD adr = 0x0;
 
-    if(*str == '=') {
+    if(str[0] == '=') {
         adr = getliteral(str, pass);
-    } else if(isdigit(*str) || *str == '-' || *str == '#') {
+    } else if(isdigit(str[0]) || str[0] == '-' || str[0] == '#') {
         adr = nh2word(str);
     } else {
         if(pass == SECOND) {
@@ -339,12 +339,13 @@ WORD grword(const char *str, bool is_x)
     WORD r;
 
     /*  "GR[0-7]" 以外の文字列では、0xFFFFを返して終了 */
-    if(!(strlen(str) == 3 && strncmp(str, "GR", 2) == 0 &&
-         (*(str+2) >= '0' && *(str+2) <= '0' + (GRSIZE - 1))))
+    if(strlen(str) != 3 ||
+       strncmp(str, "GR", 2) != 0 ||
+       str[2] < '0' || str[2] > '0' + (GRSIZE - 1))
     {
         return 0xFFFF;
     }
-    r = (WORD)(*(str+2) - '0');
+    r = (WORD)(str[2] - '0');
     /* GR0は指標レジスタとして用いることができない */
     if(is_x == true && r == 0x0) {
         setcerr(120, "");    /* GR0 in operand x */
@@ -355,10 +356,11 @@ WORD grword(const char *str, bool is_x)
 
 WORD getliteral(const char *str, PASS pass)
 {
-    assert(*str == '=');
+    assert(str[0] == '=');
     WORD adr = asptr->lptr;
 
-    if(*(++str) == '\'') {    /* 文字定数 */
+    str++;
+    if(str[0] == '\'') {    /* 文字定数 */
         writestr(str, true, pass);
     } else {
         writememory(nh2word(str), (asptr->lptr)++, pass);
@@ -390,24 +392,28 @@ void writestr(const char *str, bool literal, PASS pass)
 
     for(; ;) {
         /* 閉じ「'」がないまま文字列が終了した場合 */
-        if(*p == '\0') {
+        if(!p[0]) {
             setcerr(123, str);    /* unclosed quote */
             break;
         }
         /* 「'」の場合、次の文字が「'」でない場合は正常終了 */
-        if(*p == '\'' && *(++p) != '\'') {
-            break;
+        if(p[0] == '\'') {
+            p++;
+            if(p[0] != '\'') {
+                break;
+            }
         } else if(literal == true && lw == true) {
             setcerr(124, str);    /* more than one character in literal */
             break;
         }
         /*リテラルの場合はリテラル領域に書込 */
         if(literal == true) {
-            writememory(*(p++), (asptr->lptr)++, pass);
+            writememory(p[0], (asptr->lptr)++, pass);
             lw = true;
         } else {
-            writememory(*(p++), (asptr->ptr)++, pass);
+            writememory(p[0], (asptr->ptr)++, pass);
         }
+        p++;
     }
 }
 
@@ -435,7 +441,7 @@ void assemble_start(const CMDLINE *cmdl, PASS pass)
         setcerr(106, "");    /* operand count mismatch */
         return;
     }
-    if(*(cmdl->label) == '\0') {
+    if(!*(cmdl->label)) {
         setcerr(107, "");    /* no label in START */
         return;
     }
@@ -461,7 +467,7 @@ void assemble_end(const CMDLINE *cmdl, PASS pass)
     else if(pass == SECOND) {
         execptr->end = asptr->lptr;
     }
-    *(asptr->prog) = '\0';
+    strcpy(asptr->prog, "");
 }
 
 void assemble_ds(const CMDLINE *cmdl, PASS pass)
@@ -569,7 +575,7 @@ bool casl2cmd(CMD *cmdtbl, const CMDLINE *cmdl, PASS pass)
 {
     int i;
     void (*cmdptr)();
-    for(i = 0; *(cmdtbl[i].name) != '\0'; i++) {
+    for(i = 0; *(cmdtbl[i].name); i++) {
         if(strcmp(cmdl->cmd, cmdtbl[i].name) == 0) {
             cmdptr = cmdtbl[i].ptr;
             (*cmdptr)(cmdl, pass);
@@ -669,7 +675,7 @@ bool assemble_comet2cmd(const CMDLINE *cmdl, PASS pass)
 bool assembletok(const CMDLINE *cmdl, PASS pass)
 {
     /* 命令がない場合 */
-    if(*(cmdl->cmd) == '\0') {
+    if(!*(cmdl->cmd)) {
         return true;
     }
     /* アセンブラ命令またはマクロ命令の書込 */
@@ -694,7 +700,7 @@ bool assembleline(const char *line, PASS pass)
     stat = (cerr->num == 0) ? true : false;
     if(cmdl != NULL) {
         if(stat == true) {
-            if(pass == FIRST && *(cmdl->label) != '\0') {
+            if(pass == FIRST && *(cmdl->label)) {
                 stat = addlabel(asptr->prog, cmdl->label, asptr->ptr);
             }
         }