luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

translate(): resolve stuff like value="expr( 1000 * @VCC )" with value=1800 (using translate3() with parent level prop_ptr attributes)

This commit is contained in:
stefan schippers 2025-10-10 18:40:59 +02:00
parent eda8dca19f
commit 31b9598219
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/token.c
View File

@ -5239,6 +5239,26 @@ const char *translate(int inst, const char* s)
dbg(1, "2 translate(): lcc[%d].prop_ptr=%s, value1=%s\n", i-1, lcc[i-1].prop_ptr, value1);
i--;
}
/* substitute remaing @params */
i = level;
while(i > 0) {
if(strchr(value1, '@')) {
my_strdup(_ALLOC_ID_, &value1, translate3(value1, 1, lcc[i-1].prop_ptr, NULL, NULL, NULL));
dbg(1, "2 translate(): lcc[%d].prop_ptr=%s, value1=%s\n", i-1, lcc[i-1].prop_ptr, value1);
} else break;
i--;
}
/* substitute remaing @params */
i = level;
while(i > 0) {
if(strchr(value1, '@')) {
my_strdup(_ALLOC_ID_, &value1, translate3(value1, 1, lcc[i-1].templ, NULL, NULL, NULL));
dbg(1, "2 translate(): lcc[%d].prop_ptr=%s, value1=%s\n", i-1, lcc[i-1].prop_ptr, value1);
} else break;
i--;
}
tmp=strlen(value1);
STR_ALLOC(&result, tmp + result_pos, &size);
memcpy(result+result_pos, value1, tmp+1);

34
src/xschem.tcl
View File

@ -5149,7 +5149,7 @@ proc file_chooser_filelist {} {
proc file_chooser_symbol_or_schematic {{shift 0}} {
global file_chooser
if {[xschem get semaphore] > 0} {return}
set sel [.ins.center.left.l index active]
set sel [.ins.center.left.l index active]
if {$sel ne {}} {
set f [lindex $file_chooser(fullpathlist) $sel]
if {$f ne {}} {
@ -5204,7 +5204,7 @@ proc file_chooser_place {action} {
proc file_chooser_select {f} {
global file_chooser
if {$f ne {}} {
if {$f ne {} && [info exists file_chooser(dirs)] && [info exists file_chooser(files)]} {
set dir [file dirname $f]
set file [file tail $f]
set dirtail [file tail $dir]
@ -5232,7 +5232,7 @@ proc file_chooser_select {f} {
}
}
proc file_chooser_search {} {
proc file_chooser_search {{current {}}} {
global file_chooser new_file_browser_depth new_file_browser_ext
# check if regex is valid
set err [catch {regexp $file_chooser(regex) {12345}} res]
@ -5247,9 +5247,25 @@ proc file_chooser_search {} {
set err [catch {regexp $new_file_browser_ext $i} type]
if {!$err && $type} {
incr nth
if {$nth == $file_chooser(nth)} {
set f $i
break
if {$current ne {}} {
set dir1 [file dirname $i]
set sel [.ins.center.leftdir.l index active]
if {$sel ne {}} {
set dir2 [lindex $file_chooser(dirs) $sel]
# puts " dir1=$dir1\n dir2=$dir2\n sel=$sel\n------\n"
if {$dir2 ne {}} {
if {$dir1 eq $dir2} {
set f $i
set file_chooser(nth) $nth
break
}
}
}
} else {
if {$nth == $file_chooser(nth)} {
set f $i
break
}
}
}
}
@ -5538,6 +5554,11 @@ proc file_chooser {} {
file_chooser_filelist
}
balloon .ins.top3.upd {Update list of files matching pattern}
button .ins.top3.search_curr -takefocus 0 -text {Search curr. dir.} -activebackground red -command {
file_chooser_search current
}
balloon .ins.top3.search_curr "show and select match\n in current directory"
button .ins.top3.search -takefocus 0 -text {Search first} -activebackground red -command {
set file_chooser(nth) 1
file_chooser_search
@ -5668,6 +5689,7 @@ proc file_chooser {} {
pack .ins.top3.pat_l -side left
pack .ins.top3.pat_e -side left
pack .ins.top3.clear -side left
pack .ins.top3.search_curr -side left
pack .ins.top3.search -side left
pack .ins.top3.prev -side left
pack .ins.top3.next -side left