X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fassemble.c;h=10ecb41dad3f65d668214cfd60cab7dd8a6492c8;hp=33fd93eb968fce26637180d452e3b688d8324662;hb=bbd97e8f26bfbb3d4b4688bea469062d82aaa764;hpb=8365c3016d2564c0498d2dc21300b1bff57e929b

diff --git a/src/assemble.c b/src/assemble.c
index 33fd93e..10ecb41 100644
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -386,34 +386,28 @@ void writememory(WORD word, WORD adr, PASS pass)
 
 void writestr(const char *str, bool literal, PASS pass)
 {
-    assert(*str == '\'');
-    const char *p = str + 1;
+    assert(str[0] == '\'');
+    int i;
     bool lw = false;
 
-    for(; ;) {
-        /* 閉じ「'」がないまま文字列が終了した場合 */
-        if(!p[0]) {
+    /* 「'」の場合、1文字スキップし、次の文字が「'」でなければ正常終了 */
+    for(i = 1; str[i] != '\'' || str[++i] == '\''; i++) {
+        /* 「'」が閉じないまま文字列が終了した場合はエラー */
+        if(!str[i]) {
             setcerr(123, str);    /* unclosed quote */
             break;
         }
-        /* 「'」の場合、次の文字が「'」でない場合は正常終了 */
-        if(p[0] == '\'') {
-            p++;
-            if(p[0] != '\'') {
-                break;
-            }
-        } else if(literal == true && lw == true) {
+        if(literal == true && lw == true) {
             setcerr(124, str);    /* more than one character in literal */
             break;
         }
         /*リテラルの場合はリテラル領域に書込 */
         if(literal == true) {
-            writememory(p[0], (asptr->lptr)++, pass);
+            writememory(str[i], (asptr->lptr)++, pass);
             lw = true;
         } else {
-            writememory(p[0], (asptr->ptr)++, pass);
+            writememory(str[i], (asptr->ptr)++, pass);
         }
-        p++;
     }
 }
 
@@ -424,7 +418,7 @@ void writedc(const char *str, PASS pass)
     if(*str == '\'') {
         writestr(str, false, pass);
     } else {
-        if(*str == '#' || isdigit(*str) || *str == '-') {
+        if(str[0] == '#' || isdigit(str[0]) || str[0] == '-') {
             adr = nh2word(str);
         } else {
             if(pass == SECOND && (adr = getlabel(asptr->prog, str)) == 0xFFFF) {
@@ -441,7 +435,7 @@ void assemble_start(const CMDLINE *cmdl, PASS pass)
         setcerr(106, "");    /* operand count mismatch */
         return;
     }
-    if(!*(cmdl->label)) {
+    if(!cmdl->label[0]) {
         setcerr(107, "");    /* no label in START */
         return;
     }
@@ -575,7 +569,7 @@ bool casl2cmd(CMD *cmdtbl, const CMDLINE *cmdl, PASS pass)
 {
     int i;
     void (*cmdptr)();
-    for(i = 0; *(cmdtbl[i].name); i++) {
+    for(i = 0; cmdtbl[i].name[0]; i++) {
         if(strcmp(cmdl->cmd, cmdtbl[i].name) == 0) {
             cmdptr = cmdtbl[i].ptr;
             (*cmdptr)(cmdl, pass);
@@ -675,7 +669,7 @@ bool assemble_comet2cmd(const CMDLINE *cmdl, PASS pass)
 bool assembletok(const CMDLINE *cmdl, PASS pass)
 {
     /* 命令がない場合 */
-    if(!*(cmdl->cmd)) {
+    if(!cmdl->cmd[0]) {
         return true;
     }
     /* アセンブラ命令またはマクロ命令の書込 */
@@ -700,7 +694,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)) {
+            if(pass == FIRST && cmdl->label[0]) {
                 stat = addlabel(asptr->prog, cmdl->label, asptr->ptr);
             }
         }