コマンド表とラベル表の作成時に、共用体版hash関数を使うように変更

[YACASL2.git] / src / label.c

diff --git a/src/label.c b/src/label.c
index b58def5..d740b2e 100644 (file)
--- a/src/label.c
+++ b/src/label.c
@@ -25,8 +25,7 @@ WORD getlabel(const char *prog, const char *label)
 {
     LABELTAB *np;
     for(np = labels[labelhash(prog, label)]; np != NULL; np = np->next) {
 {
     LABELTAB *np;
     for(np = labels[labelhash(prog, label)]; np != NULL; np = np->next) {

-        if(((prog == NULL && np->prog == NULL) ||
-            (prog != NULL && np->prog != NULL && strcmp(prog, np->prog) == 0)) &&
+        if((prog == NULL || (np->prog != NULL && strcmp(prog, np->prog) == 0)) &&

            strcmp(label, np->label) == 0)
         {
             return np->adr;
            strcmp(label, np->label) == 0)
         {
             return np->adr;