Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Move all preprocess usage to preprocess source file |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
e805b0132e47d38f7420142374314376 |
User & Date: | peter 2017-02-05 16:38:41.391 |
Context
2017-02-05
| ||
16:57 | More preprocess restructuring check-in: fd2a0fd926 user: peter tags: trunk | |
16:38 | Move all preprocess usage to preprocess source file check-in: e805b0132e user: peter tags: trunk | |
2017-02-04
| ||
21:38 | Moved preprocess code to separate source file check-in: eb19798847 user: peter tags: trunk | |
Changes
Changes to src/eskil.tcl.
︙ | ︙ | |||
1476 1477 1478 1479 1480 1481 1482 | } set range {} if {[info exists ::eskil($top,range)] && \ [llength $::eskil($top,range)] == 4} { set range $::eskil($top,range) lappend opts -range $range } | | | 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 | } set range {} if {[info exists ::eskil($top,range)] && \ [llength $::eskil($top,range)] == 4} { set range $::eskil($top,range) lappend opts -range $range } foreach {RE sub side} [getActivePreprocess $top] { lappend opts -regsub$side [list $RE $sub] } # Apply nodigit after preprocess if {$::Pref(nodigit)} {lappend opts -nodigit} # If a special file for diffing is present, use it. if {[info exists ::eskil($top,leftFileDiff)]} { |
︙ | ︙ |
Changes to src/preprocess.tcl.
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # This is called when Ok or Apply is pressed. # Update preference from dialog contents. proc EditPrefRegsubOk {top w {keep 0}} { set exa $::eskil($top,prefregexa) set result {} | > > > > > > > > > > > > > > > > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # The format of the ::Pref(preprocess) is: # Flat list of stride 3 (RE sub side) # Return active preprocess items as a flat list with stride 3 proc getActivePreprocess {top} { set res {} foreach {RE sub side} $::Pref(preprocess) { lappend res $RE $sub $side } return $res } # Entry for adding preprocess from command line proc addPreprocess {name RE sub side} { lappend ::Pref(preprocess) $RE $sub $side } # This is called when Ok or Apply is pressed. # Update preference from dialog contents. proc EditPrefRegsubOk {top w {keep 0}} { set exa $::eskil($top,prefregexa) set result {} |
︙ | ︙ | |||
240 241 242 243 244 245 246 | trace add variable ::eskil($top,prefregexa) write \ [list EditPrefRegsubUpdate $top] trace add variable ::eskil($top,prefregexa2) write \ [list EditPrefRegsubUpdate $top] EditPrefRegsubUpdate $top } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | trace add variable ::eskil($top,prefregexa) write \ [list EditPrefRegsubUpdate $top] trace add variable ::eskil($top,prefregexa2) write \ [list EditPrefRegsubUpdate $top] EditPrefRegsubUpdate $top } # This is called when Ok or Apply is pressed. # Update preference from dialog contents. proc EditPrefPrepOk {top w {keep 0}} { #TODO if {$keep} return destroy $w } proc EditPrefPreprocess {top} { set w $top.prefpreprocess if {[winfo exists $w] && [winfo toplevel $w] eq $w} { wm deiconify $w raise $w focus $w } else { destroy $w toplevel $w -padx 3 -pady 3 wm title $w "Preferences: Preprocess" } # Heading labels for columns ttk::label $w.hl1 -text "Name" addBalloon $w.hl1 "Name of preprocess item" ttk::label $w.hl2 -text "Active" addBalloon $w.hl2 "Is item active for this session?" ttk::label $w.hl3 -text "Saved" addBalloon $w.hl3 "Is item saved with preferences?" # TODO # Buttons ttk::frame $w.fb -padding 3 ttk::button $w.fb.b1 -text "Ok" -command [list EditPrefPrepOk $top $w] ttk::button $w.fb.b2 -text "Apply" -command [list EditPrefPrepOk $top $w 1] ttk::button $w.fb.b3 -text "Cancel" -command [list destroy $w] grid $w.fb.b1 x $w.fb.b2 x $w.fb.b3 -sticky we grid columnconfigure $w.fb {0 2 4} -uniform a grid columnconfigure $w.fb {1 3} -weight 1 } |
Changes to src/startup.tcl.
︙ | ︙ | |||
837 838 839 840 841 842 843 | # Options that need individual checking/processing if {[optIsGiven -prefix arg]} { foreach apa $arg { set RE [string map [list % $apa] {^.*?\m(%\w+).*$}] if {$::Pref(nocase)} { set RE "(?i)$RE" } | | | | | | 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 | # Options that need individual checking/processing if {[optIsGiven -prefix arg]} { foreach apa $arg { set RE [string map [list % $apa] {^.*?\m(%\w+).*$}] if {$::Pref(nocase)} { set RE "(?i)$RE" } addPreprocess prefix $RE {\1} "" } } if {[optIsGiven -preprocess arg]} { # FIXA: better validity check foreach apa $arg { foreach {RE sub} $apa { addPreprocess cmdline $RE $sub "" } } } if {[optIsGiven -preprocessleft arg]} { # FIXA: better validity check foreach apa $arg { foreach {RE sub} $apa { addPreprocess cmdline $RE $sub left } } } if {[optIsGiven -preprocessright arg]} { # FIXA: better validity check foreach apa $arg { foreach {RE sub} $apa { addPreprocess cmdline $RE $sub right } } } # Handle list of revisions if {[optIsGiven -r arg]} { set revNo 1 foreach rev $arg { |
︙ | ︙ | |||
1175 1176 1177 1178 1179 1180 1181 | set ::DefaultPref(dir,exdirs) "RCS CVS .git .svn .hg" set ::DefaultPref(dir,onlyrev) 0 set ::DefaultPref(dir,nice) 1 # Start with default preferences, before loading setup file array set ::Pref [array get ::DefaultPref] | < < < | | < < < < < < < < < | 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 | set ::DefaultPref(dir,exdirs) "RCS CVS .git .svn .hg" set ::DefaultPref(dir,onlyrev) 0 set ::DefaultPref(dir,nice) 1 # Start with default preferences, before loading setup file array set ::Pref [array get ::DefaultPref] # TODO: implement filter option fully set ::eskil(filter) "" if {![info exists ::eskil_testsuite] && [file exists "~/.eskilrc"]} { safeLoad "~/.eskilrc" ::Pref } if {$::Pref(editor) ne ""} { set ::util(editor) $::Pref(editor) } # If the user's file has this old option, translate it to the new # Nothing here currently # Set up reactions to some Pref settings if {![info exists ::widgets(toolbars)]} { set ::widgets(toolbars) {} } trace add variable ::Pref(toolbar) write TraceToolbar } |
︙ | ︙ |