From 9221df234c063cb8f933d4ea2dfcfb5d2ad6496a Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Wed, 18 Aug 2021 17:06:48 +0200 Subject: [PATCH] Patch to allow (and ignore) leading or trailing commas when putting {} around tokens. Tested with PWL voltage source. Patch has been suggested by Liqian Zhang --- src/frontend/inpcom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 6f354881c..5e1d05e83 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -4884,10 +4884,10 @@ char *ya_search_identifier(char *str, const char *identifier, char *str_begin) before = '\0'; if (is_arith_char(before) || isspace_c(before) || - (str <= str_begin)) { + before == ',' || (str <= str_begin)) { char after = str[strlen(identifier)]; - if ((is_arith_char(after) || isspace_c(after) || - after == '\0')) + if (is_arith_char(after) || isspace_c(after) || + after == '\0' || after == ',') break; } @@ -7258,8 +7258,8 @@ static void inp_quote_params(struct card *c, struct card *end_c, char *rest = s + strlen(deps[i].param_name); - if (s > curr_line && (isspace_c(s[-1]) || s[-1] == '=') && - (isspace_c(*rest) || *rest == '\0' || *rest == ')')) { + if (s > curr_line && (isspace_c(s[-1]) || s[-1] == '=' || s[-1] == ',') && + (isspace_c(*rest) || *rest == '\0' || *rest == ',' || *rest == ')')) { int prefix_len; if (isspace_c(s[-1])) {