mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 16:47:28 +01:00
Have wuffsfmt align the "T"s in "var x T" blocks
This commit is contained in:
1 parent
ece31b9752
commit
1ceb304ad9
9 files changed
+168
-122
No files matched your search
@@ -27,6 +27,13 @@ import (
|
||||
|
||||
var newLine = []byte{'\n'}
|
||||
|
||||
func max(a, b int) int {
|
||||
if a > b {
|
||||
return a
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
func Render(w io.Writer, tm *t.Map, src []t.Token, comments []string) (err error) {
|
||||
if len(src) == 0 {
|
||||
return nil
|
||||
@@ -36,6 +43,7 @@ func Render(w io.Writer, tm *t.Map, src []t.Token, comments []string) (err error
|
||||
indent := 0
|
||||
buf := make([]byte, 0, 1024)
|
||||
commentLine := uint32(0)
|
||||
varNameLength := uint32(0)
|
||||
prevLine := src[0].Line - 1
|
||||
prevLineHanging := false
|
||||
|
||||
@@ -90,6 +98,7 @@ func Render(w io.Writer, tm *t.Map, src []t.Token, comments []string) (err error
|
||||
if _, err = w.Write(newLine); err != nil {
|
||||
return err
|
||||
}
|
||||
varNameLength = 0
|
||||
}
|
||||
|
||||
// Render any leading indentation. If this line starts with a close
|
||||
@@ -104,6 +113,21 @@ func Render(w io.Writer, tm *t.Map, src []t.Token, comments []string) (err error
|
||||
}
|
||||
buf = appendTabs(buf, indent+indentAdjustment)
|
||||
|
||||
if (len(lineTokens) < 2) || (lineTokens[0].ID != t.IDVar) {
|
||||
varNameLength = 0
|
||||
} else {
|
||||
if varNameLength == 0 {
|
||||
varNameLength = measureVarNameLength(tm, lineTokens, src)
|
||||
}
|
||||
name := tm.ByID(lineTokens[1].ID)
|
||||
buf = append(buf, "var "...)
|
||||
buf = append(buf, name...)
|
||||
for i := uint32(len(name)); i <= varNameLength; i++ {
|
||||
buf = append(buf, ' ')
|
||||
}
|
||||
lineTokens = lineTokens[2:]
|
||||
}
|
||||
|
||||
// Render the lineTokens.
|
||||
prevID, prevIsTightRight := t.ID(0), false
|
||||
for _, tok := range lineTokens {
|
||||
@@ -212,3 +236,25 @@ func isCloseIdentLiteral(tm *t.Map, x t.ID) bool {
|
||||
func isCloseIdentStrLiteral(tm *t.Map, x t.ID) bool {
|
||||
return x.IsClose() || x.IsIdent(tm) || x.IsStrLiteral(tm)
|
||||
}
|
||||
|
||||
func measureVarNameLength(tm *t.Map, lineTokens []t.Token, remaining []t.Token) uint32 {
|
||||
if len(lineTokens) < 2 {
|
||||
return 0
|
||||
}
|
||||
line := lineTokens[0].Line
|
||||
length := len(tm.ByID(lineTokens[1].ID))
|
||||
for len(remaining) >= 2 && (remaining[0].ID == t.IDVar) && (remaining[0].Line == line+1) {
|
||||
line = remaining[0].Line
|
||||
length = max(length, len(tm.ByID(remaining[1].ID)))
|
||||
|
||||
remaining = remaining[2:]
|
||||
for len(remaining) > 0 {
|
||||
id := remaining[0].ID
|
||||
remaining = remaining[1:]
|
||||
if id == t.IDSemicolon {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
return uint32(length)
|
||||
}
|
||||
@@ -22,10 +22,10 @@ pub func hasher.update!(x slice base.u8) base.u32 {
|
||||
// The Adler-32 checksum's magic 65521 and 5552 numbers are discussed in
|
||||
// RFC 1950.
|
||||
|
||||
var s1 base.u32
|
||||
var s2 base.u32
|
||||
var s1 base.u32
|
||||
var s2 base.u32
|
||||
var remaining slice base.u8
|
||||
var p slice base.u8
|
||||
var p slice base.u8
|
||||
|
||||
if not this.started {
|
||||
this.started = true
|
||||
|
||||
@@ -122,9 +122,9 @@ pub struct decoder?(
|
||||
)
|
||||
|
||||
pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
var z base.status
|
||||
var written slice base.u8
|
||||
var n_copied base.u64
|
||||
var z base.status
|
||||
var written slice base.u8
|
||||
var n_copied base.u64
|
||||
var already_full base.u32[..0x8000]
|
||||
|
||||
while true {
|
||||
@@ -180,8 +180,8 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
|
||||
pri func decoder.decode_blocks!??(dst base.io_writer, src base.io_reader) {
|
||||
var final base.u32
|
||||
var b0 base.u32[..255]
|
||||
var type base.u32
|
||||
var b0 base.u32[..255]
|
||||
var type base.u32
|
||||
|
||||
while final == 0 {
|
||||
while this.n_bits < 3,
|
||||
@@ -223,7 +223,7 @@ pri func decoder.decode_blocks!??(dst base.io_writer, src base.io_reader) {
|
||||
// decode_uncompressed decodes an uncompresed block as per the RFC section
|
||||
// 3.2.4.
|
||||
pri func decoder.decode_uncompressed!??(dst base.io_writer, src base.io_reader) {
|
||||
var length base.u32
|
||||
var length base.u32
|
||||
var n_copied base.u32
|
||||
|
||||
// TODO: make this "if" into a function invariant?
|
||||
@@ -284,22 +284,22 @@ pri func decoder.init_fixed_huffman!?() {
|
||||
|
||||
// init_dynamic_huffman initializes this.huffs as per the RFC section 3.2.7.
|
||||
pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var b0 base.u32[..255]
|
||||
var n_lit base.u32[..288]
|
||||
var n_dist base.u32[..32]
|
||||
var n_clen base.u32[..19]
|
||||
var i base.u32
|
||||
var b1 base.u32[..255]
|
||||
var mask base.u32[..511]
|
||||
var table_entry base.u32
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var b0 base.u32[..255]
|
||||
var n_lit base.u32[..288]
|
||||
var n_dist base.u32[..32]
|
||||
var n_clen base.u32[..19]
|
||||
var i base.u32
|
||||
var b1 base.u32[..255]
|
||||
var mask base.u32[..511]
|
||||
var table_entry base.u32
|
||||
var table_entry_n_bits base.u32[..15]
|
||||
var b2 base.u32[..255]
|
||||
var n_extra_bits base.u32[..7]
|
||||
var rep_symbol base.u8[..15]
|
||||
var rep_count base.u32
|
||||
var b3 base.u32[..255]
|
||||
var b2 base.u32[..255]
|
||||
var n_extra_bits base.u32[..7]
|
||||
var rep_symbol base.u8[..15]
|
||||
var rep_count base.u32
|
||||
var b3 base.u32[..255]
|
||||
|
||||
bits = this.bits
|
||||
n_bits = this.n_bits
|
||||
@@ -451,30 +451,30 @@ pri func decoder.init_dynamic_huffman!??(src base.io_reader) {
|
||||
// TODO: make named constants for 15, 19, 319, etc.
|
||||
|
||||
pri func decoder.init_huff!?(which base.u32[..1], n_codes0 base.u32[..320], n_codes1 base.u32[..320], base_symbol base.u32) {
|
||||
var counts array[16] base.u16[..320]
|
||||
var i base.u32
|
||||
var remaining base.u32
|
||||
var offsets array[16] base.u16[..320]
|
||||
var n_symbols base.u32[..320]
|
||||
var count base.u32[..320]
|
||||
var symbols array[320] base.u16[..319]
|
||||
var min_cl base.u32[..9]
|
||||
var max_cl base.u32[..15]
|
||||
var counts array[16] base.u16[..320]
|
||||
var i base.u32
|
||||
var remaining base.u32
|
||||
var offsets array[16] base.u16[..320]
|
||||
var n_symbols base.u32[..320]
|
||||
var count base.u32[..320]
|
||||
var symbols array[320] base.u16[..319]
|
||||
var min_cl base.u32[..9]
|
||||
var max_cl base.u32[..15]
|
||||
var initial_high_bits base.u32
|
||||
var prev_cl base.u32[..15]
|
||||
var prev_cl base.u32[..15]
|
||||
var prev_redirect_key base.u32
|
||||
var top base.u32[..1234]
|
||||
var next_top base.u32[..1234]
|
||||
var code base.u32
|
||||
var key base.u32
|
||||
var value base.u32
|
||||
var cl base.u32[..15]
|
||||
var redirect_key base.u32[..511]
|
||||
var j base.u32[..16]
|
||||
var reversed_key base.u32[..511]
|
||||
var symbol base.u32[..319]
|
||||
var high_bits base.u32
|
||||
var delta base.u32
|
||||
var top base.u32[..1234]
|
||||
var next_top base.u32[..1234]
|
||||
var code base.u32
|
||||
var key base.u32
|
||||
var value base.u32
|
||||
var cl base.u32[..15]
|
||||
var redirect_key base.u32[..511]
|
||||
var j base.u32[..16]
|
||||
var reversed_key base.u32[..511]
|
||||
var symbol base.u32[..319]
|
||||
var high_bits base.u32
|
||||
var delta base.u32
|
||||
|
||||
// For the clcode example in this package's README.md:
|
||||
// - n_codes0 = 0
|
||||
|
||||
@@ -20,19 +20,19 @@ pri func decoder.decode_huffman_fast!?(dst base.io_writer, src base.io_reader) {
|
||||
// decode_huffman_*.wuffs files as small as possible, while retaining both
|
||||
// correctness and performance.
|
||||
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var table_entry base.u32
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var table_entry base.u32
|
||||
var table_entry_n_bits base.u32[..15]
|
||||
var lmask base.u32[..511]
|
||||
var dmask base.u32[..511]
|
||||
var redir_top base.u32[..0xFFFF]
|
||||
var redir_mask base.u32[..0x7FFF]
|
||||
var length base.u32[..258]
|
||||
var dist_minus_1 base.u32[..0x7FFF]
|
||||
var n_copied base.u32
|
||||
var hlen base.u32[..0x7FFF]
|
||||
var hdist base.u32
|
||||
var lmask base.u32[..511]
|
||||
var dmask base.u32[..511]
|
||||
var redir_top base.u32[..0xFFFF]
|
||||
var redir_mask base.u32[..0x7FFF]
|
||||
var length base.u32[..258]
|
||||
var dist_minus_1 base.u32[..0x7FFF]
|
||||
var n_copied base.u32
|
||||
var hlen base.u32[..0x7FFF]
|
||||
var hdist base.u32
|
||||
|
||||
if (this.n_bits >= 8) or ((this.bits >> this.n_bits) != 0) {
|
||||
return "?internal error: inconsistent n_bits"
|
||||
|
||||
@@ -13,25 +13,25 @@
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.decode_huffman_slow!??(dst base.io_writer, src base.io_reader) {
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var table_entry base.u32
|
||||
var bits base.u32
|
||||
var n_bits base.u32
|
||||
var table_entry base.u32
|
||||
var table_entry_n_bits base.u32[..15]
|
||||
var lmask base.u32[..511]
|
||||
var dmask base.u32[..511]
|
||||
var b0 base.u32[..255]
|
||||
var redir_top base.u32[..0xFFFF]
|
||||
var redir_mask base.u32[..0x7FFF]
|
||||
var b1 base.u32[..255]
|
||||
var length base.u32[..258]
|
||||
var b2 base.u32[..255]
|
||||
var b3 base.u32[..255]
|
||||
var b4 base.u32[..255]
|
||||
var dist_minus_1 base.u32[..0x7FFF]
|
||||
var b5 base.u32[..255]
|
||||
var n_copied base.u32
|
||||
var hlen base.u32[..0x7FFF]
|
||||
var hdist base.u32
|
||||
var lmask base.u32[..511]
|
||||
var dmask base.u32[..511]
|
||||
var b0 base.u32[..255]
|
||||
var redir_top base.u32[..0xFFFF]
|
||||
var redir_mask base.u32[..0x7FFF]
|
||||
var b1 base.u32[..255]
|
||||
var length base.u32[..258]
|
||||
var b2 base.u32[..255]
|
||||
var b3 base.u32[..255]
|
||||
var b4 base.u32[..255]
|
||||
var dist_minus_1 base.u32[..0x7FFF]
|
||||
var b5 base.u32[..255]
|
||||
var n_copied base.u32
|
||||
var hlen base.u32[..0x7FFF]
|
||||
var hdist base.u32
|
||||
|
||||
// When editing this function, consider making the equivalent change to the
|
||||
// decode_huffman_fast function. Keep the diff between the two
|
||||
|
||||
+26
-26
@@ -330,10 +330,10 @@ pri func decoder.decode_header!??(src base.io_reader) {
|
||||
//
|
||||
// See the spec section 18 "Logical Screen Descriptor" on page 8.
|
||||
pri func decoder.decode_lsd!??(src base.io_reader) {
|
||||
var flags base.u8
|
||||
var flags base.u8
|
||||
var num_palette_entries base.u32[..256]
|
||||
var i base.u32
|
||||
var argb base.u32
|
||||
var i base.u32
|
||||
var argb base.u32
|
||||
|
||||
this.width = args.src.read_u16le_as_u32!??()
|
||||
this.height = args.src.read_u16le_as_u32!??()
|
||||
@@ -416,8 +416,8 @@ pri const netscape2dot0 array[11] base.u8 = [
|
||||
|
||||
// decode_ae reads an Application Extension.
|
||||
pri func decoder.decode_ae!??(src base.io_reader) {
|
||||
var c base.u8
|
||||
var block_size base.u8
|
||||
var c base.u8
|
||||
var block_size base.u8
|
||||
var not_animexts base.bool
|
||||
var not_netscape base.bool
|
||||
|
||||
@@ -486,8 +486,8 @@ pri func decoder.decode_ae!??(src base.io_reader) {
|
||||
|
||||
// decode_gc reads a Graphic Control.
|
||||
pri func decoder.decode_gc!??(src base.io_reader) {
|
||||
var c base.u8
|
||||
var flags base.u8
|
||||
var c base.u8
|
||||
var flags base.u8
|
||||
var gc_duration_centiseconds base.u16
|
||||
|
||||
if this.seen_graphic_control {
|
||||
@@ -565,12 +565,12 @@ pri func decoder.decode_id_part0!??(src base.io_reader) {
|
||||
}
|
||||
|
||||
pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reader) {
|
||||
var flags base.u8
|
||||
var flags base.u8
|
||||
var num_palette_entries base.u32[..256]
|
||||
var i base.u32
|
||||
var argb base.u32
|
||||
var dst_palette slice base.u8
|
||||
var lw base.u8
|
||||
var i base.u32
|
||||
var argb base.u32
|
||||
var dst_palette slice base.u8
|
||||
var lw base.u8
|
||||
|
||||
flags = args.src.read_u8!??()
|
||||
if (flags & 0x40) != 0 {
|
||||
@@ -660,13 +660,13 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade
|
||||
}
|
||||
|
||||
pri func decoder.decode_id_part2!??(dst ptr base.pixel_buffer, src base.io_reader, workbuf slice base.u8) {
|
||||
var block_size base.u64[..255]
|
||||
var block_size base.u64[..255]
|
||||
var need_block_size base.bool
|
||||
var n_compressed base.u64
|
||||
var compressed slice base.u8
|
||||
var r base.io_reader
|
||||
var z base.status
|
||||
var uncompressed slice base.u8
|
||||
var n_compressed base.u64
|
||||
var compressed slice base.u8
|
||||
var r base.io_reader
|
||||
var z base.status
|
||||
var uncompressed slice base.u8
|
||||
|
||||
need_block_size = true
|
||||
while:outer true {
|
||||
@@ -752,15 +752,15 @@ pri func decoder.decode_id_part2!??(dst ptr base.pixel_buffer, src base.io_reade
|
||||
|
||||
pri func decoder.copy_to_image_buffer!?(pb ptr base.pixel_buffer, src slice base.u8) {
|
||||
// TODO: don't assume a packed pixel format.
|
||||
var dst slice base.u8
|
||||
var src slice base.u8
|
||||
var n base.u64
|
||||
var src_ri base.u64
|
||||
var dst slice base.u8
|
||||
var src slice base.u8
|
||||
var n base.u64
|
||||
var src_ri base.u64
|
||||
var bytes_per_pixel base.u32[..64]
|
||||
var pixfmt base.u32
|
||||
var tab table base.u8
|
||||
var i base.u64
|
||||
var j base.u64
|
||||
var pixfmt base.u32
|
||||
var tab table base.u8
|
||||
var i base.u64
|
||||
var j base.u64
|
||||
|
||||
// TODO: a Wuffs (not just C) name for the WUFFS_BASE__PIXEL_FORMAT__ETC
|
||||
// magic pixfmt constants. Also, support more formats.
|
||||
|
||||
@@ -31,13 +31,13 @@ pub func decoder.set_ignore_checksum!(ic base.bool) {
|
||||
}
|
||||
|
||||
pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
var c base.u8
|
||||
var flags base.u8
|
||||
var xlen base.u16
|
||||
var checksum_got base.u32
|
||||
var decoded_length_got base.u32
|
||||
var z base.status
|
||||
var checksum_want base.u32
|
||||
var c base.u8
|
||||
var flags base.u8
|
||||
var xlen base.u16
|
||||
var checksum_got base.u32
|
||||
var decoded_length_got base.u32
|
||||
var z base.status
|
||||
var checksum_want base.u32
|
||||
var decoded_length_want base.u32
|
||||
|
||||
// Read the header.
|
||||
|
||||
+10
-10
@@ -104,22 +104,22 @@ pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
|
||||
pri func decoder.read_from!(src base.io_reader) {
|
||||
var clear_code base.u32[..256]
|
||||
var end_code base.u32[..257]
|
||||
var end_code base.u32[..257]
|
||||
|
||||
var save_code base.u32[..4096]
|
||||
var prev_code base.u32[..4095]
|
||||
var width base.u32[..12]
|
||||
var bits base.u32
|
||||
var n_bits base.u32[..31]
|
||||
var width base.u32[..12]
|
||||
var bits base.u32
|
||||
var n_bits base.u32[..31]
|
||||
var output_wi base.u32[..8191]
|
||||
|
||||
var code base.u32[..4095]
|
||||
var c base.u32[..4095]
|
||||
var o base.u32[..8191]
|
||||
var steps base.u32
|
||||
var code base.u32[..4095]
|
||||
var c base.u32[..4095]
|
||||
var o base.u32[..8191]
|
||||
var steps base.u32
|
||||
var first_byte base.u8
|
||||
var lm1_b base.u16[..4095]
|
||||
var lm1_a base.u16[..4095]
|
||||
var lm1_b base.u16[..4095]
|
||||
var lm1_a base.u16[..4095]
|
||||
|
||||
clear_code = this.clear_code
|
||||
end_code = this.end_code
|
||||
|
||||
@@ -33,9 +33,9 @@ pub func decoder.set_ignore_checksum!(ic base.bool) {
|
||||
}
|
||||
|
||||
pub func decoder.decode!??(dst base.io_writer, src base.io_reader) {
|
||||
var x base.u16
|
||||
var checksum_got base.u32
|
||||
var z base.status
|
||||
var x base.u16
|
||||
var checksum_got base.u32
|
||||
var z base.status
|
||||
var checksum_want base.u32
|
||||
|
||||
x = args.src.read_u16be!??()
|
||||
|
||||
Reference in new issue
Block a user