fix logic bug in utils::expand_args()

This commit is contained in:
Axel Kohlmeyer
2021-08-18 20:26:51 -04:00
parent d9f3745eff
commit 04b0f98a5f

View File

@ -627,6 +627,7 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
} }
} }
} }
}
// expansion will take place // expansion will take place
@ -641,11 +642,7 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
} }
for (int index = nlo; index <= nhi; index++) { for (int index = nlo; index <= nhi; index++) {
// assemble and duplicate expanded string
if (word[1] == '2')
earg[newarg] = utils::strdup(fmt::format("{}2_{}[{}]{}", word[0], id, index, tail)); earg[newarg] = utils::strdup(fmt::format("{}2_{}[{}]{}", word[0], id, index, tail));
else
earg[newarg] = utils::strdup(fmt::format("{}_{}[{}]{}", word[0], id, index, tail));
newarg++; newarg++;
} }
} else { } else {
@ -658,7 +655,6 @@ int utils::expand_args(const char *file, int line, int narg, char **arg, int mod
newarg++; newarg++;
} }
} }
}
//printf("NEWARG %d\n",newarg); //printf("NEWARG %d\n",newarg);
//for (int i = 0; i < newarg; i++) //for (int i = 0; i < newarg; i++)