diff --git a/src/actions.c b/src/actions.c index 46d72e06..bdc3ac16 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1787,7 +1787,7 @@ const char *get_sym_name(int inst, int ndir, int ext, int abs_path) const char *sym, *sch; /* instance based symbol selection */ - sch = tcl_hook2(str_replace(get_tok_value(xctx->inst[inst].prop_ptr,"schematic", 2), "@symname", + sch = tcl_hook2(str_replace(get_tok_value(xctx->inst[inst].prop_ptr,"schematic", 6), "@symname", get_cell(xctx->inst[inst].name, 0), '\\', -1)); if(xctx->tok_size) { /* token exists */ @@ -1966,7 +1966,7 @@ void get_additional_symbols(int what) my_strdup(_ALLOC_ID_, &verilog_sym_def, get_tok_value(xctx->inst[i].prop_ptr,"verilog_sym_def",4)); my_strdup(_ALLOC_ID_, &vhdl_sym_def, get_tok_value(xctx->inst[i].prop_ptr,"vhdl_sym_def",4)); - dbg(1, "schematic=%s\n", get_tok_value(xctx->inst[i].prop_ptr,"schematic",2)); + dbg(1, "schematic=%s\n", get_tok_value(xctx->inst[i].prop_ptr,"schematic",6)); /* resolve schematic=generator.tcl( @n ) where n=11 is defined in instance attrs */ my_strdup2(_ALLOC_ID_, &sch, translate3(get_tok_value(xctx->inst[i].prop_ptr,"schematic", 6), 1, @@ -2096,7 +2096,7 @@ void get_sch_from_sym(char *filename, xSymbol *sym, int inst, int fallback) translate3(get_tok_value(xctx->inst[inst].prop_ptr,"schematic", 6), 1, xctx->inst[inst].prop_ptr, NULL, NULL)); } - if(!str_tmp) my_strdup2(_ALLOC_ID_, &str_tmp, get_tok_value(sym->prop_ptr, "schematic", 2)); + if(!str_tmp) my_strdup2(_ALLOC_ID_, &str_tmp, get_tok_value(sym->prop_ptr, "schematic", 6)); if(str_tmp[0]) { /* schematic attribute in symbol or instance was given */ /* @symname in schematic attribute will be replaced with symbol name */ my_strdup2(_ALLOC_ID_, &sch, tcl_hook2(str_replace(str_tmp, "@symname",