From b1a1442012a9e8c47c9ef43983ab1c152d593f61 Mon Sep 17 00:00:00 2001 From: Stefan Frederik Date: Sun, 29 Nov 2020 00:00:55 +0100 Subject: [PATCH] allow spaces in bussed nodes (A B,CC,D\ C, A B[3:0]), dont dump double quoted net names in netlists --- src/netlist.c | 6 +++--- src/parselabel.l | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/netlist.c b/src/netlist.c index efb4e55b..63c8db9d 100644 --- a/src/netlist.c +++ b/src/netlist.c @@ -688,7 +688,7 @@ void prepare_netlist_structs(int for_netlist) } if(print_erc && (!type || !type[0]) ) { char str[2048]; - my_snprintf(str, S(str), "xSymbol: %s: no type attribute set", inst[i].name); + my_snprintf(str, S(str), "Symbol: %s: no type attribute set", inst[i].name); statusmsg(str,2); inst[i].flags |=4; hilight_nets=1; @@ -736,10 +736,10 @@ void prepare_netlist_structs(int for_netlist) my_strdup(261, &class,get_tok_value(inst[i].prop_ptr,"class",0)); } - my_strdup(262, &inst[i].node[0], get_tok_value(inst[i].prop_ptr,"lab",1)); + my_strdup(262, &inst[i].node[0], get_tok_value(inst[i].prop_ptr,"lab",0)); if (!(inst[i].node[0])) { - my_strdup(65, &inst[i].node[0], get_tok_value((inst[i].ptr+ xctx->sym)->templ, "lab",1)); + my_strdup(65, &inst[i].node[0], get_tok_value((inst[i].ptr+ xctx->sym)->templ, "lab",0)); dbg(1, "prepare_netlist_structs(): no lab attr on instance, pick from symbol: %s\n", inst[i].node[0]); } /* handle global nodes (global=1 set as symbol property) 28032003 */ diff --git a/src/parselabel.l b/src/parselabel.l index 37e65421..8a0cbb4c 100644 --- a/src/parselabel.l +++ b/src/parselabel.l @@ -133,7 +133,7 @@ const char *expandlabel(const char *s, int *m) ID [-#+_\\/=a-zA-Z0-9]*[-#@+_\\/=a-zA-Z]+[-#@+_\\/=a-zA-Z0-9]* ID_NUM [-#+_\\/=a-zA-Z0-9]+ -ID_EXT ([-~#+/=_a-zA-Z][-~#@\\/:.=_+a-zA-Z0-9]*)|([-~#+/.=_a-zA-Z][-~#@\\/:=_+a-zA-Z0-9]*) +ID_EXT ([-~#+/=_a-zA-Z][-~#@\\/ :.=_+a-zA-Z0-9]*)|([-~#+/.=_a-zA-Z][-~#@\\/ :=_+a-zA-Z0-9]*) ID_EXT_PARENTHESIS [-~#+/=_a-zA-Z][-#@\\/:.=_+a-zA-Z0-9]*\([-#@\\/:.=_+a-zA-Z0-9]*\) %%