Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize indentation of tcl files #292

Merged
merged 3 commits into from
Jan 11, 2022
Merged

Standardize indentation of tcl files #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b05b78f
Standardize indentation of tcl files
JelteF Dec 13, 2021
c1a6286
Add reformat.tcl script
JelteF Jan 7, 2022
8f3f24f
Convert reformat.tcl into a module (#5)
sm-shaw Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hammerdbcli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ exit
}
}

append modulelist { Thread msgcat xml comm tclreadline task }
append modulelist { Thread msgcat xml comm tclreadline task reformat_tcl }
for { set modcount 0 } { $modcount < [llength $modulelist] } { incr modcount } {
set m [lindex $modulelist $modcount]
set loadtext $m
Expand Down
141 changes: 141 additions & 0 deletions modules/reformat_tcl-1.0.tm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
package provide reformat_tcl 1.0
namespace eval reformat_tcl {
namespace export reformat_src
# Largely based on code from the TCL wiki:
# https://wiki.tcl-lang.org/page/Reformatting+Tcl+code+indentation
proc do_reformat {tclcode {pad 2}} {

set lines [split $tclcode \n]
set out ""
set nquot 0 ;# count of quotes
set ncont 0 ;# count of continued strings
set line [lindex $lines 0]
set indent [expr {([string length $line]-[string length [string trimleft $line \ \t]])/$pad}]
set fastinsert_indent -1;
set padst [string repeat " " $pad]
foreach orig $lines {
incr lineindex
if {$lineindex>1} {append out \n}
set newline [string trimleft $orig]
if {$newline==""} continue
set is_quoted $nquot
set is_continued $ncont
if {[string index $orig end] eq "\\"} {
incr ncont
} else {
set ncont 0
}
# if { [string index $newline 0]=="#" } {
# set line $orig ;# don't touch comments
# } else {
if {$fastinsert_indent > -1} {
set used_indent $fastinsert_indent
} else {
set used_indent $indent
}
set npad [expr {$used_indent * $pad}]
set line [string repeat $padst $used_indent]$newline
set i [set ns [set nl [set nr [set body 0]]]]
for {set n [string length $newline]} {$i<$n} {incr i} {
set ch [string index $newline $i]
if {$ch=="\\"} {
set ns [expr {[incr ns] % 2}]
} elseif {$ns} {
set ns 0
} elseif {$ch=="\""} {
set nquot [expr {[incr nquot] % 2}]
} elseif {$nquot} {
# anything in quotes doesn't impact indendation
} elseif {$ch=="\{"} {
if {[string range $newline $i $i+2]=="\{\"\}"} {
incr i 2 ;# quote in braces - correct (though tricky)
} else {
incr nl
if {[string range $newline $i-15 $i]=="fastinsert end \{" || $fastinsert_indent > -1} {
incr fastinsert_indent
}
set body -1
}
} elseif {$ch=="\}"} {
incr nr
if {$fastinsert_indent > -1} {
incr fastinsert_indent -1
}
set body 0
}
}
set nbbraces [expr {$nl - $nr}]
incr totalbraces $nbbraces
if {$totalbraces<0} {
error "Line $lineindex: unbalanced braces!"
}
incr indent $nbbraces
if {$nbbraces==0} { set nbbraces $body }
if {$is_quoted || $is_continued} {
set line $orig ;# don't touch quoted and continued strings
} else {
set np [expr {- $nbbraces * $pad}]
if {$np>$npad} { ;# for safety too
set np $npad
}
set line [string range $line $np end]
}
# }
append out $line
}
return $out
}

proc eol {} {
switch -- $::tcl_platform(platform) {
windows {return \r\n}
unix {return \n}
macintosh {return \r}
default {error "no such platform: $::tc_platform(platform)"}
}
}

proc count {string char} {
set count 0
while {[set idx [string first $char $string]]>=0} {
set backslashes 0
set nidx $idx
while {[string equal [string index $string [incr nidx -1]] \\]} {
incr backslashes
}
if {$backslashes % 2 == 0} {
incr count
}
set string [string range $string [incr idx] end]
}
return $count
}

proc reformat_src {indent filename} {
set usage {Usage: reformatsrc indent filename}
if ![ string is entier $indent ] { puts $usage; return }
if {[catch {set f [open "$filename" r]}]} {
puts "Could not open $filename to read, reformat failed"; return
} else {
set data [read $f]
close $f
set permissions [file attributes $filename -permissions]
set tmp_filename "$filename.tmp"
}
if {[catch {set f [open "$filename.tmp" w]}]} {
puts "Could not open temporary file $filename.tmp to write, reformat failed"; return
} else {
puts "Reformatting $filename with indent $indent"
puts -nonewline $f [reformat_tcl::do_reformat [string map [list [reformat_tcl::eol] \n] $data] $indent]
close $f
if {[catch {file copy -force $tmp_filename $filename}]} {
puts "Could not copy $tmp_filename to $filename, not deleting $tmp_filename, reformat failed"; return
} else {
file delete -force $tmp_filename
file attributes $filename -permissions $permissions
}
puts "Reformat of $filename complete"
}
}
}
namespace import reformat_tcl::reformat_src
Loading