diff --git a/.github/workflows/v_apps_and_modules_compile_ci.yml b/.github/workflows/v_apps_and_modules_compile_ci.yml index 0088214c4896f7..e074d67318299b 100644 --- a/.github/workflows/v_apps_and_modules_compile_ci.yml +++ b/.github/workflows/v_apps_and_modules_compile_ci.yml @@ -157,18 +157,18 @@ jobs: echo "Build v-analyzer release" v build.vsh release - - name: Format vlang/v-analyzer - if: ${{ !cancelled() && steps.build.outcome == 'success' }} - run: | - cd /tmp/v-analyzer - set +e - v fmt -c . - exit_code=$? - if [[ $exit_code -ne 0 && $exit_code -ne 5 ]]; then - # Don't fail if there are only internal errors (exit code 5). - v fmt -diff . - exit 1 - fi + # - name: Format vlang/v-analyzer + # if: ${{ !cancelled() && steps.build.outcome == 'success' }} + # run: | + # cd /tmp/v-analyzer + # set +e + # v fmt -c . + # exit_code=$? + # if [[ $exit_code -ne 0 && $exit_code -ne 5 ]]; then + # # Don't fail if there are only internal errors (exit code 5). + # v fmt -diff . + # exit 1 + # fi - name: Build vlang/go2v if: ${{ !cancelled() && steps.build.outcome == 'success' && matrix.os != 'macos-14' }} diff --git a/cmd/tools/measure/fmt_speed.v b/cmd/tools/measure/fmt_speed.v index c2c0e44bb41f62..49a222daf12a77 100644 --- a/cmd/tools/measure/fmt_speed.v +++ b/cmd/tools/measure/fmt_speed.v @@ -89,10 +89,10 @@ fn process_files(files []string) ! { fn new_parser(path string, comments_mode scanner.CommentsMode, table &ast.Table, pref_ &pref.Preferences) &parser.Parser { mut p := &parser.Parser{ - scanner: scanner.new_scanner_file(path, comments_mode, pref_) or { panic(err) } - table: table - pref: pref_ - scope: &ast.Scope{ + scanner: scanner.new_scanner_file(path, comments_mode, pref_) or { panic(err) } + table: table + pref: pref_ + scope: &ast.Scope{ start_pos: 0 parent: table.global_scope } diff --git a/cmd/tools/measure/parser_speed.v b/cmd/tools/measure/parser_speed.v index 7165a24e0fdaca..dd60cdb7ddf30a 100644 --- a/cmd/tools/measure/parser_speed.v +++ b/cmd/tools/measure/parser_speed.v @@ -87,10 +87,10 @@ fn process_files(files []string) ! { fn new_parser(path string, comments_mode scanner.CommentsMode, table &ast.Table, pref_ &pref.Preferences) &parser.Parser { mut p := &parser.Parser{ - scanner: scanner.new_scanner_file(path, comments_mode, pref_) or { panic(err) } - table: table - pref: pref_ - scope: &ast.Scope{ + scanner: scanner.new_scanner_file(path, comments_mode, pref_) or { panic(err) } + table: table + pref: pref_ + scope: &ast.Scope{ start_pos: 0 parent: table.global_scope } diff --git a/cmd/tools/vbump_test.v b/cmd/tools/vbump_test.v index 7ff7c3ce7b66cb..5ee476fee92091 100644 --- a/cmd/tools/vbump_test.v +++ b/cmd/tools/vbump_test.v @@ -22,8 +22,8 @@ struct BumpTestCase { const test_cases = [ BumpTestCase{ - file_name: 'v.mod' - contents: "Module { + file_name: 'v.mod' + contents: "Module { name: 'Sample' description: 'Sample project' version: '1.2.6' @@ -38,8 +38,8 @@ const test_cases = [ expected_major: " version: '2.0.0'" }, BumpTestCase{ - file_name: 'random_versions.vv' - contents: " + file_name: 'random_versions.vv' + contents: " 1.1.2 1.2.5 3.21.73 @@ -52,8 +52,8 @@ version = '1.5.1' expected_major: "version = '2.0.0'" }, BumpTestCase{ - file_name: 'sample_tool.v' - contents: "// Module comment and copyright information + file_name: 'sample_tool.v' + contents: "// Module comment and copyright information import os import flag @@ -110,8 +110,8 @@ struct SkipTestCase { const skip_test_cases = [ SkipTestCase{ - file_name: 'CITATION.cff' - contents: 'abstract: A sample CLI tool made in V that prints geometric shapes to the screen. + file_name: 'CITATION.cff' + contents: 'abstract: A sample CLI tool made in V that prints geometric shapes to the screen. authors: - alias: hungrybluedev family-names: Haldar diff --git a/cmd/tools/vcreate/vcreate.v b/cmd/tools/vcreate/vcreate.v index e15673714cdbbb..e8faca9277c96e 100644 --- a/cmd/tools/vcreate/vcreate.v +++ b/cmd/tools/vcreate/vcreate.v @@ -50,7 +50,7 @@ fn main() { }, ] mut cmd := Command{ - flags: [ + flags: [ Flag{ flag: .bool name: 'help' @@ -70,7 +70,7 @@ fn main() { 'The argument can be omitted and entered in the prompts dialog.', 'If git is installed, `git init` will be performed during the setup.', ].join_lines() - parent: &Command{ + parent: &Command{ name: 'v' } posix_mode: true @@ -87,7 +87,7 @@ fn main() { 'If no `.v` file exists, a project template is generated. If the current directory is not a', 'git project and git is installed, `git init` will be performed during the setup.', ].join_lines() - parent: &Command{ + parent: &Command{ name: 'v' } posix_mode: true diff --git a/cmd/tools/vdoc/files.v b/cmd/tools/vdoc/files.v index 13d050b796538b..eac27e3d5e64f4 100644 --- a/cmd/tools/vdoc/files.v +++ b/cmd/tools/vdoc/files.v @@ -10,7 +10,7 @@ mut: // Default ignore patterns. '': ['testdata', 'tests', '*_test.v'] } - paths map[string]bool + paths map[string]bool } fn get_modules(path string) []string { diff --git a/cmd/tools/vdoc/html.v b/cmd/tools/vdoc/html.v index 8998992542362f..9908dc3d77b87d 100644 --- a/cmd/tools/vdoc/html.v +++ b/cmd/tools/vdoc/html.v @@ -155,7 +155,7 @@ fn (mut vd VDoc) create_search_results(mod string, dn doc.DocNode, out Output) { dn_description := trim_doc_node_description(dn.name, comments) vd.search_index << dn.name vd.search_data << SearchResult{ - prefix: if dn.parent_name != '' { + prefix: if dn.parent_name != '' { '${dn.kind} (${dn.parent_name})' } else { '${dn.kind} ' diff --git a/cmd/tools/vdoc/vdoc.v b/cmd/tools/vdoc/vdoc.v index 8a8086673ce1bd..00386f6e8eaad7 100644 --- a/cmd/tools/vdoc/vdoc.v +++ b/cmd/tools/vdoc/vdoc.v @@ -299,7 +299,7 @@ fn (mut vd VDoc) generate_docs_from_file() { println(markdown.to_plain(readme_contents)) } else if out.typ == .html && cfg.is_multi { vd.docs << doc.Doc{ - head: doc.DocNode{ + head: doc.DocNode{ name: 'README' comments: [comment] } diff --git a/cmd/tools/vrepl.v b/cmd/tools/vrepl.v index 5e6a9851ed7635..bd83de31f23e8a 100644 --- a/cmd/tools/vrepl.v +++ b/cmd/tools/vrepl.v @@ -87,7 +87,7 @@ fn new_repl(folder string) Repl { vstartup_source := os.read_file(vstartup) or { '' }.trim_right('\n\r').split_into_lines() os.mkdir_all(folder) or {} return Repl{ - readline: readline.Readline{ + readline: readline.Readline{ skip_empty: true } folder: folder diff --git a/examples/2048/2048.v b/examples/2048/2048.v index c8e0cec88c8a1d..91f94e3b62f383 100644 --- a/examples/2048/2048.v +++ b/examples/2048/2048.v @@ -827,7 +827,7 @@ fn on_event(e &gg.Event, mut app App) { if e.num_touches > 0 { t := e.touches[0] app.touch.start = Touch{ - pos: Pos{ + pos: Pos{ x: int(t.pos_x / app.ui.dpi_scale) y: int(t.pos_y / app.ui.dpi_scale) } @@ -839,7 +839,7 @@ fn on_event(e &gg.Event, mut app App) { if e.num_touches > 0 { t := e.touches[0] app.touch.end = Touch{ - pos: Pos{ + pos: Pos{ x: int(t.pos_x / app.ui.dpi_scale) y: int(t.pos_y / app.ui.dpi_scale) } @@ -850,7 +850,7 @@ fn on_event(e &gg.Event, mut app App) { } .mouse_down { app.touch.start = Touch{ - pos: Pos{ + pos: Pos{ x: int(e.mouse_x / app.ui.dpi_scale) y: int(e.mouse_y / app.ui.dpi_scale) } @@ -859,7 +859,7 @@ fn on_event(e &gg.Event, mut app App) { } .mouse_up { app.touch.end = Touch{ - pos: Pos{ + pos: Pos{ x: int(e.mouse_x / app.ui.dpi_scale) y: int(e.mouse_y / app.ui.dpi_scale) } diff --git a/examples/clock/clock.v b/examples/clock/clock.v index 35ec279cf1a54a..9c9b69ee8b03a3 100644 --- a/examples/clock/clock.v +++ b/examples/clock/clock.v @@ -31,10 +31,10 @@ const second_hand_color = gx.red struct App { minutes_tic []f32 = [f32(center - tw), tp, center + tw, tp, center + tw, tp, center + tw, tp + 1 * th, center - tw, tp + 1 * th] - hours_tic []f32 = [f32(center - tw), tp, center + tw, tp, center + tw, tp, center + tw, tp + 2 * th, - center - tw, tp + 2 * th] - hours3_tic []f32 = [f32(center - tw), tp, center + tw, tp, center + tw, tp, center + tw, tp + 3 * th, - center - tw, tp + 3 * th] + hours_tic []f32 = [f32(center - tw), tp, center + tw, tp, center + tw, tp, center + tw, + tp + 2 * th, center - tw, tp + 2 * th] + hours3_tic []f32 = [f32(center - tw), tp, center + tw, tp, center + tw, tp, center + tw, + tp + 3 * th, center - tw, tp + 3 * th] hour_hand []f32 = [f32(329), 161, 350, 140, 371, 161, 371, 413, 329, 413] minute_hand []f32 = [f32(334.25), 40.25, 350, 24.5, 365.75, 40.25, 365.75, 427, 334.25, 427] diff --git a/examples/fireworks/modules/objects/rocket.v b/examples/fireworks/modules/objects/rocket.v index 2a342f78f54cb9..566b116a063ce0 100644 --- a/examples/fireworks/modules/objects/rocket.v +++ b/examples/fireworks/modules/objects/rocket.v @@ -53,7 +53,7 @@ pub fn new_rocket() Rocket { pos: Vector{ x: rand.f32_in_range(50, get_params().width - 50) or { 50 } } - vel: Vector{ + vel: Vector{ x: rand.f32_in_range(-1.5, 1.5) or { -1.5 } y: rand.f32_in_range(5, 7) or { 5 } } diff --git a/examples/flag/animated_help_text.v b/examples/flag/animated_help_text.v index ac2b807ef00c30..a3254905ddbec3 100644 --- a/examples/flag/animated_help_text.v +++ b/examples/flag/animated_help_text.v @@ -57,9 +57,9 @@ fn frame(mut app App) { description: 'Hello! This should show an *animated* example application description. We are at frame ${app.frame}. Press ESCAPE or Ctrl+C to exit' - footer: ' + footer: ' Press ESCAPE or Ctrl+C to exit' - fields: { + fields: { 'level': 'Level of lorem ipsum\nand more\nmany many many more.\nNotice how user newlines/format is kept since\ninput lines are all less or within\nthe default layout.description_padding\nand max width' 'example': 'Looong example text without newlines or anything else and lorem ipsum and more and many many many more. Should be auto fitted' 'multi': 'This flag can be repeated' diff --git a/examples/flag/flag_layout_editor.v b/examples/flag/flag_layout_editor.v index aa720d61c1bc06..3a3d179281c29d 100644 --- a/examples/flag/flag_layout_editor.v +++ b/examples/flag/flag_layout_editor.v @@ -209,11 +209,11 @@ Editing property: ${app.edit}, value: ${value}') help_text := flag.to_doc[DocTest]( description: 'Simple DocLayout editor. Press ESCAPE or Ctrl+C to exit and print layout code' - footer: ' + footer: ' Press ESCAPE or Ctrl+C to exit and print layout code' - fields: unsafe { field_docs } - layout: app.layout - options: app.options + fields: unsafe { field_docs } + layout: app.layout + options: app.options ) or { '' } app.tui.draw_text(0, 5, '${help_text}') diff --git a/examples/gg/additive.v b/examples/gg/additive.v index f680745bf6bd36..7e78bf758cea33 100644 --- a/examples/gg/additive.v +++ b/examples/gg/additive.v @@ -42,8 +42,8 @@ pub fn (mut window Window) draw(_ voidptr) { x: myconfig.img_rect.x + f32(math.sin(f32(window.ctx.frame) / 10.0) * 60) y: myconfig.img_rect.y + f32(math.cos(f32(window.ctx.frame) / 10.0) * 60) } - color: gx.Color{255, 0, 0, 255} - effect: .add + color: gx.Color{255, 0, 0, 255} + effect: .add }) // Green @@ -54,8 +54,8 @@ pub fn (mut window Window) draw(_ voidptr) { x: myconfig.img_rect.x + f32(math.sin(f32(window.ctx.frame) / 10.0) * 80) y: myconfig.img_rect.y + f32(math.cos(f32(window.ctx.frame) / 10.0) * 80) } - color: gx.Color{0, 255, 0, 255} - effect: .add + color: gx.Color{0, 255, 0, 255} + effect: .add }) // Blue @@ -66,8 +66,8 @@ pub fn (mut window Window) draw(_ voidptr) { x: myconfig.img_rect.x + f32(math.sin(f32(window.ctx.frame) / 10.0) * 100) y: myconfig.img_rect.y + f32(math.cos(f32(window.ctx.frame) / 10.0) * 100) } - color: gx.Color{0, 0, 255, 255} - effect: .add + color: gx.Color{0, 0, 255, 255} + effect: .add }) // More examples @@ -78,8 +78,8 @@ pub fn (mut window Window) draw(_ voidptr) { x: 50 y: 0 } - color: gx.Color{255, 0, 0, 255} - effect: .add + color: gx.Color{255, 0, 0, 255} + effect: .add }) window.ctx.draw_image_with_config(gg.DrawImageConfig{ @@ -89,8 +89,8 @@ pub fn (mut window Window) draw(_ voidptr) { x: 50 y: 50 } - color: gx.Color{0, 255, 0, 255} - effect: .add + color: gx.Color{0, 255, 0, 255} + effect: .add }) window.ctx.draw_image_with_config(gg.DrawImageConfig{ @@ -100,8 +100,8 @@ pub fn (mut window Window) draw(_ voidptr) { x: 50 y: 100 } - color: gx.Color{0, 0, 255, 255} - effect: .add + color: gx.Color{0, 0, 255, 255} + effect: .add }) window.ctx.end() diff --git a/examples/gg/digital_rain.v b/examples/gg/digital_rain.v index 5db35135f0c99b..48c3639c024452 100644 --- a/examples/gg/digital_rain.v +++ b/examples/gg/digital_rain.v @@ -45,7 +45,7 @@ fn rain(mut app App) { init_fn: fn (mut app App) { gg.toggle_fullscreen() } - event_fn: fn (event &gg.Event, mut app App) { + event_fn: fn (event &gg.Event, mut app App) { vprintln('event.typ: ${event.typ} | event.char_code: ${event.char_code}') if event.typ == .resized { app.should_calc = true @@ -63,7 +63,7 @@ fn rain(mut app App) { app.delay = if new_delay > 0 { new_delay } else { 0 } } } - frame_fn: frame + frame_fn: frame ) app.ctx.run() } @@ -146,7 +146,7 @@ fn draw_rain_column(rc RainColumn, app App) { b: if at_head { u8(255) } else { 0 } a: alpha } - mono: true + mono: true } if i < rc.drops.len { app.ctx.draw_text(x, y, rc.drops[i].ascii_str(), cfg) diff --git a/examples/gg/path_finding_algorithm_visualizer/aStar.v b/examples/gg/path_finding_algorithm_visualizer/aStar.v index f39700ae9017c8..0bd5fa9a87be6d 100644 --- a/examples/gg/path_finding_algorithm_visualizer/aStar.v +++ b/examples/gg/path_finding_algorithm_visualizer/aStar.v @@ -335,7 +335,7 @@ fn astar_path_finding(mut app App, mut grid [][]Cell, start Point, end Point) { x: start.x y: start.y } - count: 0 + count: 0 }) for priority_queue.len() > 0 { diff --git a/examples/macos_tray/tray.v b/examples/macos_tray/tray.v index bbf83af0490318..44e5809f8a06ab 100644 --- a/examples/macos_tray/tray.v +++ b/examples/macos_tray/tray.v @@ -51,7 +51,7 @@ fn main() { } my_app.tray_info = C.tray_app_init(TrayParams{ - items: [TrayMenuItem{ + items: [TrayMenuItem{ id: 'hello' text: 'Hello' }, TrayMenuItem{ diff --git a/examples/pendulum-simulation/modules/sim/params_test.v b/examples/pendulum-simulation/modules/sim/params_test.v index a66e3bdb341573..204badeba72877 100644 --- a/examples/pendulum-simulation/modules/sim/params_test.v +++ b/examples/pendulum-simulation/modules/sim/params_test.v @@ -21,7 +21,7 @@ const params_test_mock_state = SimState{ y: -12.559375680227724 z: -105.91539687686381 ) - accel: vector( + accel: vector( x: -8.337034766251843e-11 y: -2.842170943040401e-10 z: 1.2126596023639044e-10 diff --git a/examples/pendulum-simulation/modules/sim/sim_test.v b/examples/pendulum-simulation/modules/sim/sim_test.v index 454aab422f72d0..31140248da4273 100644 --- a/examples/pendulum-simulation/modules/sim/sim_test.v +++ b/examples/pendulum-simulation/modules/sim/sim_test.v @@ -19,7 +19,7 @@ const sim_test_mock_state = SimState{ y: -12.559375680227724 z: -105.91539687686381 ) - accel: vector( + accel: vector( x: -8.337034766251843e-11 y: -2.842170943040401e-10 z: 1.2126596023639044e-10 diff --git a/examples/pendulum-simulation/modules/sim/worker_test.v b/examples/pendulum-simulation/modules/sim/worker_test.v index c0080136f76d96..36e920d6a7e097 100644 --- a/examples/pendulum-simulation/modules/sim/worker_test.v +++ b/examples/pendulum-simulation/modules/sim/worker_test.v @@ -19,7 +19,7 @@ const worker_test_mock_state = SimState{ y: -12.559375680227724 z: -105.91539687686381 ) - accel: vector( + accel: vector( x: -8.337034766251843e-11 y: -2.842170943040401e-10 z: 1.2126596023639044e-10 @@ -43,7 +43,7 @@ fn test_compute_result() { y: -12.55937568022536 z: -105.91539687684447 ) - accel: vector( + accel: vector( x: -1.1368683772161603e-11 y: -1.5916157281026244e-10 z: 0 diff --git a/examples/sokol/06_obj_viewer/modules/obj/struct.v b/examples/sokol/06_obj_viewer/modules/obj/struct.v index 07c65e09ef0acf..93c3f990141b2a 100644 --- a/examples/sokol/06_obj_viewer/modules/obj/struct.v +++ b/examples/sokol/06_obj_viewer/modules/obj/struct.v @@ -88,10 +88,10 @@ pub mut: ka m4.Vec4 = m4.Vec4{ e: [f32(0.1), 0.0, 0.0, 1.0]! } - kd m4.Vec4 = m4.Vec4{ + kd m4.Vec4 = m4.Vec4{ e: [f32(0.5), 0.5, 0.5, 1.0]! } - ks m4.Vec4 = m4.Vec4{ + ks m4.Vec4 = m4.Vec4{ e: [f32(1.0), 1.0, 1.0, 1.0]! } } diff --git a/examples/sokol/08_sdf/sdf.v b/examples/sokol/08_sdf/sdf.v index 3032c396d02fb1..19fa823c02d0b0 100644 --- a/examples/sokol/08_sdf/sdf.v +++ b/examples/sokol/08_sdf/sdf.v @@ -64,6 +64,6 @@ fn main() { icon: sapp.IconDesc{ sokol_default: true } - user_data: &State{} + user_data: &State{} }) } diff --git a/examples/templates/templates.v b/examples/templates/templates.v index 32256abf248f3e..f7b68c9c1b8103 100644 --- a/examples/templates/templates.v +++ b/examples/templates/templates.v @@ -78,7 +78,7 @@ fn data_get() []SiteConfig { path_code: '/Users/despiegk/codewww/github/threefoldfoundation/www_threefold_marketplace' domains: ['now.threefold.io', 'marketplace.threefold.io', 'now.threefold.me', 'marketplace.threefold.me'] - descr: 'apps for community builders, runs on top of evdc' + descr: 'apps for community builders, runs on top of evdc' }, SiteConfig{ name: 'www_conscious_internet' @@ -90,7 +90,7 @@ fn data_get() []SiteConfig { path_code: '/Users/despiegk/codewww/github/threefoldfoundation/www_conscious_internet' domains: ['www.consciousinternet.org', 'eco.threefold.io', 'community.threefold.io', 'eco.threefold.me', 'community.threefold.me'] - descr: 'community around threefold, partners, friends, ...' + descr: 'community around threefold, partners, friends, ...' }, SiteConfig{ name: 'www_threefold_tech' diff --git a/examples/term.ui/vyper.v b/examples/term.ui/vyper.v index 0d59a63069f662..f5233d727f1280 100644 --- a/examples/term.ui/vyper.v +++ b/examples/term.ui/vyper.v @@ -58,7 +58,7 @@ fn (mut v Vec) randomize(min_x int, min_y int, max_x int, max_y int) { // part of snake's body representation struct BodyPart { mut: - pos Vec = Vec{ + pos Vec = Vec{ x: block_size y: block_size } @@ -239,7 +239,7 @@ fn (s Snake) draw() { // rat representation struct Rat { mut: - pos Vec = Vec{ + pos Vec = Vec{ x: block_size y: block_size } diff --git a/vlib/cli/README.md b/vlib/cli/README.md index 331ff991185e08..4592f393ae0148 100644 --- a/vlib/cli/README.md +++ b/vlib/cli/README.md @@ -22,7 +22,7 @@ fn main() { println('hello app') return } - commands: [ + commands: [ cli.Command{ name: 'sub' execute: fn (cmd cli.Command) ! { diff --git a/vlib/cli/help_test.v b/vlib/cli/help_test.v index 1fc45210e691e1..96876fdfd2f3ae 100644 --- a/vlib/cli/help_test.v +++ b/vlib/cli/help_test.v @@ -14,7 +14,7 @@ fn test_help_message() { description: 'another subcommand' }, ] - flags: [ + flags: [ Flag{ flag: .string name: 'str' diff --git a/vlib/cli/man_test.v b/vlib/cli/man_test.v index 2dfc03ae8128d9..d05f06019b95d3 100644 --- a/vlib/cli/man_test.v +++ b/vlib/cli/man_test.v @@ -14,7 +14,7 @@ fn test_manpage() { description: 'another subcommand' }, ] - flags: [ + flags: [ Flag{ flag: .string name: 'str' diff --git a/vlib/crypto/blake3/blake3_chunk_test.v b/vlib/crypto/blake3/blake3_chunk_test.v index 6581d554118393..babd319f72c0ae 100644 --- a/vlib/crypto/blake3/blake3_chunk_test.v +++ b/vlib/crypto/blake3/blake3_chunk_test.v @@ -43,7 +43,7 @@ struct TestCase { const test_cases = [ // chunk 0 with 0 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: '' key_words: iv chunk_number: 0 @@ -55,13 +55,13 @@ const test_cases = [ block_words: [u32(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] flags: 0x0b } - words: [u32(0xb94913af), 0xa6a1f9f5, 0xea4d40a0, 0x49c9dc36, 0xc925cb9b, 0xb712c1ad, + words: [u32(0xb94913af), 0xa6a1f9f5, 0xea4d40a0, 0x49c9dc36, 0xc925cb9b, 0xb712c1ad, 0xca939acc, 0x62321fe4, 0xe7030fe0, 0x6bf29ab6, 0x9ff0aa7f, 0x503033cd, 0xe0df8d33, 0x86ccb885, 0x208ba99c, 0x3a24086c] }, // chunk 0 with 1 byte input TestCase{ - input: TestInput{ + input: TestInput{ input_string: 'A' key_words: iv chunk_number: 0 @@ -73,13 +73,13 @@ const test_cases = [ block_words: [u32(0x00000041), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] flags: 0x0b } - words: [u32(0xfa4b6832), 0x4dc8c028, 0x1105216f, 0xfc0eceaa, 0x88c77151, 0x89ba4891, + words: [u32(0xfa4b6832), 0x4dc8c028, 0x1105216f, 0xfc0eceaa, 0x88c77151, 0x89ba4891, 0xa25a8d20, 0x98fa0597, 0x4c0088e3, 0xafa7cbb8, 0xc586c5f7, 0x66dbef0e, 0x8c91d56a, 0xa0b3daff, 0xe919be05, 0x997a1ce7] }, // chunk 0 with 3 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: 'abc' key_words: iv chunk_number: 0 @@ -91,13 +91,13 @@ const test_cases = [ block_words: [u32(0x00636261), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] flags: 0x0b } - words: [u32(0xacb33764), 0x33514638, 0x753bb6ff, 0xb58d3a27, 0x4658c548, 0x03db795d, + words: [u32(0xacb33764), 0x33514638, 0x753bb6ff, 0xb58d3a27, 0x4658c548, 0x03db795d, 0x6c9c35fd, 0x859dbdd5, 0xae50b21f, 0xd0f59373, 0x5db61328, 0x490d1a52, 0x9ca09b2d, 0x4c7fcef7, 0xf200d9ff, 0x0bbf7433] }, // chunk 0 with 63 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: ll[..63] key_words: iv chunk_number: 0 @@ -109,15 +109,15 @@ const test_cases = [ block_words: [u32(0x44434241), 0x48474645, 0x4c4b4a49, 0x504f4e4d, 0x54535251, 0x58575655, 0x61205a59, 0x65646362, 0x69686766, 0x6d6c6b6a, 0x71706f6e, 0x75747372, 0x79787776, 0x3130207a, 0x35343332, 0x00383736] - flags: 0x0b + flags: 0x0b } - words: [u32(0x39c41fc6), 0x2dd7c57b, 0xb8b16421, 0x360cbedb, 0x462d5672, 0x56713bb5, + words: [u32(0x39c41fc6), 0x2dd7c57b, 0xb8b16421, 0x360cbedb, 0x462d5672, 0x56713bb5, 0x15132543, 0x7a92c4ba, 0x15c4ac13, 0x2354f573, 0xdc14f100, 0x35be07e8, 0xf98b17b9, 0x573f38f8, 0xc8d2fbf4, 0xc06588e5] }, // chunk 0 with 64 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: ll[..64] key_words: iv chunk_number: 0 @@ -129,15 +129,15 @@ const test_cases = [ block_words: [u32(0x44434241), 0x48474645, 0x4c4b4a49, 0x504f4e4d, 0x54535251, 0x58575655, 0x61205a59, 0x65646362, 0x69686766, 0x6d6c6b6a, 0x71706f6e, 0x75747372, 0x79787776, 0x3130207a, 0x35343332, 0x39383736] - flags: 0x0b + flags: 0x0b } - words: [u32(0x6010817a), 0x21deb495, 0x0826485b, 0x6f895da5, 0x9363242a, 0x176b60a9, + words: [u32(0x6010817a), 0x21deb495, 0x0826485b, 0x6f895da5, 0x9363242a, 0x176b60a9, 0x383215a7, 0x2b95570f, 0x57fe7082, 0x45b13a10, 0x007af189, 0x4b5e7ec7, 0x9574b5d8, 0x109362a0, 0x282d14c2, 0x3a134380] }, // chunk 0 with 65 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: ll[..65] key_words: iv chunk_number: 0 @@ -147,16 +147,16 @@ const test_cases = [ chunk_number: 0 chaining_value: [u32(0xbb99f549), 0x3b4b2903, 0x436d199e, 0x6eea5980, 0x82ebb968, 0x33cc3c4a, 0x90f4944b, 0x9480e10a] - block_words: [u32(0x00000020), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] - flags: 0x0a + block_words: [u32(0x00000020), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + flags: 0x0a } - words: [u32(0xb06cf0f5), 0xd6f8f23d, 0x0f06389e, 0x20dec0a4, 0x69a20569, 0xdbbb4453, + words: [u32(0xb06cf0f5), 0xd6f8f23d, 0x0f06389e, 0x20dec0a4, 0x69a20569, 0xdbbb4453, 0x09f0bb52, 0xe22c6707, 0x6b530f62, 0x9ac8bfbd, 0xc0aa57b0, 0xdb30223c, 0xd6e52c79, 0x42d84d38, 0xcfb4105f, 0xb42f1bd3] }, // chunk 0 with 127 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: ll[..127] key_words: iv chunk_number: 0 @@ -166,18 +166,18 @@ const test_cases = [ chunk_number: 0 chaining_value: [u32(0xbb99f549), 0x3b4b2903, 0x436d199e, 0x6eea5980, 0x82ebb968, 0x33cc3c4a, 0x90f4944b, 0x9480e10a] - block_words: [u32(0x37383920), 0x33343536, 0x20303132, 0x7778797a, 0x73747576, 0x6f707172, - 0x6b6c6d6e, 0x6768696a, 0x63646566, 0x5a206162, 0x56575859, 0x52535455, 0x4e4f5051, - 0x4a4b4c4d, 0x46474849, 0x00434445] - flags: 0x0a + block_words: [u32(0x37383920), 0x33343536, 0x20303132, 0x7778797a, 0x73747576, + 0x6f707172, 0x6b6c6d6e, 0x6768696a, 0x63646566, 0x5a206162, 0x56575859, 0x52535455, + 0x4e4f5051, 0x4a4b4c4d, 0x46474849, 0x00434445] + flags: 0x0a } - words: [u32(0x589a304d), 0x49f8a607, 0x55a03867, 0xe4fec410, 0x1a6bb2f6, 0x11dfecb3, + words: [u32(0x589a304d), 0x49f8a607, 0x55a03867, 0xe4fec410, 0x1a6bb2f6, 0x11dfecb3, 0xf9989552, 0xb2d18382, 0x9fc6329a, 0xcc93199f, 0x5431cfc5, 0x1f5bddc6, 0x1d039fc5, 0x09af900e, 0x55ce0ba2, 0x9707b1e6] }, // chunk 0 with 128 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: ll[..128] key_words: iv chunk_number: 0 @@ -187,18 +187,18 @@ const test_cases = [ chunk_number: 0 chaining_value: [u32(0xbb99f549), 0x3b4b2903, 0x436d199e, 0x6eea5980, 0x82ebb968, 0x33cc3c4a, 0x90f4944b, 0x9480e10a] - block_words: [u32(0x37383920), 0x33343536, 0x20303132, 0x7778797a, 0x73747576, 0x6f707172, - 0x6b6c6d6e, 0x6768696a, 0x63646566, 0x5a206162, 0x56575859, 0x52535455, 0x4e4f5051, - 0x4a4b4c4d, 0x46474849, 0x42434445] - flags: 0x0a + block_words: [u32(0x37383920), 0x33343536, 0x20303132, 0x7778797a, 0x73747576, + 0x6f707172, 0x6b6c6d6e, 0x6768696a, 0x63646566, 0x5a206162, 0x56575859, 0x52535455, + 0x4e4f5051, 0x4a4b4c4d, 0x46474849, 0x42434445] + flags: 0x0a } - words: [u32(0xd0d12158), 0x8802f9a4, 0x5bd125fb, 0xf2751b9d, 0x8fb2a4d2, 0x27744bfa, + words: [u32(0xd0d12158), 0x8802f9a4, 0x5bd125fb, 0xf2751b9d, 0x8fb2a4d2, 0x27744bfa, 0x6ea287b1, 0xae9cfdb2, 0x8e0c2651, 0xeb2cfa50, 0x84654cbf, 0xb97b6f7b, 0xd2d737a2, 0x46eaad72, 0x4d0235f0, 0xcaf8abb7] }, // chunk 0 with 129 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: ll[..129] key_words: iv chunk_number: 0 @@ -208,16 +208,16 @@ const test_cases = [ chunk_number: 0 chaining_value: [u32(0xccf04979), 0x9cbf983e, 0x9e274997, 0xb88c707b, 0x482b00d8, 0x7aedc034, 0x1efdc297, 0x4de9f7c5] - block_words: [u32(0x00000041), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] - flags: 0x0a + block_words: [u32(0x00000041), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + flags: 0x0a } - words: [u32(0xa896b53e), 0x1a64b264, 0xb08c7ea7, 0x09990e6d, 0x30470999, 0x762e9f2c, + words: [u32(0xa896b53e), 0x1a64b264, 0xb08c7ea7, 0x09990e6d, 0x30470999, 0x762e9f2c, 0xb6c7bf5f, 0x64fd723a, 0x6cb02e2f, 0xa3849bf2, 0xede8ea18, 0x14c88505, 0xfbf2ad67, 0x6bc0a779, 0x8e731b77, 0x643a82c6] }, // chunk 0 with 1023 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: lb[..1023] key_words: iv chunk_number: 0 @@ -227,18 +227,18 @@ const test_cases = [ chunk_number: 0 chaining_value: [u32(0x78fd494b), 0xcd7eeddd, 0x0cb98e9b, 0x7a6a754e, 0x38ff2d32, 0x88c4ca4c, 0xbc7baf18, 0xf7684da9] - block_words: [u32(0x207a7978), 0x33323130, 0x37363534, 0x39203938, 0x35363738, 0x31323334, - 0x797a2030, 0x75767778, 0x71727374, 0x6d6e6f70, 0x696a6b6c, 0x65666768, 0x61626364, - 0x58595a20, 0x54555657, 0x00515253] - flags: 0x0a + block_words: [u32(0x207a7978), 0x33323130, 0x37363534, 0x39203938, 0x35363738, + 0x31323334, 0x797a2030, 0x75767778, 0x71727374, 0x6d6e6f70, 0x696a6b6c, 0x65666768, + 0x61626364, 0x58595a20, 0x54555657, 0x00515253] + flags: 0x0a } - words: [u32(0x96bcc611), 0x8ccfc351, 0x89ec78f7, 0x2f748832, 0xf75ee10a, 0xc739f876, + words: [u32(0x96bcc611), 0x8ccfc351, 0x89ec78f7, 0x2f748832, 0xf75ee10a, 0xc739f876, 0x6adddebb, 0xe28853ab, 0x6983883d, 0x1ca0378d, 0x11f4296c, 0x6638ad9a, 0x0c639f8a, 0xebf03d1f, 0x2c0e3844, 0x0989b826] }, // chunk 0 with 1024 bytes input TestCase{ - input: TestInput{ + input: TestInput{ input_string: lb[..1024] key_words: iv chunk_number: 0 @@ -248,12 +248,12 @@ const test_cases = [ chunk_number: 0 chaining_value: [u32(0x78fd494b), 0xcd7eeddd, 0x0cb98e9b, 0x7a6a754e, 0x38ff2d32, 0x88c4ca4c, 0xbc7baf18, 0xf7684da9] - block_words: [u32(0x207a7978), 0x33323130, 0x37363534, 0x39203938, 0x35363738, 0x31323334, - 0x797a2030, 0x75767778, 0x71727374, 0x6d6e6f70, 0x696a6b6c, 0x65666768, 0x61626364, - 0x58595a20, 0x54555657, 0x50515253] - flags: 0x0a + block_words: [u32(0x207a7978), 0x33323130, 0x37363534, 0x39203938, 0x35363738, + 0x31323334, 0x797a2030, 0x75767778, 0x71727374, 0x6d6e6f70, 0x696a6b6c, 0x65666768, + 0x61626364, 0x58595a20, 0x54555657, 0x50515253] + flags: 0x0a } - words: [u32(0x50dbfcc6), 0x7dd05a7f, 0xa641cc37, 0x11721a4e, 0x6f33eea2, 0x834877a1, + words: [u32(0x50dbfcc6), 0x7dd05a7f, 0xa641cc37, 0x11721a4e, 0x6f33eea2, 0x834877a1, 0x1cb36c9c, 0xf8d78dce, 0xb7539a0e, 0x7c7b57f4, 0xeef982da, 0x82c6c442, 0x8a451e9b, 0xb9cc8414, 0xdef7ad58, 0x65ecfb6b] }, @@ -261,7 +261,7 @@ const test_cases = [ // this is what the second chunk of input sees // after the first 1024 bytes have been consumed TestCase{ - input: TestInput{ + input: TestInput{ input_string: 'O' key_words: iv chunk_number: 1 @@ -273,7 +273,7 @@ const test_cases = [ block_words: [u32(0x0000004f), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] flags: 0x0b } - words: [u32(0xfd795319), 0x4448fd94, 0xa8054dbb, 0x526517ad, 0x7e8e2e4c, 0xf54cf835, + words: [u32(0xfd795319), 0x4448fd94, 0xa8054dbb, 0x526517ad, 0x7e8e2e4c, 0xf54cf835, 0xb498c9a7, 0x341396fa, 0x753298b2, 0xd721328c, 0x4013c5d6, 0xaf64d891, 0x77893790, 0xe486143b, 0x13764172, 0x0cae81d0] }, diff --git a/vlib/crypto/sha3/sha3_state_test.v b/vlib/crypto/sha3/sha3_state_test.v index 3a8841fdb63694..affa21342e9fe7 100644 --- a/vlib/crypto/sha3/sha3_state_test.v +++ b/vlib/crypto/sha3/sha3_state_test.v @@ -313,7 +313,7 @@ const first_24 = [ [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], ] - rho: [ + rho: [ [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, @@ -325,7 +325,7 @@ const first_24 = [ [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], ] - pi: [ + pi: [ [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, @@ -337,7 +337,7 @@ const first_24 = [ [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], ] - chi: [ + chi: [ [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, @@ -349,7 +349,7 @@ const first_24 = [ [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], ] - iota: [ + iota: [ [u64(0x0000000000000001), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], [u64(0x0000000000000000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, @@ -376,7 +376,7 @@ const first_24 = [ [u64(0x0000000000000002), 0x0000000000000002, 0x0000000000000002, 0x0000000000000002, 0x0000000000000002], ] - rho: [ + rho: [ [u64(0x0000000000000001), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000], [u64(0x0000000000000002), 0x0000100000000000, 0x0000000000000400, 0x0000200000000000, @@ -388,7 +388,7 @@ const first_24 = [ [u64(0x0000000010000000), 0x0000000000200000, 0x0000010000000000, 0x0000000000000200, 0x0000000000008000], ] - pi: [ + pi: [ [u64(0x0000000000000001), 0x0000000000000000, 0x0000000000000002, 0x0000000010000000, 0x0000000000000000], [u64(0x0000100000000000), 0x0000000000200000, 0x0000000000000000, 0x0000000000000000, @@ -400,7 +400,7 @@ const first_24 = [ [u64(0x0000000000008000), 0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000004], ] - chi: [ + chi: [ [u64(0x0000000000000001), 0x0000000000000000, 0x0000000000000002, 0x0000000010000400, 0x0000010000000000], [u64(0x0000100000000000), 0x0000200000200000, 0x0000000000000200, 0x0000000000000000, @@ -412,7 +412,7 @@ const first_24 = [ [u64(0x0000100000008000), 0x0000000000200000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000004], ] - iota: [ + iota: [ [u64(0x0000000000008083), 0x0000000000000000, 0x0000000000000002, 0x0000000010000400, 0x0000010000000000], [u64(0x0000100000000000), 0x0000200000200000, 0x0000000000000200, 0x0000000000000000, @@ -439,7 +439,7 @@ const first_24 = [ [u64(0x0000320030018B01), 0x0000220030210B01, 0x0000220030010B01, 0x0000220030010B01, 0x0000220030010B05], ] - rho: [ + rho: [ [u64(0x0000700000600487), 0x0608404000070000, 0x0003800003042030, 0xC100080000E00020, 0xC400018210100001], [u64(0x0000260020031912), 0x18C8900002300102, 0x000C0040063A2400, 0x3191200000600200, @@ -451,7 +451,7 @@ const first_24 = [ [u64(0x01800C5808000190), 0x20030210B0100002, 0x0085808000110018, 0x00220030010B0100, 0x08800C0042C14000], ] - pi: [ + pi: [ [u64(0x0000700000600487), 0x00041840D0000210, 0x0000260020031912, 0x01800C5808000190, 0x80001C0008082181], [u64(0x18C8900002300102), 0x20030210B0100002, 0x001C000808018180, 0x0608404000070000, @@ -463,7 +463,7 @@ const first_24 = [ [u64(0x08800C0042C14000), 0x40000E20040400C0, 0xC400018210100001, 0x0C00002100004184, 0x00000C0040063224], ] - chi: [ + chi: [ [u64(0x0030500001E00486), 0x00049840D3042220, 0x0000A50434031950, 0x01840C580E382590, 0x80859C8008192199], [u64(0x38CA983082300106), 0x11932210B0700202, 0x003E0038090A8080, 0x3E08505001060000, @@ -475,7 +475,7 @@ const first_24 = [ [u64(0x10488C0040D14100), 0x60030C30241400C2, 0xC41C018A18108081, 0x0A08402100074184, 0x06000C00C0063266], ] - iota: [ + iota: [ [u64(0x8030500001E0840C), 0x00049840D3042220, 0x0000A50434031950, 0x01840C580E382590, 0x80859C8008192199], [u64(0x38CA983082300106), 0x11932210B0700202, 0x003E0038090A8080, 0x3E08505001060000, @@ -502,7 +502,7 @@ const first_24 = [ [u64(0x7B161D31F07F2ADA), 0x0B5D9D0194BA6B18, 0xAF4290BBA8BEEB5B, 0x6156D110B0A92A5E, 0x6D5E9D3170A859BC], ] - rho: [ + rho: [ [u64(0x98B0590AC86D7060), 0xA89D64C1884914A1, 0xC4056077EC7769E0, 0x6BA3F832080AA58F, 0x562B065357D66016], [u64(0x53143A64F61DAC4C), 0xED52200D3A712494, 0xFA14EBC0D15E8045, 0x1AE405E91AAA5F07, @@ -514,7 +514,7 @@ const first_24 = [ [u64(0x8F83F956D3D8B0E9), 0xD0194BA6B180B5D9, 0x5F75ADD7A1485DD4, 0x56D110B0A92A5E61, 0xA74C5C2A166F1B57], ] - pi: [ + pi: [ [u64(0x98B0590AC86D7060), 0x8F4F557EAD8875F4, 0x53143A64F61DAC4C, 0x8F83F956D3D8B0E9, 0xC2AD4096064AF601], [u64(0xED52200D3A712494), 0xD0194BA6B180B5D9, 0x81AE1E17FAAE7D90, 0xA89D64C1884914A1, @@ -526,7 +526,7 @@ const first_24 = [ [u64(0xA74C5C2A166F1B57), 0x4050165B031FB563, 0x562B065357D66016, 0xC8B9853F787DBD52, 0x59023409E77BDF0B], ] - chi: [ + chi: [ [u64(0x8838573ACDEBE243), 0x8B4B752FE1FF3DD4, 0x43149AE4F34CAE4E, 0xDD83725682CE30AD, 0x81BC65422742B355], [u64(0xCF57A0C778692494), 0xCAF94E2EA308A3DE, 0xC7FF1E37F2A46DF1, 0xA99560E9A64817A1, @@ -538,7 +538,7 @@ const first_24 = [ [u64(0xC20E7C2F247F1FC3), 0x10401CDB131F356A, 0xD68102405F743186, 0xE8A581BE707CB952, 0x6542BC007F6BD7A3], ] - iota: [ + iota: [ [u64(0x0838573A4DEB6243), 0x8B4B752FE1FF3DD4, 0x43149AE4F34CAE4E, 0xDD83725682CE30AD, 0x81BC65422742B355], [u64(0xCF57A0C778692494), 0xCAF94E2EA308A3DE, 0xC7FF1E37F2A46DF1, 0xA99560E9A64817A1, @@ -565,7 +565,7 @@ const first_24 = [ [u64(0x333EABFB3C2DF09F), 0xE170CB0F0B4DDA36, 0x27B1D5944726DEDA, 0x1995566A682E560E, 0x94726BD4673938FF], ] - rho: [ + rho: [ [u64(0x6E5498081D5398EC), 0x147C77BED27BA1DB, 0x2BC2AEB51FA2A709, 0xED940577DF7AC9A4, 0xA9C1DFE927EB9F42], [u64(0x7569C4E29E8E7BE8), 0x6BABE3F1A0C98942, 0x7172071629D244C8, 0xC1D82B8EC44BF22C, @@ -577,7 +577,7 @@ const first_24 = [ [u64(0xD9E16F84F999F55F), 0xB0F0B4DDA36E170C, 0x936F6D13D8EACA23, 0x95566A682E560E19, 0x9AF519CE4E3FE51C], ] - pi: [ + pi: [ [u64(0x6E5498081D5398EC), 0x78FC39E9AD832C37, 0x7569C4E29E8E7BE8, 0xD9E16F84F999F55F, 0x0C4AC88CFF721E1C], [u64(0x6BABE3F1A0C98942), 0xB0F0B4DDA36E170C, 0x2D0A918B52C601F8, 0x147C77BED27BA1DB, @@ -589,7 +589,7 @@ const first_24 = [ [u64(0x9AF519CE4E3FE51C), 0x657A9E3FB0C21ACA, 0xA9C1DFE927EB9F42, 0x924F83F01920F15B, 0xA6166A768DF88F09], ] - chi: [ + chi: [ [u64(0x6A0084080275AAE4), 0x73FE33C9B1038C36, 0x2728E4F2B7AEEBE8, 0xB8E36F84D019B15F, 0x1C2C849D3FD29C1F], [u64(0xF9A9C3AB00C9C931), 0x70E8B5D763274728, 0xA81EDBEB54D20FE1, 0x1CF47F1F04738AD9, @@ -601,7 +601,7 @@ const first_24 = [ [u64(0x9B5E7A3FEEB7E41E), 0xE57A1A2BB2AE09C2, 0xA1C3CEE067AB9F52, 0x965393CA1B42F1DB, 0x650759748DF5EFE9], ] - iota: [ + iota: [ [u64(0x6A00840802752A6F), 0x73FE33C9B1038C36, 0x2728E4F2B7AEEBE8, 0xB8E36F84D019B15F, 0x1C2C849D3FD29C1F], [u64(0xF9A9C3AB00C9C931), 0x70E8B5D763274728, 0xA81EDBEB54D20FE1, 0x1CF47F1F04738AD9, @@ -628,7 +628,7 @@ const first_24 = [ [u64(0xD473AC4B5BE76578), 0xAA57CC5F07FE88A4, 0xEEEE1894D2FB1E34, 0xD97E45BEAE1270BD, 0x2A2A8F0038A56E8F], ] - rho: [ + rho: [ [u64(0x6AF72396B7508258), 0x4262401730994570, 0x3EFA1B60145A1EF9, 0x7832D170299034CA, 0x8C0E2BDCD0A0736C], [u64(0x2D649AB4740FD079), 0x966251FF33B2659E, 0x155469B870BBB31C, 0xB57A8E7DFE3DC7D7, @@ -640,7 +640,7 @@ const first_24 = [ [u64(0x5ADF3B2BC6A39D62), 0xC5F07FE88A4AA57C, 0x7D8F1A77770C4A69, 0x7E45BEAE1270BDD9, 0xA3C00E295BA3CA8A], ] - pi: [ + pi: [ [u64(0x6AF72396B7508258), 0x315A33315B55DF4A, 0x2D649AB4740FD079, 0x5ADF3B2BC6A39D62, 0xC369AAA36778FD52], [u64(0x966251FF33B2659E), 0xC5F07FE88A4AA57C, 0xFFC5CB397793211B, 0x4262401730994570, @@ -652,7 +652,7 @@ const first_24 = [ [u64(0xA3C00E295BA3CA8A), 0xBE2E45576252C5EC, 0x8C0E2BDCD0A0736C, 0x36C63B56071F9CA0, 0x1248F64C164521A7], ] - chi: [ + chi: [ [u64(0x43E30B967F110A59), 0x0B5033314F45C5CB, 0x2D6CBEB27C4BC219, 0x4FCB128386812F6E, 0xF36BA8B04378F57A], [u64(0xD642C7DF22B4173C), 0x44F0FBF5606F647A, 0xA58159B967A3AD93, 0x02C154103BD90DD0, @@ -664,7 +664,7 @@ const first_24 = [ [u64(0x37C05E405B01AF0C), 0x7A8E099FE258E5D8, 0x5E8F6AD5D330526E, 0x36E67B423707DCB0, 0x1EDCA3008E4023A2], ] - iota: [ + iota: [ [u64(0x43E30B96FF110A58), 0x0B5033314F45C5CB, 0x2D6CBEB27C4BC219, 0x4FCB128386812F6E, 0xF36BA8B04378F57A], [u64(0xD642C7DF22B4173C), 0x44F0FBF5606F647A, 0xA58159B967A3AD93, 0x02C154103BD90DD0, @@ -691,7 +691,7 @@ const first_24 = [ [u64(0x68CFAF16FF3E37A6), 0x2581F8C946677D72, 0x01809B83770FCAC4, 0x69E98A149338441A, 0x41D352562A7FBB08], ] - rho: [ + rho: [ [u64(0x8C67B401B6278C51), 0x67343C2C4D48CA60, 0x17400929ABEA2087, 0x6F52CF009F5A299F, 0x5C9C2939CDCCF3BC], [u64(0x809BD6B367C99A69), 0xFBE7252FFD773F13, 0x39D4FFDBCDDE6ECE, 0x3AFB0299CF12D551, @@ -703,7 +703,7 @@ const first_24 = [ [u64(0xB7F9F1BD33467D78), 0x8C946677D722581F, 0x87E56200C04DC1BB, 0xE98A149338441A69, 0xD4958A9FEEC21074], ] - pi: [ + pi: [ [u64(0x8C67B401B6278C51), 0x51F50BE7DB34C75F, 0x809BD6B367C99A69, 0xB7F9F1BD33467D78, 0xA782B7E1500216B8], [u64(0xFBE7252FFD773F13), 0x8C946677D722581F, 0x48B94E2DBC104B85, 0x67343C2C4D48CA60, @@ -715,7 +715,7 @@ const first_24 = [ [u64(0xD4958A9FEEC21074), 0x6BC3706438742296, 0x5C9C2939CDCCF3BC, 0x01A95C1B12A2AE21, 0x670AC1A90BF4E777], ] - chi: [ + chi: [ [u64(0x8C77F401B4A78C3D), 0x42B502EFF3FCE7DF, 0x179B677365470E31, 0xAF39326EB3D059F6, 0x2727F7E1D04B5609], [u64(0x6F650CBFFC57AB01), 0xA42F64E793328D4F, 0x28BB4A3EA45041A4, 0x213D3C0C7D694B60, @@ -727,7 +727,7 @@ const first_24 = [ [u64(0xA7158BB1A7922376), 0xE7C314743C763A96, 0x14BC213555DCB238, 0x41AD501B5EAA2C21, 0x675AC1B705F06E75], ] - iota: [ + iota: [ [u64(0x0C77F40134A70CBC), 0x42B502EFF3FCE7DF, 0x179B677365470E31, 0xAF39326EB3D059F6, 0x2727F7E1D04B5609], [u64(0x6F650CBFFC57AB01), 0xA42F64E793328D4F, 0x28BB4A3EA45041A4, 0x213D3C0C7D694B60, @@ -754,7 +754,7 @@ const first_24 = [ [u64(0x8482C6E85D230F21), 0xC454592DC6C716C1, 0x372B6C6CAF6D9E6F, 0x623A1D42A41B0076, 0x44CD8CEEFF414222], ] - rho: [ + rho: [ [u64(0x65F398F66F54D239), 0x80F395A2B316E18A, 0xF0F85C21F5A685A3, 0x470EE78D7ABD33D0, 0x6C5A2EE222313A8E], [u64(0x500302415459EE09), 0x9D14A634BE978C54, 0x7F1E87C8AC7687BF, 0x42ECBCCB36326562, @@ -766,7 +766,7 @@ const first_24 = [ [u64(0x42E918790C241637), 0x92DC6C716C1C4545, 0xB6CF379B95B63657, 0x3A1D42A41B007662, 0x633BBFD050889133], ] - pi: [ + pi: [ [u64(0x65F398F66F54D239), 0xFDCBF907B1BAFAFC, 0x500302415459EE09, 0x42E918790C241637, 0x39B6EB430A39926C], [u64(0x9D14A634BE978C54), 0x92DC6C716C1C4545, 0x7FC49823EEDAE736, 0x80F395A2B316E18A, @@ -778,7 +778,7 @@ const first_24 = [ [u64(0x633BBFD050889133), 0xC10A41309A9B8DC8, 0x6C5A2EE222313A8E, 0x5B01F94B3F2E63B1, 0x2090C8801DBFAC2E], ] - chi: [ + chi: [ [u64(0x671990F66E5CB190), 0x9DEBE90720187A5E, 0xD0316755555CEEC9, 0x3DE51A3100441002, 0xAD3BEEC10F39B07F], [u64(0x9815A7FEFC970812), 0x90D8CCBB6E0C2505, 0x5DCD9AA3FCDAD534, 0x0092FD96A29FB9CA, @@ -790,7 +790,7 @@ const first_24 = [ [u64(0xFB3F99D0C00B9D77), 0xC31E4540D69F88C9, 0x439EB6C088B33BB8, 0xDB137CC98C3C8239, 0x22D0D89CAD79A8AE], ] - iota: [ + iota: [ [u64(0xE71990F66E5C3199), 0x9DEBE90720187A5E, 0xD0316755555CEEC9, 0x3DE51A3100441002, 0xAD3BEEC10F39B07F], [u64(0x9815A7FEFC970812), 0x90D8CCBB6E0C2505, 0x5DCD9AA3FCDAD534, 0x0092FD96A29FB9CA, @@ -817,7 +817,7 @@ const first_24 = [ [u64(0x5E4D23B73CCDDA90), 0x666CFF272A59CF2E, 0xE6EC0CA774757C5F, 0x7E61C6AE70FAC5DE, 0x87A262FB51BFEF49], ] - rho: [ + rho: [ [u64(0x188422A1F97D9C42), 0x739D78562765B50B, 0x7D66A81613EA1891, 0xCB7BB384F150CD2E, 0x725A606076914A99], [u64(0xC755D269FEAC82A2), 0xD6C466B6782716DC, 0xCB51A7FC6E71DE99, 0xDE113F65B66B942B, @@ -829,7 +829,7 @@ const first_24 = [ [u64(0xB9E66ED482F2691D), 0xF272A59CF2E666CF, 0x3ABE2FF3760653BA, 0x61C6AE70FAC5DE7E, 0x98BED46FFBD261E8], ] - pi: [ + pi: [ [u64(0x188422A1F97D9C42), 0x81044A97C7FE74FA, 0xC755D269FEAC82A2, 0xB9E66ED482F2691D, 0xF9AF35618C4F8D0B], [u64(0xD6C466B6782716DC), 0xF272A59CF2E666CF, 0x661FA9F04590E37B, 0x739D78562765B50B, @@ -841,7 +841,7 @@ const first_24 = [ [u64(0x98BED46FFBD261E8), 0xE147AB85A591BE9B, 0x725A606076914A99, 0xAB3A000A8A0DAB0E, 0x4377F24F6CFB703E], ] - chi: [ + chi: [ [u64(0x309632A97CED9C62), 0x8C004295C6F66CEA, 0x4735C6634EA08AA2, 0x31A6E97CCAE2238D, 0xF19D1873BE49DCA9], [u64(0x96CCE37672278288), 0x7063B2FD56E7E2E5, 0x479DABB00FD1751D, 0x43976056B7E1952D, @@ -853,7 +853,7 @@ const first_24 = [ [u64(0x5EFE9079FBD06374), 0x93350E8D9591BC9E, 0x525049F077812BC0, 0xE9231008AF083F0C, 0x4577F0CB2CCB722A], ] - iota: [ + iota: [ [u64(0x309632A97CED9CE8), 0x8C004295C6F66CEA, 0x4735C6634EA08AA2, 0x31A6E97CCAE2238D, 0xF19D1873BE49DCA9], [u64(0x96CCE37672278288), 0x7063B2FD56E7E2E5, 0x479DABB00FD1751D, 0x43976056B7E1952D, @@ -880,7 +880,7 @@ const first_24 = [ [u64(0x322DADEEE306149D), 0xFFE6331A8D47CB77, 0x3E8374676F575C29, 0x85F02D9FB7DE48E5, 0x29A4CD5C341D05C3], ] - rho: [ + rho: [ [u64(0x298B147655CC396E), 0xFD7C96C951D644AE, 0xF14705E33C097922, 0x870C1651779F47C7, 0xFAB25DA1E4BFA200], [u64(0x4A657F7251B01630), 0x86B75C39DEE320C1, 0x8FDDFD54BBF237D1, 0xC397BE0D27933DA3, @@ -892,7 +892,7 @@ const first_24 = [ [u64(0x771830A4E9916D6F), 0x31A8D47CB77FFE63, 0xABAE149F41BA33B7, 0xF02D9FB7DE48E585, 0x33570D074170CA69], ] - pi: [ + pi: [ [u64(0x298B147655CC396E), 0xCC249FEE45BB1D52, 0x4A657F7251B01630, 0x771830A4E9916D6F, 0xE6869FB34F4AE509], [u64(0x86B75C39DEE320C1), 0x31A8D47CB77FFE63, 0xA3919D9E8171619F, 0xFD7C96C951D644AE, @@ -904,7 +904,7 @@ const first_24 = [ [u64(0x33570D074170CA69), 0xA302802B025A5285, 0xFAB25DA1E4BFA200, 0x3D505ED4E4A824B4, 0x10CB38BA7E781E21], ] - chi: [ + chi: [ [u64(0x31CBB7F055D0EF48), 0x0C639E6D4DBB1C52, 0x1A235D324D3E8A10, 0x759959B043B15E3E, 0x65869F220F62E42E], [u64(0xE4B25C70DDC208D1), 0x33386E70B4EDFAE2, 0x23B9113DC331409E, 0x9D7E94CA55DB4480, @@ -916,7 +916,7 @@ const first_24 = [ [u64(0xB563450ECB53CAE8), 0x928AC03BB01EB0A4, 0x5B22DD2D64FEC38F, 0xB534D89DF4EE2434, 0x18B378B6EEEC04B1], ] - iota: [ + iota: [ [u64(0x31CBB7F055D0EFC0), 0x0C639E6D4DBB1C52, 0x1A235D324D3E8A10, 0x759959B043B15E3E, 0x65869F220F62E42E], [u64(0xE4B25C70DDC208D1), 0x33386E70B4EDFAE2, 0x23B9113DC331409E, 0x9D7E94CA55DB4480, @@ -943,7 +943,7 @@ const first_24 = [ [u64(0x1C973A92AC8A4817), 0x3B7EBFA7D7C7325B, 0xF2D6A2B103274170, 0x1CC0A7019337A6CB, 0xB147072A8935864E], ] - rho: [ + rho: [ [u64(0x63E198B1F4CD677C), 0xCA694EE5E49B12CE, 0x404B939F61181562, 0x59AD044F66EDE3C5, 0xC18EB9FDB248DEB2], [u64(0xC54DAA5A9472280F), 0x6E634352CE72D231, 0xB661815329712096, 0x0B0AD36D43B2F844, @@ -955,7 +955,7 @@ const first_24 = [ [u64(0x95645240B8E4B9D4), 0xFA7D7C7325B3B7EB, 0x93A0B8796B515881, 0xC0A7019337A6CB1C, 0xC1CAA24D6193AC51], ] - pi: [ + pi: [ [u64(0x63E198B1F4CD677C), 0xF5F70C25BC4D45D6, 0xC54DAA5A9472280F, 0x95645240B8E4B9D4, 0x146AEBB96BCC0569], [u64(0x6E634352CE72D231), 0xFA7D7C7325B3B7EB, 0x53966D31EFCE1B07, 0xCA694EE5E49B12CE, @@ -967,7 +967,7 @@ const first_24 = [ [u64(0xC1CAA24D6193AC51), 0xAEEC8C081644851B, 0xC18EB9FDB248DEB2, 0xE0DB517C863AC07B, 0xBBA9544CE9A38818], ] - chi: [ + chi: [ [u64(0x736D2C1DD5C46F7A), 0xF5F58FA9FC4545D6, 0xE14DA812846248AF, 0xA164D352B18499C4, 0x04CAE3E00B8C4D68], [u64(0x2E734B02CE704378), 0xF17D3C1327115FEF, 0xD3376CB3ECEC921B, 0x82F35EE1F69F9F8E, @@ -979,7 +979,7 @@ const first_24 = [ [u64(0xCDC8E10F6BA13C50), 0xA4E4FC5A17F63732, 0xD31CFCDCD9C4CDB2, 0xAAD25DD9C221C271, 0x50B9404AEDB0BA8E], ] - iota: [ + iota: [ [u64(0x736D2C1D55C4EF73), 0xF5F58FA9FC4545D6, 0xE14DA812846248AF, 0xA164D352B18499C4, 0x04CAE3E00B8C4D68], [u64(0x2E734B02CE704378), 0xF17D3C1327115FEF, 0xD3376CB3ECEC921B, 0x82F35EE1F69F9F8E, @@ -1006,7 +1006,7 @@ const first_24 = [ [u64(0xBF6B6A934F17A89B), 0xD64777C63340A3F9, 0xA1BF7740FD725979, 0xD871D645E69756BA, 0x221ACBD6C9062E45], ] - rho: [ + rho: [ [u64(0x608DB8C02F955A3C), 0x614F099E6151B748, 0x9569E67FF19FEF07, 0xAA591765088F1F97, 0xDCF5C777E09C5CA9], [u64(0x332828128EF30A51), 0x899BF469A6318AE1, 0x40CEE19795512D93, 0xCB3BC6A2803D4FF2, @@ -1018,7 +1018,7 @@ const first_24 = [ [u64(0x9A78BD44DDFB5B54), 0x7C63340A3F9D6477, 0xB92CBCD0DFBBA07E, 0x71D645E69756BAD8, 0xB2F5B2418B914886], ] - pi: [ + pi: [ [u64(0x608DB8C02F955A3C), 0xE0E5BDC50E6E2DAF, 0x332828128EF30A51, 0x9A78BD44DDFB5B54, 0xDEB6562BBBC05622], [u64(0x899BF469A6318AE1), 0x7C63340A3F9D6477, 0x767425A6ED19B108, 0x614F099E6151B748, @@ -1030,7 +1030,7 @@ const first_24 = [ [u64(0xB2F5B2418B914886), 0x9E9AD4EE019764C4, 0xDCF5C777E09C5CA9, 0x81E79665C4FFD5E2, 0x43C2B8AE08C94B88], ] - chi: [ + chi: [ [u64(0x4089B1D26F5D3A2C), 0x61ED7FB0CE6CA6AF, 0x3229E84A8E1704C2, 0x9AF85D4549FB53C7, 0x77BADAFBFD43D602], [u64(0x8409F6C9BE239ECB), 0x3671348A3FBD6487, 0x56F221867A1B3140, 0x667E09DE6B59E740, @@ -1042,7 +1042,7 @@ const first_24 = [ [u64(0x3BE7F6680BB1C847), 0x8298D4E430062494, 0x98A1C2D38194EDA1, 0xE0E096FFE4FF71EA, 0x438298AA08F16A54], ] - iota: [ + iota: [ [u64(0x4089B1D2EF5D3A26), 0x61ED7FB0CE6CA6AF, 0x3229E84A8E1704C2, 0x9AF85D4549FB53C7, 0x77BADAFBFD43D602], [u64(0x8409F6C9BE239ECB), 0x3671348A3FBD6487, 0x56F221867A1B3140, 0x667E09DE6B59E740, @@ -1069,7 +1069,7 @@ const first_24 = [ [u64(0x182B50863A1513F2), 0xA154720A01A2FF21, 0xBB6D643DB0303614, 0xC32C3011D55BAA5F, 0x604E3E443955B1E1], ] - rho: [ + rho: [ [u64(0x669EEDBCEAB088CD), 0xB81144447FA23DEC, 0xA1F5A1245FD5B148, 0x2DC25979DE025698, 0x1A57E2B993A546B6], [u64(0x37660381860B590F), 0xB56CB29CBC383429, 0x235A3C1CF40C3125, 0xFAA18F389FDAE2CF, @@ -1081,7 +1081,7 @@ const first_24 = [ [u64(0x31D0A89F90C15A84), 0x20A01A2FF21A1547, 0x181B0A5DB6B21ED8, 0x2C3011D55BAA5FC3, 0x8F910E556C785813], ] - pi: [ + pi: [ [u64(0x669EEDBCEAB088CD), 0x9277844AB383C496, 0x37660381860B590F, 0x31D0A89F90C15A84, 0xDFE5DBFB186E5FE5], [u64(0xB56CB29CBC383429), 0x20A01A2FF21A1547, 0x06F921753316907B, 0xB81144447FA23DEC, @@ -1093,7 +1093,7 @@ const first_24 = [ [u64(0x8F910E556C785813), 0x92AB80DD9F654EA6, 0x1A57E2B993A546B6, 0xCD43CE263FA48929, 0x3C6F10831069284D], ] - chi: [ + chi: [ [u64(0x648DE89CE8334189), 0x1322254ABE46649E, 0x4E6245814643330B, 0x329A908710CD5A85, 0xD7F5DBEA9ADC49AD], [u64(0x656C92D6905C3423), 0x7AA01437721057C0, 0x02C931B528B695B9, 0xA89186E775F2FB74, @@ -1105,7 +1105,7 @@ const first_24 = [ [u64(0x1EF11C5578706C33), 0xB22B9AF8DF7D5FE7, 0x1ACEC2CDA2B1C6C6, 0x45428A665086AC41, 0x3C6534877469885F], ] - iota: [ + iota: [ [u64(0x648DE89C6833C102), 0x1322254ABE46649E, 0x4E6245814643330B, 0x329A908710CD5A85, 0xD7F5DBEA9ADC49AD], [u64(0x656C92D6905C3423), 0x7AA01437721057C0, 0x02C931B528B695B9, 0xA89186E775F2FB74, @@ -1132,7 +1132,7 @@ const first_24 = [ [u64(0x295E09AF5ABF46DB), 0x85848F02FDB2750F, 0x2D61D737807EEC2E, 0x72ED9F9C724986A9, 0x0BCA217D56A6A2B7], ] - rho: [ + rho: [ [u64(0x2AC82EA25FE1D937), 0x9947CAB5D67E3748, 0x013C1DFB8C8959F0, 0x3E8560F9BEAD724E, 0x7752B439466266C0], [u64(0x6E26D5B12D9801A9), 0x06337A8DFEC39748, 0xDB26ECB89A853B42, 0x59F06F5DCFDD2E6C, @@ -1144,7 +1144,7 @@ const first_24 = [ [u64(0x7AD5FA36D94AF04D), 0xF02FDB2750F85848, 0x3F761716B0EB9BC0, 0xED9F9C724986A972, 0x885F55A9A8ADC2F2], ] - pi: [ + pi: [ [u64(0x2AC82EA25FE1D937), 0xAF299FA3E085628D, 0x6E26D5B12D9801A9, 0x7AD5FA36D94AF04D, 0xBD266CB8BD34CDB1], [u64(0x06337A8DFEC39748), 0xF02FDB2750F85848, 0x246628BE6C06B6DF, 0x9947CAB5D67E3748, @@ -1156,7 +1156,7 @@ const first_24 = [ [u64(0x885F55A9A8ADC2F2), 0xDAAB067382137225, 0x7752B439466266C0, 0x85774BFA999AF87B, 0x9D435F88CB637516], ] - chi: [ + chi: [ [u64(0x7204AB825EC1B907), 0xAE399B7B6C84633D, 0xF42645F1AEB80189, 0x38F5DE3ED1CBF84F, 0xB3606DBE9DB6C471], [u64(0x032132932ED2960E), 0xA8EFB92313AC7E44, 0x41FF2CBC6C803FDD, 0x99CEDBF1933437F0, @@ -1168,7 +1168,7 @@ const first_24 = [ [u64(0x8C6C05A408AFC4BA), 0x8AAD4677926B6A65, 0x77129C370664D096, 0x04754B7B9FAEFF7B, 0x9D52CDC98B2A671A], ] - iota: [ + iota: [ [u64(0xF204AB825EC1B98C), 0xAE399B7B6C84633D, 0xF42645F1AEB80189, 0x38F5DE3ED1CBF84F, 0xB3606DBE9DB6C471], [u64(0x032132932ED2960E), 0xA8EFB92313AC7E44, 0x41FF2CBC6C803FDD, 0x99CEDBF1933437F0, @@ -1195,7 +1195,7 @@ const first_24 = [ [u64(0xC36C9C1E6408152B), 0xC5ADDFCDFECCBBF4, 0x3812058D6AC30107, 0x4B75D2C1F3092EEA, 0xD2525473E78DB68B], ] - rho: [ + rho: [ [u64(0x9E6F361EED8BFB6E), 0xFCE21DFC25206E7D, 0xC26EC368EF921B5C, 0x03755AA93C8744C5, 0xC088BBF21A4F7C2F], [u64(0xA6B936819041D99A), 0xE0487F89210F0F55, 0x0A15BE29C9147846, 0xC9A679366E444EB8, @@ -1207,7 +1207,7 @@ const first_24 = [ [u64(0xF32040A95E1B64E0), 0xFCDFECCBBF4C5ADD, 0x6180839C0902C6B5, 0x75D2C1F3092EEA4B, 0x951CF9E36DA2F494], ] - pi: [ + pi: [ [u64(0x9E6F361EED8BFB6E), 0xD0CA3F8C01DCB73B, 0xA6B936819041D99A, 0xF32040A95E1B64E0, 0xE02757E4E0CD46FB], [u64(0xE0487F89210F0F55), 0xFCDFECCBBF4C5ADD, 0x50B5BAC29C192BB4, 0xFCE21DFC25206E7D, @@ -1219,7 +1219,7 @@ const first_24 = [ [u64(0x951CF9E36DA2F494), 0xFD8838648EEA5E71, 0xC088BBF21A4F7C2F, 0x5C76B045C901C978, 0x8734DD2CE63F2305], ] - chi: [ + chi: [ [u64(0x86EE364E771BEB46), 0xD2EA3CAC414EB63B, 0x03FB7294D1438D9B, 0xF135E2A8960F74E2, 0xA027D4E0E1CD84DA], [u64(0xE658FEAA402F4BD5), 0xF55FD4DDBF081E7D, 0x40B5BB60943D81FE, 0x4C225DEA370A687D, @@ -1231,7 +1231,7 @@ const first_24 = [ [u64(0xF51CB0626DA6F085), 0xD19DF82730EA16B5, 0x908C33B016575E0B, 0x50B4AD11E821C365, 0x8CBCFD35E82D3301], ] - iota: [ + iota: [ [u64(0x06EE364E771B6BCF), 0xD2EA3CAC414EB63B, 0x03FB7294D1438D9B, 0xF135E2A8960F74E2, 0xA027D4E0E1CD84DA], [u64(0xE658FEAA402F4BD5), 0xF55FD4DDBF081E7D, 0x40B5BB60943D81FE, 0x4C225DEA370A687D, @@ -1258,7 +1258,7 @@ const first_24 = [ [u64(0x840450CA3AB91A17), 0xA085188F67F5FC27, 0xE194D3184148B499, 0x21AC4DB9BF3E29F7, 0xFDA41D9DBF32D993], ] - rho: [ + rho: [ [u64(0x0234D5D4300372EA), 0x656AF1ED630DF360, 0x390C8874B2DCA5F0, 0x2EDB8FEBDE0265A2, 0xDDEA9B5677FE93F4], [u64(0x6613AE5B42A802AF), 0x354FFA00EFD5A5E7, 0x924B9DD51B2DF057, 0x245FE32E6E8DBACE, @@ -1270,7 +1270,7 @@ const first_24 = [ [u64(0x51D5C8D0BC202286), 0x88F67F5FC27A0851, 0xA45A4CF0CA698C20, 0xAC4DB9BF3E29F721, 0x07676FCCB664FF69], ] - pi: [ + pi: [ [u64(0x0234D5D4300372EA), 0x1CF42293FADA7FD1, 0x6613AE5B42A802AF, 0x51D5C8D0BC202286, 0x858B80F7FF7C15EB], [u64(0x354FFA00EFD5A5E7), 0x88F67F5FC27A0851, 0x6377A9C114BDF68E, 0x656AF1ED630DF360, @@ -1282,7 +1282,7 @@ const first_24 = [ [u64(0x07676FCCB664FF69), 0x454D6362F40A032E, 0xDDEA9B5677FE93F4, 0xEB5AA23C1712BE65, 0xF2B8057CEDB17851], ] - chi: [ + chi: [ [u64(0x8294D085300922EA), 0x2DFCA2B3CA5EDA71, 0x7E1BA84748E80BEE, 0xC3D4C4C0A4002291, 0x0189C40775351DCB], [u64(0x6D4B92A0AFD4A76B), 0x8CA51C558E7B125F, 0xC777B862349466AE, 0x6CDAF1C7E7DDF7C0, @@ -1294,7 +1294,7 @@ const first_24 = [ [u64(0x322C45CC79B07A6C), 0xC54F3E2EF42A032E, 0xDC8E9AD663EB67F4, 0xCF709311541F6F05, 0xC0C81D74EDB1B855], ] - iota: [ + iota: [ [u64(0x0294D0853009A2E9), 0x2DFCA2B3CA5EDA71, 0x7E1BA84748E80BEE, 0xC3D4C4C0A4002291, 0x0189C40775351DCB], [u64(0x6D4B92A0AFD4A76B), 0x8CA51C558E7B125F, 0xC777B862349466AE, 0x6CDAF1C7E7DDF7C0, @@ -1321,7 +1321,7 @@ const first_24 = [ [u64(0xC850318EECC47560), 0x3F334A6C615E0C22, 0x26F2EE94F69F68F8, 0x350CE753C16B6009, 0x3AB4693678C5B759], ] - rho: [ + rho: [ [u64(0xC1B507796A5F4935), 0x00831ADEEDD754F9, 0xE9D3FDD895F70195, 0xAD929A01EA2679FC, 0x4FECBD8FD85F0AA0], [u64(0x350D813D06EB238D), 0xA24F27B684E6BA2D, 0xEBA97060D5400CC2, 0x982DB362F47F396F, @@ -1333,7 +1333,7 @@ const first_24 = [ [u64(0x776623AB0642818C), 0xA6C615E0C223F334, 0x4FB47C1379774A7B, 0x0CE753C16B600935, 0x1A4D9E316DD64EAD], ] - pi: [ + pi: [ [u64(0xC1B507796A5F4935), 0x662AC2C82A6E7F35, 0x350D813D06EB238D, 0x776623AB0642818C, 0x93541345E66EE5E5], [u64(0xA24F27B684E6BA2D), 0xA6C615E0C223F334, 0xFD558F8036C6D9AC, 0x00831ADEEDD754F9, @@ -1345,7 +1345,7 @@ const first_24 = [ [u64(0x1A4D9E316DD64EAD), 0xF7F0725DD93BA578, 0x4FECBD8FD85F0AA0, 0x84D103158E44644E, 0x38D324E1620E0FAB], ] - chi: [ + chi: [ [u64(0xDD350F71494F48F5), 0x2F3B2AD03FBA7FB4, 0x3525810E4EC2258F, 0x9C4E438B1642898E, 0x95407746B76FA5EE], [u64(0xE37BF573D8AAFE2D), 0xB6EA17C2A22BCB5E, 0xF1D6DFC015C6D99D, 0x10C59ECBC76705E4, @@ -1357,7 +1357,7 @@ const first_24 = [ [u64(0x3807BEB7E976FCA5), 0x7734677D193A2578, 0x87BCB30FE85BD280, 0x84501B4167D1303F, 0x70702CD96A9E15BB], ] - iota: [ + iota: [ [u64(0x5D350F71494FC8F7), 0x2F3B2AD03FBA7FB4, 0x3525810E4EC2258F, 0x9C4E438B1642898E, 0x95407746B76FA5EE], [u64(0xE37BF573D8AAFE2D), 0xB6EA17C2A22BCB5E, 0xF1D6DFC015C6D99D, 0x10C59ECBC76705E4, @@ -1384,7 +1384,7 @@ const first_24 = [ [u64(0x8F561C4E6B59FBF2), 0xC065C5849B15222F, 0x30ED11F66A74D5D7, 0x3301B9B8E5FE3768, 0xC7218E20E8B112EC], ] - rho: [ + rho: [ [u64(0xDB5C25A151BA20DA), 0x74F9799A95200002, 0x9A655EF2B1BE6D15, 0x6EC346344ED2B61D, 0x765ABE69370C4CA5], [u64(0xB1300D6D2FC9C47A), 0x5D74E0D09E407ED6, 0xD4B0156A23163528, 0x233E9564CDA1D105, @@ -1396,7 +1396,7 @@ const first_24 = [ [u64(0x735ACFDF947AB0E2), 0x5849B15222FC065C, 0x3A6AEB987688FB35, 0x01B9B8E5FE376833, 0x63883A2C44BB31C8], ] - pi: [ + pi: [ [u64(0xDB5C25A151BA20DA), 0xC9ECF7854A13954F, 0xB1300D6D2FC9C47A, 0x735ACFDF947AB0E2, 0x4B678CE1D97CABA2], [u64(0x5D74E0D09E407ED6), 0x5849B15222FC065C, 0x55609E9E8564B861, 0x74F9799A95200002, @@ -1408,7 +1408,7 @@ const first_24 = [ [u64(0x63883A2C44BB31C8), 0x8A946CE993F3AB63, 0x765ABE69370C4CA5, 0x542D2B026CAFDC95, 0x4809AEE586E05981], ] - chi: [ + chi: [ [u64(0x7BDF32A8511A21DA), 0x4BC8B925DB11FC4E, 0x91282D2C07D3C3EA, 0xF35ACBBFB66C85CA, 0x7345AE61EB7C80A2], [u64(0x077CC8C29C4070D1), 0x795330566EFD965C, 0x55C1963AD365F063, 0x56B6B30B89E00255, @@ -1420,7 +1420,7 @@ const first_24 = [ [u64(0x67A8FA7CCAFB6FCC), 0x9A956CBBB31FA973, 0x321A2CFBB72874A4, 0x508C1B026DAFDC95, 0xC801EFF982630994], ] - iota: [ + iota: [ [u64(0xFBDF32A8511A215A), 0x4BC8B925DB11FC4E, 0x91282D2C07D3C3EA, 0xF35ACBBFB66C85CA, 0x7345AE61EB7C80A2], [u64(0x077CC8C29C4070D1), 0x795330566EFD965C, 0x55C1963AD365F063, 0x56B6B30B89E00255, @@ -1447,7 +1447,7 @@ const first_24 = [ [u64(0x4D35F2A385507D3E), 0xB0086464FCB4BB81, 0x18872424F8836656, 0x7A1113DD2204CE67, 0xE29CE726CDC81B66], ] - rho: [ + rho: [ [u64(0x595D55D4BBD9C649), 0x1D21B5DE94ADE593, 0x9D525287688127C9, 0x5EC5B2A3B15986B9, 0x247406FD9EC7471F], [u64(0x6752CAEB35DAA992), 0x0B2444D869DE1685, 0x50EE37572351ED84, 0xA4C9AC4C63D791E9, @@ -1459,7 +1459,7 @@ const first_24 = [ [u64(0x1C2A83E9F269AF95), 0x464FCB4BB81B0086, 0x41B32B0C4392127C, 0x1113DD2204CE677A, 0x39C9B37206D9B8A7], ] - pi: [ + pi: [ [u64(0x595D55D4BBD9C649), 0x12E125F668725427, 0x6752CAEB35DAA992, 0x1C2A83E9F269AF95, 0xA2BE937C7B6B2AC8], [u64(0x0B2444D869DE1685), 0x464FCB4BB81B0086, 0x720FB9E69EF3334E, 0x1D21B5DE94ADE593, @@ -1471,7 +1471,7 @@ const first_24 = [ [u64(0x39C9B37206D9B8A7), 0xE229E978B9E7E721, 0x247406FD9EC7471F, 0xCC880B6CDE3EFC45, 0xCC65933D2DD3C29E], ] - chi: [ + chi: [ [u64(0x599D6EF52FD92E4B), 0x8BF1357228F2736E, 0x62E2CAFA15D2E5B2, 0x5CE481E8D139A791, 0xA20E907479EB38FC], [u64(0xBF34C0D029D604E5), 0x66C66703BB4D90A6, 0x720FEDE69EF73316, 0x9330BDDE8CA5F7D9, @@ -1483,7 +1483,7 @@ const first_24 = [ [u64(0x3BE9B37A46DFA823), 0xA627237129EEE7A1, 0x347937F914E65553, 0xCD893F7ADABABC47, 0x9124FF3F29C7839C], ] - iota: [ + iota: [ [u64(0x599D6EF52FD9AE41), 0x8BF1357228F2736E, 0x62E2CAFA15D2E5B2, 0x5CE481E8D139A791, 0xA20E907479EB38FC], [u64(0xBF34C0D029D604E5), 0x66C66703BB4D90A6, 0x720FEDE69EF73316, 0x9330BDDE8CA5F7D9, @@ -1510,7 +1510,7 @@ const first_24 = [ [u64(0x4F3ED2EB0B6C075F), 0xD2F042E0645D48DD, 0x40AE56685955FA2F, 0xB95E5EEB9709133B, 0xE5F39EAE64742CE0], ] - rho: [ + rho: [ [u64(0x1B123FFE4CDEB0C5), 0xBF56DEAC97E64794, 0x036CDF8BB6AFD9B1, 0x7D722A3CD7A1C764, 0x05FC6BB099E38207], [u64(0x37C7F5F60892B267), 0x2CD7042115D2896D, 0x635F36CDA1BB015B, 0x5541F6FCF0FEB427, @@ -1522,7 +1522,7 @@ const first_24 = [ [u64(0x585B603AFA79F697), 0x2E0645D48DDD2F04, 0xAAFD17A0572B342C, 0x5E5EEB9709133BB9, 0xE7AB991D0B38397C], ] - pi: [ + pi: [ [u64(0x1B123FFE4CDEB0C5), 0x69F42632823EDC08, 0x37C7F5F60892B267, 0x585B603AFA79F697, 0x20DEC07A6E76063E], [u64(0x2CD7042115D2896D), 0x2E0645D48DDD2F04, 0x2112137DAF874DD5, 0xBF56DEAC97E64794, @@ -1534,7 +1534,7 @@ const first_24 = [ [u64(0xE7AB991D0B38397C), 0x894CAE3D4921E1D0, 0x05FC6BB099E38207, 0xFFA332A0E9B9FF99, 0x1F415A7B62024275], ] - chi: [ + chi: [ [u64(0x9A1AD63E26DE94C7), 0x689CBC39B01C0CB9, 0x632B5576588A026D, 0x1852407BDA60F6DC, 0xAA96C5DA7975161A], [u64(0x76F7142D14DA9BFC), 0x7A0765A0CD8D0B02, 0x2B12597BAF864E64, 0xAB561F9C9BE28B10, @@ -1546,7 +1546,7 @@ const first_24 = [ [u64(0xC36E991C1A383054), 0x8F4EEFF944E0C2D4, 0x05EC69B93EE6CF97, 0x58A7AC24EC3FFE99, 0x4B60687E620AE2B4], ] - iota: [ + iota: [ [u64(0x1A1AD63EA6DE94CD), 0x689CBC39B01C0CB9, 0x632B5576588A026D, 0x1852407BDA60F6DC, 0xAA96C5DA7975161A], [u64(0x76F7142D14DA9BFC), 0x7A0765A0CD8D0B02, 0x2B12597BAF864E64, 0xAB561F9C9BE28B10, @@ -1573,7 +1573,7 @@ const first_24 = [ [u64(0x555F20265185DEED), 0x197F56C30F5D2C6D, 0x93DDD083755B212E, 0xCE96151EA7821020, 0xDD51D14429B70C0D], ] - rho: [ + rho: [ [u64(0x1A16576E53CBD1D4), 0x50949A068903D694, 0x193EA1356CFA3BA3, 0xEB678A30BD82565E, 0x122A31814C0EAA69], [u64(0x49B8BB6DCEDEEE86), 0x8E7BD282C2C3B3E3, 0xE4438170CE8B6DE4, 0xECF5FF2FAAC0ED0A, @@ -1585,7 +1585,7 @@ const first_24 = [ [u64(0x328C2EF76AAAF901), 0x6C30F5D2C6D197F5, 0xAD909749EEE841BA, 0x96151EA7821020CE, 0x74510A6DC3037754], ] - pi: [ + pi: [ [u64(0x1A16576E53CBD1D4), 0x67CAEBF502F0E918, 0x49B8BB6DCEDEEE86, 0x328C2EF76AAAF901, 0xAA56D633104CEA0C], [u64(0x8E7BD282C2C3B3E3), 0x6C30F5D2C6D197F5, 0xE9B8E5A40BE71F61, 0x50949A068903D694, @@ -1597,7 +1597,7 @@ const first_24 = [ [u64(0x74510A6DC3037754), 0x34874E7FEB150604, 0x122A31814C0EAA69, 0x2A915A659488B7CA, 0xCE734F684C262C91], ] - chi: [ + chi: [ [u64(0x4B96772257E799C4), 0x76C4EBD02ADAC11A, 0x5BBCB96CFEDE2E86, 0x96CF2F872C22D061, 0xA256C27254A4EAA6], [u64(0x8E72C3B2DB12A66F), 0x88F1ABD844D153FD, 0xEDB9F9068BF73FEF, 0x50BCAC8B9823C48C, @@ -1609,7 +1609,7 @@ const first_24 = [ [u64(0xF0388AED43035577), 0x3CB75A7D2F1410E1, 0xB22A75014D2FBB08, 0x6A81CA651589B15E, 0xDBDB6EE4E7362DC1], ] - iota: [ + iota: [ [u64(0xCB967722D7E71945), 0x76C4EBD02ADAC11A, 0x5BBCB96CFEDE2E86, 0x96CF2F872C22D061, 0xA256C27254A4EAA6], [u64(0x8E72C3B2DB12A66F), 0x88F1ABD844D153FD, 0xEDB9F9068BF73FEF, 0x50BCAC8B9823C48C, @@ -1636,7 +1636,7 @@ const first_24 = [ [u64(0x3427BF894A7CD7D0), 0xF8A86F19266B9246, 0x76354065445039AF, 0xAE9EFF011CF633F9, 0x1FC45B80EE49AF66], ] - rho: [ + rho: [ [u64(0x9C525AA4686BC88E), 0x55610D12100C6569, 0x63C4A7520A97FA68, 0x5C03558216040327, 0xBFD3ACA0EDB7D64B], [u64(0x7409D953A3C86483), 0x7C7D3BC8784C34E2, 0x3F58760406AF0767, 0xAA144C995072125A, @@ -1648,7 +1648,7 @@ const first_24 = [ [u64(0x4A53E6BE81A13DFC), 0xF19266B9246F8A86, 0x281CD7BB1AA032A2, 0x9EFF011CF633F9AE, 0x16E03B926BD987F1], ] - pi: [ + pi: [ [u64(0x9C525AA4686BC88E), 0x316D09D142731176, 0x7409D953A3C86483, 0x4A53E6BE81A13DFC, 0x98831DF9D3D0E12C], [u64(0x7C7D3BC8784C34E2), 0xF19266B9246F8A86, 0x301F12F920B55DA1, 0x55610D12100C6569, @@ -1660,7 +1660,7 @@ const first_24 = [ [u64(0x16E03B926BD987F1), 0x448F81E5ECF430BD, 0xBFD3ACA0EDB7D64B, 0x49279DEBBA320DFC, 0x0FB612DEC3910CEB], ] - chi: [ + chi: [ [u64(0x9DD2DA9769DA819F), 0x3329889348E3611E, 0xF129D553258AC6C9, 0x604B94BA87023FFA, 0xB09F4BD1D370E12C], [u64(0x3E2C73CC1842B6EE), 0x79822E30740F8A94, 0x2ADE13FD70A45485, 0x55660CE1001CC5F9, @@ -1672,7 +1672,7 @@ const first_24 = [ [u64(0x76CD1ADA7BDDB391), 0x841DE7CDC8F8BA3D, 0xBFC5AE08ED82CF6B, 0x5C0794EBAA3E4DFD, 0x0B96B2D8CB9B1E79], ] - iota: [ + iota: [ [u64(0x1DD2DA9769DA011F), 0x3329889348E3611E, 0xF129D553258AC6C9, 0x604B94BA87023FFA, 0xB09F4BD1D370E12C], [u64(0x3E2C73CC1842B6EE), 0x79822E30740F8A94, 0x2ADE13FD70A45485, 0x55660CE1001CC5F9, @@ -1699,7 +1699,7 @@ const first_24 = [ [u64(0x33C04CCA19D6216D), 0xC110B1DDAAF328C1, 0xFAC8F8188F895D97, 0x190AC2FBC835DF01, 0x4E9BE4C8A9908C85], ] - rho: [ + rho: [ [u64(0xD63F69D4510E2B36), 0x0374B37F8C43BD07, 0xD6233080EAF76701, 0xAC2BA7574C4FF37F, 0xE24BAE932C15EDCB], [u64(0xFE607DD90B7E846F), 0x27E4DB89E6310E9F, 0x097B77B5668173AF, 0x2624128F483833BC, @@ -1711,7 +1711,7 @@ const first_24 = [ [u64(0x50CEB10B699E0266), 0x1DDAAF328C1C110B, 0xC4AECBFD647C0C47, 0x0AC2FBC835DF0119, 0xF9322A64232153A6], ] - pi: [ + pi: [ [u64(0xD63F69D4510E2B36), 0xC6866B7A708CA693, 0xFE607DD90B7E846F, 0x50CEB10B699E0266, 0x73C6E783478230DD], [u64(0x27E4DB89E6310E9F), 0x1DDAAF328C1C110B, 0x7E027428BA903E3E, 0x0374B37F8C43BD07, @@ -1723,7 +1723,7 @@ const first_24 = [ [u64(0xF9322A64232153A6), 0xFEA3FF403BF9148B, 0xE24BAE932C15EDCB, 0xC61E07B8751EDF8E, 0x46FBB3DC0B8C19AA], ] - chi: [ + chi: [ [u64(0x0E2E49805944DA76), 0x04A77BFA126FC093, 0xFFB9FC9A0F77452E, 0x58C5F58B0B1E40CE, 0x73CCA4AE07DA389D], [u64(0x03C4DFA24420069F), 0x3DDEAD3D8C1401B7, 0x76004EA89B563E26, 0xE1F0B375845FBD47, @@ -1735,7 +1735,7 @@ const first_24 = [ [u64(0xD8F2B86D8510572F), 0xE7FB7B40B7E90583, 0xE249AEB39C95D7DB, 0xC52E05CCF15F628F, 0xCADBAB8C23A95C88], ] - iota: [ + iota: [ [u64(0x0E2E4980D944DA77), 0x04A77BFA126FC093, 0xFFB9FC9A0F77452E, 0x58C5F58B0B1E40CE, 0x73CCA4AE07DA389D], [u64(0x03C4DFA24420069F), 0x3DDEAD3D8C1401B7, 0x76004EA89B563E26, 0xE1F0B375845FBD47, @@ -1762,7 +1762,7 @@ const first_24 = [ [u64(0x5B750C009CAC6AE8), 0x647CCF2DAE553844, 0x61CE1ADE8529EA1C, 0x46A9B1A1E8E35F48, 0x495C1FE13A15614F], ] - rho: [ + rho: [ [u64(0x2205AD7B44E8659B), 0xFC37F7F288C9F018, 0x9C90C30C96DFD616, 0x65FE44E9DC22E12D, 0x015669DA1DC57F9D], [u64(0xEB1BB93FE11994F1), 0x8CD50CB97AE0038B, 0x253654BFEBCB0601, 0x6E3402F73609061E, @@ -1774,7 +1774,7 @@ const first_24 = [ [u64(0x04E5635742DBA860), 0xF2DAE553844647CC, 0x94F50E30E70D6F42, 0xA9B1A1E8E35F4846, 0x07F84E855853D257], ] - pi: [ + pi: [ [u64(0x2205AD7B44E8659B), 0xF397A6216D17FFC6, 0xEB1BB93FE11994F1, 0x04E5635742DBA860, 0x10B87F32EB324016], [u64(0x8CD50CB97AE0038B), 0xF2DAE553844647CC, 0x81B667CE2D612903, 0xFC37F7F288C9F018, @@ -1786,7 +1786,7 @@ const first_24 = [ [u64(0x07F84E855853D257), 0x30DB1BE550CFFC6C, 0x015669DA1DC57F9D, 0x742C7C2A94CF62D0, 0x83B27FB64C292B80], ] - chi: [ + chi: [ [u64(0x71258F79C0E15DEF), 0xFF97A42D7F8E6FD4, 0xEB5AA93F2317D635, 0x05E5635A21D9AE61, 0x940C7922AE3A2614], [u64(0x84D5CCF933C0478A), 0x90FEE5A0A44647C4, 0xA9A6E6260D712103, 0x64BEFEF28CC970F2, @@ -1798,7 +1798,7 @@ const first_24 = [ [u64(0x8B284E056253D057), 0x30935AB7D08FFC64, 0x01F22F1A11A5569F, 0x8C3EE88A1CCF32C8, 0xEAF1FF7B5CECA249], ] - iota: [ + iota: [ [u64(0xF1258F7940E1DDE7), 0xFF97A42D7F8E6FD4, 0xEB5AA93F2317D635, 0x05E5635A21D9AE61, 0x940C7922AE3A2614], [u64(0x84D5CCF933C0478A), 0x90FEE5A0A44647C4, 0xA9A6E6260D712103, 0x64BEFEF28CC970F2, @@ -1828,7 +1828,7 @@ const second_24 = [ [u64(0xFD3CB094025A23B6), 0x4687A426B0860F85, 0x77E6D18B71ACA57E, 0xFA2A161B7CC6C129, 0x9CE501EA3CE551A8], ] - rho: [ + rho: [ [u64(0xAF463273CA4D877D), 0x522354EA1F41927F, 0xA9C8A1AD4DDC657D, 0xEBE9F6B70DBCA156, 0x10A09259F23B29BF], [u64(0x5F3FBF099D8413A1), 0x4099EBBB4F6DD594, 0xB3D56FC1CDBD660B, 0x67D509FE9DB1EE39, @@ -1840,7 +1840,7 @@ const second_24 = [ [u64(0xA012D11DB7E9E584), 0x426B0860F854687A, 0xD652BF3BF368C5B8, 0x2A161B7CC6C129FA, 0x407A8F39546A2739], ] - pi: [ + pi: [ [u64(0xAF463273CA4D877D), 0x49E794C02ABBCDA3, 0x5F3FBF099D8413A1, 0xA012D11DB7E9E584, 0x8A315CF6E73769EE], [u64(0x4099EBBB4F6DD594), 0x426B0860F854687A, 0x41A3F27B2788089C, 0x522354EA1F41927F, @@ -1852,7 +1852,7 @@ const second_24 = [ [u64(0x407A8F39546A2739), 0xDD750C1C7BB06D72, 0x10A09259F23B29BF, 0x74635FD9ED8EC9A4, 0xCC2FA9657F1D1EF8], ] - chi: [ + chi: [ [u64(0xAD0622374A4F8D77), 0xE067354D2F33C8A6, 0xCD7BB2894DA630E0, 0x01C6FA1C77558184, 0x1C336FD4E53FEC56], [u64(0xE8BE6FBB7FFC9524), 0x047E00326875E27A, 0x69B1F01F23C9003E, 0x520B54CA2F431A4B, @@ -1864,7 +1864,7 @@ const second_24 = [ [u64(0x00E346B1514A77B9), 0xDF7D043CABF44D2A, 0x1020D22BD03321A3, 0x26425B3BE58EDBDF, 0xADE3296C67DD0EF8], ] - iota: [ + iota: [ [u64(0xAD0622374A4F8D76), 0xE067354D2F33C8A6, 0xCD7BB2894DA630E0, 0x01C6FA1C77558184, 0x1C336FD4E53FEC56], [u64(0xE8BE6FBB7FFC9524), 0x047E00326875E27A, 0x69B1F01F23C9003E, 0x520B54CA2F431A4B, @@ -1891,7 +1891,7 @@ const second_24 = [ [u64(0x87117E67A39863A7), 0x588F3CEA59265934, 0x97D2EAFD22E135BD, 0xA1B063ED175CCFC1, 0x2A1111BA950F1AE6], ] - rho: [ + rho: [ [u64(0xC7054E4D3E5539BA), 0xB297C6A8A6459375, 0x3BC6F799CDE42165, 0x9E6A90D78B2CCC06, 0x0EBA44956269D8C0], [u64(0x3D5C83ADBE581C43), 0x5797F726E2E5FC8A, 0x8779CA0C666CEC7E, 0x7029C4836F54F1F2, @@ -1903,7 +1903,7 @@ const second_24 = [ [u64(0x3D1CC31D3C388BF3), 0xCEA59265934588F3, 0x709ADECBE9757E91, 0xB063ED175CCFC1A1, 0x446EA543C6B98A84], ] - pi: [ + pi: [ [u64(0xC7054E4D3E5539BA), 0xBA61D872138F3BFA, 0x3D5C83ADBE581C43, 0x3D1CC31D3C388BF3, 0x6B71A9FE4908B334], [u64(0x5797F726E2E5FC8A), 0xCEA59265934588F3, 0xAF94EAF3B684B977, 0xB297C6A8A6459375, @@ -1915,7 +1915,7 @@ const second_24 = [ [u64(0x446EA543C6B98A84), 0x47A0480FAC0DF5B9, 0x0EBA44956269D8C0, 0x8D9439E8EDD1131D, 0xD99289D156C72D0C], ] - chi: [ + chi: [ [u64(0x672D4E0D264D39AE), 0x8B23BDEA5F2F1AFE, 0x7D7792A1F6691ECB, 0x3874CB197C10E7F9, 0x2B633DFC491DD734], [u64(0x1A84BFA087E4FB8B), 0x8E8C9267B1555861, 0x3FD486E0A64AF877, 0xD291F63B2EC58375, @@ -1927,7 +1927,7 @@ const second_24 = [ [u64(0x54FC146106194E84), 0x03244A0A2C4D75B8, 0x8C3A2CC762ED79F4, 0x0F173D486F940319, 0x491ECBD0E4A725C5], ] - iota: [ + iota: [ [u64(0x672D4E0D264DB92C), 0x8B23BDEA5F2F1AFE, 0x7D7792A1F6691ECB, 0x3874CB197C10E7F9, 0x2B633DFC491DD734], [u64(0x1A84BFA087E4FB8B), 0x8E8C9267B1555861, 0x3FD486E0A64AF877, 0xD291F63B2EC58375, @@ -1954,7 +1954,7 @@ const second_24 = [ [u64(0x389CD25711F0FFAC), 0x6F448C3C3BA4C490, 0xE05AEAF17504C8DC, 0x6377FB7E787DB231, 0x257E0DE6F34E94ED], ] - rho: [ + rho: [ [u64(0x7186E7FB6B6A5B56), 0x208F8849D88141C1, 0x5EE1DABDDA77E58B, 0x6E0B065DBEC5DE62, 0x502810E8D538F722], [u64(0x7E2FE47A6DAB3270), 0x43AD2AB1FDFFA006, 0x1F2DF45DEE6B1069, 0x9C38DEE05774D3FE, @@ -1966,7 +1966,7 @@ const second_24 = [ [u64(0xB88F87FD61C4E692), 0xC3C3BA4C4906F448, 0x82646E702D7578BA, 0x77FB7E787DB23163, 0x8379BCD3A53B495F], ] - pi: [ + pi: [ [u64(0x7186E7FB6B6A5B56), 0xC47C6E1BD2697F6B, 0x7E2FE47A6DAB3270, 0xB88F87FD61C4E692, 0x498DD4D8869CDFAA], [u64(0x43AD2AB1FDFFA006), 0xC3C3BA4C4906F448, 0x274EE5B35CACD66A, 0x208F8849D88141C1, @@ -1978,7 +1978,7 @@ const second_24 = [ [u64(0x8379BCD3A53B495F), 0x94BA227907A53935, 0x502810E8D538F722, 0xAC5422558F00AB61, 0x65F819812165E5B0], ] - chi: [ + chi: [ [u64(0x41C6A2F1696A0436), 0xD85C2EAA40187EE8, 0xEEAFE43E4DF93B64, 0xA7AFF3E947AEF6BA, 0xCBE99AF8AB9C8FB2], [u64(0xCCAE2AD5FCEAA094), 0x43DBBE0C4C06E63C, 0x4235BBBB518CF60B, 0x201D89C9C8010E51, @@ -1990,7 +1990,7 @@ const second_24 = [ [u64(0x8150B4D331AEE95F), 0x9739B23D0EA3B935, 0x51681169C53C3328, 0xAC542A551701AA20, 0x71E839816106C5F0], ] - iota: [ + iota: [ [u64(0xC1C6A2F1696A84BC), 0xD85C2EAA40187EE8, 0xEEAFE43E4DF93B64, 0xA7AFF3E947AEF6BA, 0xCBE99AF8AB9C8FB2], [u64(0xCCAE2AD5FCEAA094), 0x43DBBE0C4C06E63C, 0x4235BBBB518CF60B, 0x201D89C9C8010E51, @@ -2017,7 +2017,7 @@ const second_24 = [ [u64(0x88813A03BFB58D18), 0x9EE83CED80B8DD72, 0x58B99FB94B27576F, 0xA585A485991ACE67, 0x7839B751EF1DA1B7], ] - rho: [ + rho: [ [u64(0x73F6AA5E1760A08F), 0xE125ADB6A6C26053, 0xE4FF64899F98FABA, 0x49A5122B3FF68C73, 0x495F565AAE05E766], [u64(0x9DB2D080DEE43202), 0xE5FA9C1ACFC99DF9, 0x0BE4BB08513E7B01, 0x36F8944D596B8B73, @@ -2029,7 +2029,7 @@ const second_24 = [ [u64(0x1DFDAC68C44409D0), 0xCED80B8DD729EE83, 0x93ABB7AC5CCFDCA5, 0x85A485991ACE67A5, 0x6DD47BC7686DDE0E], ] - pi: [ + pi: [ [u64(0x73F6AA5E1760A08F), 0xABCABE621767D2B9, 0x9DB2D080DEE43202, 0x1DFDAC68C44409D0, 0x66AD5161285310D5], [u64(0xE5FA9C1ACFC99DF9), 0xCED80B8DD729EE83, 0x12992A674E3C6DAD, 0xE125ADB6A6C26053, @@ -2041,7 +2041,7 @@ const second_24 = [ [u64(0x6DD47BC7686DDE0E), 0xCD37BD3FAD736CA2, 0x495F565AAE05E766, 0x9BDFF6EB52ADA15D, 0xEDB189030F9C4CDF], ] - chi: [ + chi: [ [u64(0x71F7E99B3752E08F), 0x8BEDDA621FF7C281, 0xF4B241905F243240, 0x173DBE60957812D0, 0xF6A464C12C158C74], [u64(0xE53ABC28D9CD8DFC), 0xDCD89BC9974AEFC2, 0x96BD2EEF54320B2C, 0xC52FA9E420C2E4F1, @@ -2053,7 +2053,7 @@ const second_24 = [ [u64(0xE9DC6FC7A0E4C37E), 0x8927BCB26D7B40A0, 0x4B567C3DAE1DAACB, 0x7BDFF77D702FC15E, 0xECA30B1FDD142CDD], ] - iota: [ + iota: [ [u64(0xF1F7E99BB752608F), 0x8BEDDA621FF7C281, 0xF4B241905F243240, 0x173DBE60957812D0, 0xF6A464C12C158C74], [u64(0xE53ABC28D9CD8DFC), 0xDCD89BC9974AEFC2, 0x96BD2EEF54320B2C, 0xC52FA9E420C2E4F1, @@ -2080,7 +2080,7 @@ const second_24 = [ [u64(0xEED340302987F038), 0x8E289345E41873E6, 0x4C5953CA277E998D, 0x7CD0D88AF94CF218, 0xEBAC24E854771F9B], ] - rho: [ + rho: [ [u64(0x4EAA7FD8FE767F77), 0x6D3DD7934B04C215, 0x5F7EBE98B0016DC2, 0xB81A5150C05047B8, 0xCA0994C64E3127E7], [u64(0x4E41CE540459ED68), 0xB948A1EC2C0CB4CA, 0x9DD7B63F4DC19152, 0x73F720E6BE5CDF64, @@ -2092,7 +2092,7 @@ const second_24 = [ [u64(0x814C3F81C7769A01), 0x345E41873E68E289, 0xBF4CC6A62CA9E513, 0xD0D88AF94CF2187C, 0x093A151DC7E6FAEB], ] - pi: [ + pi: [ [u64(0x4EAA7FD8FE767F77), 0xA9FE04BF098CCEDD, 0x4E41CE540459ED68, 0x814C3F81C7769A01, 0x1708E10EA8CAFECA], [u64(0xB948A1EC2C0CB4CA), 0x345E41873E68E289, 0xB9B4F0744C0BAA27, 0x6D3DD7934B04C215, @@ -2104,7 +2104,7 @@ const second_24 = [ [u64(0x093A151DC7E6FAEB), 0x7094B41AD6CFE597, 0xCA0994C64E3127E7, 0x8F649E1DFBC840AF, 0xA6B2657089606C72], ] - chi: [ + chi: [ [u64(0x0E2F6BDAFCC53546), 0xE2DEBAA7898DC39F, 0x0C4AC8DCB62DA9F8, 0x118E1FADC3B78B43, 0xA348A50C88EB5EC8], [u64(0xAD5AA01CF54C154A), 0x14DF41E1303470AD, 0x3974F8050089B26F, 0x0F159613EB22C290, @@ -2116,7 +2116,7 @@ const second_24 = [ [u64(0xB87A9539C7EE7A63), 0x6494F51AE0AFC597, 0x7BBDA4E6063325E0, 0xE3555E0FF3C800BB, 0xEEA76790DF646D67], ] - iota: [ + iota: [ [u64(0x0E2F6BDAFCC5B5CD), 0xE2DEBAA7898DC39F, 0x0C4AC8DCB62DA9F8, 0x118E1FADC3B78B43, 0xA348A50C88EB5EC8], [u64(0xAD5AA01CF54C154A), 0x14DF41E1303470AD, 0x3974F8050089B26F, 0x0F159613EB22C290, @@ -2143,7 +2143,7 @@ const second_24 = [ [u64(0x62A1C9EFEE20D762), 0xBE4FA9CCC9616896, 0xA166F8302FFD88E1, 0x398E02D9DA06ADBA, 0x347C3B46F6AAC066], ] - rho: [ + rho: [ [u64(0x2D58AC3E9181F74E), 0x4C9811CC1A97D43E, 0x79E879C6DB4F5BD9, 0xE7938065F3B0935D, 0x8BA396BC712E00FD], [u64(0x64278CF8A8632704), 0x9F6658B962781914, 0xF6799687D0D29E98, 0xE88B120B9E0E694B, @@ -2155,7 +2155,7 @@ const second_24 = [ [u64(0x7F7106BB13150E4F), 0x9CCC9616896BE4FA, 0xFEC470D0B37C1817, 0x8E02D9DA06ADBA39, 0x0ED1BDAAB0198D1F], ] - pi: [ + pi: [ [u64(0x2D58AC3E9181F74E), 0x6CCCE4B59A90B473, 0x64278CF8A8632704, 0x7F7106BB13150E4F, 0xFC13A73E996A5F86], [u64(0x9F6658B962781914), 0x9CCC9616896BE4FA, 0xF5409C6CED995C99, 0x4C9811CC1A97D43E, @@ -2167,7 +2167,7 @@ const second_24 = [ [u64(0x0ED1BDAAB0198D1F), 0x5028F94EECD7BCAE, 0x8BA396BC712E00FD, 0xD51ACB495AEFC57C, 0x511BD352FF8F25D7], ] - chi: [ + chi: [ [u64(0x6D500F3A1D8211C4), 0x0DEC8D75C894AF72, 0x6EA0CE6BAA25A524, 0xCD1080B8D35504CF, 0x6653F7BE094A4787], [u64(0x1FD3187920701911), 0x1CCF941F8D6BC4F8, 0xF1400D64E9B86491, 0x449819F436BB9418, @@ -2179,7 +2179,7 @@ const second_24 = [ [u64(0x9CF7ED2BD261850F), 0xC028EB4CEDBCFC26, 0x1AE386B834B65864, 0xD592DA0D526D154C, 0x51BFD312DD1B05EF], ] - iota: [ + iota: [ [u64(0x6D500F3A9D8211C5), 0x0DEC8D75C894AF72, 0x6EA0CE6BAA25A524, 0xCD1080B8D35504CF, 0x6653F7BE094A4787], [u64(0x1FD3187920701911), 0x1CCF941F8D6BC4F8, 0xF1400D64E9B86491, 0x449819F436BB9418, @@ -2206,7 +2206,7 @@ const second_24 = [ [u64(0x70263F5ADB7DA2B6), 0x2CF9393DE4A0DB9F, 0xF63254C93DAA7FDD, 0x3943087C5B7132F5, 0xBD6E0163D4072256], ] - rho: [ + rho: [ [u64(0x09A6F3E43B163F06), 0xE0081B1691A71AB6, 0x52B195A8658C5F38, 0x82541953CCF8CCEB, 0x2D82BF79A5100A94], [u64(0x943C9B68ED72E4A0), 0x2AFB94902C1D2DBA, 0x3562A6FDC43F4292, 0x5FEB222AA9872C0E, @@ -2218,7 +2218,7 @@ const second_24 = [ [u64(0xD6DBED15B38131FA), 0x93DE4A0DB9F2CF93, 0xD53FEEFB192A649E, 0x43087C5B7132F539, 0x8058F501C895AF5B], ] - pi: [ + pi: [ [u64(0x09A6F3E43B163F06), 0x6FE028FDD5FDFED2, 0x943C9B68ED72E4A0, 0xD6DBED15B38131FA, 0xF6291B70EAE3F500], [u64(0x2AFB94902C1D2DBA), 0x93DE4A0DB9F2CF93, 0x991899CB14DB3DBD, 0xE0081B1691A71AB6, @@ -2230,7 +2230,7 @@ const second_24 = [ [u64(0x8058F501C895AF5B), 0xCE2C1A24E517D3E3, 0x2D82BF79A5100A94, 0x4DB7F980BF421833, 0xC1E9DED0D65726DC], ] - chi: [ + chi: [ [u64(0x08A291C06AF6AD06), 0x2FC1BD5D91F1EEFA, 0xD45ADB6CAF5624E2, 0xC3B949FCF79971FA, 0xA60AF712F3C3F196], [u64(0x6CBB9810AC1F24FF), 0x9E94680F31F1EF95, 0x9A18ADDA35C919AC, 0x22991B148BA7A6D3, @@ -2242,7 +2242,7 @@ const second_24 = [ [u64(0xA201F111CC9CAFE3), 0x5E325824CD15D2E2, 0x2482BFFAB5991389, 0x6DB7EB82BF641237, 0xC0FDDE59D24B2495], ] - iota: [ + iota: [ [u64(0x88A291C0EAF62D87), 0x2FC1BD5D91F1EEFA, 0xD45ADB6CAF5624E2, 0xC3B949FCF79971FA, 0xA60AF712F3C3F196], [u64(0x6CBB9810AC1F24FF), 0x9E94680F31F1EF95, 0x9A18ADDA35C919AC, 0x22991B148BA7A6D3, @@ -2269,7 +2269,7 @@ const second_24 = [ [u64(0x90682F2EB0F42E07), 0x6C5B861BB17D5306, 0x16EB61C5C9F1926D, 0x5FDE35BDC30C93D3, 0xF2940066AE23A571], ] - rho: [ + rho: [ [u64(0x66BD3845B1554BD6), 0xA5288ABC1DE14D8C, 0xD22B974FA7AA1599, 0x742F565B4DC0F358, 0x7A5EA1825F1D2055], [u64(0xFA73E998E87F380C), 0x1576C8F1604D3E9D, 0x6B041BB7A685562E, 0xE3C546636EF90A70, @@ -2281,7 +2281,7 @@ const second_24 = [ [u64(0x7587A1703C834179), 0x61BB17D53066C5B8, 0xF8C9368B75B0E2E4, 0xDE35BDC30C93D35F, 0x0019AB88E95C7CA5], ] - pi: [ + pi: [ [u64(0x66BD3845B1554BD6), 0x890DAC290AE9DD8A, 0xFA73E998E87F380C, 0x7587A1703C834179, 0xDE85D79B1911CDC0], [u64(0x1576C8F1604D3E9D), 0x61BB17D53066C5B8, 0x6F5439560B83F808, 0xA5288ABC1DE14D8C, @@ -2293,7 +2293,7 @@ const second_24 = [ [u64(0x0019AB88E95C7CA5), 0x6CF3DEA64E53F8B6, 0x7A5EA1825F1D2055, 0x3A5C264CBBD23342, 0x5B79BD14EBBB4F46], ] - chi: [ + chi: [ [u64(0x843D084B31E54AB6), 0x1B0D2C238D61CD8B, 0xFA79AF11780B3C5D, 0x3F83B0739E87535B, 0xC685C59B7921AD00], [u64(0x1913C8B16F0D3E9F), 0x407F57F57837CFD8, 0xB775B0140702AB06, 0xB5728EFC5DB9EC0C, @@ -2305,7 +2305,7 @@ const second_24 = [ [u64(0x115B6B38A95448AC), 0x0C41CD727E55F886, 0x7F5AB1C45C9DE055, 0xBA742CC0BAB23FC6, 0x7A339534EF7D4D69], ] - iota: [ + iota: [ [u64(0x043D084B31E5CABF), 0x1B0D2C238D61CD8B, 0xFA79AF11780B3C5D, 0x3F83B0739E87535B, 0xC685C59B7921AD00], [u64(0x1913C8B16F0D3E9F), 0x407F57F57837CFD8, 0xB775B0140702AB06, 0xB5728EFC5DB9EC0C, @@ -2332,7 +2332,7 @@ const second_24 = [ [u64(0x99AA96198B6FC68C), 0x84B030535C6E76A6, 0xF7AB4CE57EA66E75, 0x3285D1E19889B1E6, 0xF2C26815CD46C349], ] - rho: [ + rho: [ [u64(0xD7373C9F5FBAA29A), 0x33EA5AEC80718F7E, 0x4B9CDE28B2A2A3C1, 0xB076FDD913094FE1, 0xC53C5DFB1494563F], [u64(0x6B837705A1C72FA4), 0x966956CAD24C6C7D, 0x9F0C9EE3B0092E6E, 0xE8A833341FB9FC4A, @@ -2344,7 +2344,7 @@ const second_24 = [ [u64(0xCC5B7E3464CD54B0), 0x0535C6E76A684B03, 0x53373AFBD5A672BF, 0x85D1E19889B1E632, 0x9A057351B0D27CB0], ] - pi: [ + pi: [ [u64(0xD7373C9F5FBAA29A), 0x1ED11E5B2F480921, 0x6B837705A1C72FA4, 0xCC5B7E3464CD54B0, 0x8AB035B9B41ADE03], [u64(0x966956CAD24C6C7D), 0x0535C6E76A684B03, 0x90F0A68DDFB23B01, 0x33EA5AEC80718F7E, @@ -2356,7 +2356,7 @@ const second_24 = [ [u64(0x9A057351B0D27CB0), 0x25786A5BC8EBB862, 0xC53C5DFB1494563F, 0x462CEA8EF4AF0580, 0x3CFC7F22A9A4E9EB], ] - chi: [ + chi: [ [u64(0xB7333CAF7A28A01A), 0x54590653BFCAA9E1, 0x058F3F75A1C3AF7A, 0x405FFA3754C574B0, 0x8A900F3864BAEE82], [u64(0x1C0B97C0526D7D7F), 0xA515E7F367711709, 0x91B12705D7037F21, 0x53995AE484B74FFF, @@ -2368,7 +2368,7 @@ const second_24 = [ [u64(0x9A4D3111309630D5), 0x245CAAFF88CBFA60, 0x554CDD734AA4463E, 0x758CEA46749F8ECE, 0x4DB33F64AAE0E997], ] - iota: [ + iota: [ [u64(0xB7333CAF7A28A090), 0x54590653BFCAA9E1, 0x058F3F75A1C3AF7A, 0x405FFA3754C574B0, 0x8A900F3864BAEE82], [u64(0x1C0B97C0526D7D7F), 0xA515E7F367711709, 0x91B12705D7037F21, 0x53995AE484B74FFF, @@ -2395,7 +2395,7 @@ const second_24 = [ [u64(0xB56104C9B4E52E2A), 0x0B709F270CB8E49F, 0x7A60E8ABCED758C1, 0x5AA0DF9EF0EC9031, 0x629F0ABC2E93F768], ] - rho: [ + rho: [ [u64(0x3402B648D170706F), 0x492791ED7688CB41, 0x35F5AC9054DBFC2C, 0x3B489F86DCE1A1FF, 0x177F3F88F9F42686], [u64(0x63FCE53CFB3D2999), 0x2FEBA08E002AD488, 0x13096FE3C25A48F1, 0x94C99FCD97F75568, @@ -2407,7 +2407,7 @@ const second_24 = [ [u64(0x4DA7297155AB0826), 0xF270CB8E49F0B709, 0x6BAC60BD307455E7, 0xA0DF9EF0EC90315A, 0xC2AF0BA4FDDA18A7], ] - pi: [ + pi: [ [u64(0x3402B648D170706F), 0x6EBC2AC680D7A623, 0x63FCE53CFB3D2999, 0x4DA7297155AB0826, 0x4CB480E957DB77A8], [u64(0x2FEBA08E002AD488), 0xF270CB8E49F0B709, 0x05ACD9DA245CDB42, 0x492791ED7688CB41, @@ -2419,7 +2419,7 @@ const second_24 = [ [u64(0xC2AF0BA4FDDA18A7), 0x232CA3BBACEE6047, 0x177F3F88F9F42686, 0x81D45C50D263C864, 0xFBA990802AD2BA35], ] - chi: [ + chi: [ [u64(0xB412E10883F0500C), 0x6B390ED694DCEE07, 0x7BECE7197BBF0905, 0x5FAF4773D5F90896, 0x2690E0D1778B332F], [u64(0x4FE3A8BA2D08D59C), 0x7278D8C3CAD4B649, 0xA5EB55CA6C5CDA40, 0x61D701E14B29ED4F, @@ -2431,7 +2431,7 @@ const second_24 = [ [u64(0xC9460B22FDD09C27), 0xB36C62B3E5CE714F, 0x137F274AFDB4F4C4, 0x81D4CCDCF0630B25, 0xEAA391842AF6BA75], ] - iota: [ + iota: [ [u64(0xB412E10883F05084), 0x6B390ED694DCEE07, 0x7BECE7197BBF0905, 0x5FAF4773D5F90896, 0x2690E0D1778B332F], [u64(0x4FE3A8BA2D08D59C), 0x7278D8C3CAD4B649, 0xA5EB55CA6C5CDA40, 0x61D701E14B29ED4F, @@ -2458,7 +2458,7 @@ const second_24 = [ [u64(0xE56469BA557F2454), 0x9F4E002B4D61C93C, 0x3F5D45D2551B4CB7, 0xADF6AE4458CCB356, 0xC681F31C82590206], ] - rho: [ + rho: [ [u64(0x4EEB87A102C2733D), 0x5EECDBE91C0687F1, 0x08AC0D87D46955E4, 0x96565F4AAC43B4A9, 0x19E3DAE4425B71A6], [u64(0x964E31B1E8FEB5F5), 0x3392FF6BC68A113A, 0xBF96A2D4AD549884, 0xCC453CA27630724B, @@ -2470,7 +2470,7 @@ const second_24 = [ [u64(0xD2ABF922A72B234D), 0x02B4D61C93C9F4E0, 0x8DA65B9FAEA2E92A, 0xF6AE4458CCB356AD, 0x7CC720964081B1A0], ] - pi: [ + pi: [ [u64(0x4EEB87A102C2733D), 0x9CA3691C97D80967, 0x964E31B1E8FEB5F5, 0xD2ABF922A72B234D, 0x968F0D3C69C3CA5C], [u64(0x3392FF6BC68A113A), 0x02B4D61C93C9F4E0, 0x4693A45243166431, 0x5EECDBE91C0687F1, @@ -2482,7 +2482,7 @@ const second_24 = [ [u64(0x7CC720964081B1A0), 0x8F18D451C4F7394B, 0x19E3DAE4425B71A6, 0x239786B76A7C5CB4, 0x0438BA951B60787A], ] - chi: [ + chi: [ [u64(0x06E687211BC6973C), 0x94AB609FD3F80863, 0x166A6B31C43FBF39, 0x73B9D936067B3B49, 0x9709173C41410A76], [u64(0xA3921E4F84B31004), 0xC6F5E63CB1D9D6EB, 0x321BA05A83343030, 0x1EAC82EA1EA7A792, @@ -2494,7 +2494,7 @@ const second_24 = [ [u64(0x4DD758DC8489B1A2), 0x8D0C4251C4F6CDCB, 0x59725EA6415B31A6, 0x2FD3847E7278D804, 0x0C08FA569D50597B], ] - iota: [ + iota: [ [u64(0x06E687219BC61735), 0x94AB609FD3F80863, 0x166A6B31C43FBF39, 0x73B9D936067B3B49, 0x9709173C41410A76], [u64(0xA3921E4F84B31004), 0xC6F5E63CB1D9D6EB, 0x321BA05A83343030, 0x1EAC82EA1EA7A792, @@ -2521,7 +2521,7 @@ const second_24 = [ [u64(0x35AD8B1729CCE534), 0xF576919A69B3995D, 0x21088D6DEC1E6530, 0x57A957B5DF3D8C92, 0x7472299D30150DED], ] - rho: [ + rho: [ [u64(0x17E5839A28D8029E), 0x0E61DC885A864246, 0x3B4B7C53B90D5490, 0xCA5DC4C575BB1B6A, 0x4E1FC97C7F761828], [u64(0x545D83FA69EED927), 0xDAA7CCF49398E019, 0x9DFFA0CDC1329CEE, 0x7B60A2E20BAB15DC, @@ -2533,7 +2533,7 @@ const second_24 = [ [u64(0xB94E6729A1AD6C58), 0x19A69B3995DF5769, 0x0F3298108446B6F6, 0xA957B5DF3D8C9257, 0x8A674C05437B5D1C], ] - pi: [ + pi: [ [u64(0x17E5839A28D8029E), 0xAB4DD8CA05358C41, 0x545D83FA69EED927, 0xB94E6729A1AD6C58, 0x60124B03F17AD918], [u64(0xDAA7CCF49398E019), 0x19A69B3995DF5769, 0x293FC28310F7012B, 0x0E61DC885A864246, @@ -2545,7 +2545,7 @@ const second_24 = [ [u64(0x8A674C05437B5D1C), 0x0553D93ADCADE433, 0x4E1FC97C7F761828, 0x2FC4A0E0FEAD6659, 0x575268B4D8D1055E], ] - chi: [ + chi: [ [u64(0x32BDB29904DD013C), 0x8904BC882D358CD1, 0xD65DA28284EE7FB3, 0x28D0476C209DF0F0, 0x6922DB03F53E69E8], [u64(0xD007CCF81390F00D), 0x59861999977D5625, 0x286B5606107B116B, 0x0C6182B878CE4246, @@ -2557,7 +2557,7 @@ const second_24 = [ [u64(0x42650061D07BBD1D), 0x15F1DA0B4C67B71B, 0x673D897D6F671820, 0x29E53860A4AF645F, 0xC1DE6860D0D10358], ] - iota: [ + iota: [ [u64(0x32BDB29984DD0136), 0x8904BC882D358CD1, 0xD65DA28284EE7FB3, 0x28D0476C209DF0F0, 0x6922DB03F53E69E8], [u64(0xD007CCF81390F00D), 0x59861999977D5625, 0x286B5606107B116B, 0x0C6182B878CE4246, @@ -2584,7 +2584,7 @@ const second_24 = [ [u64(0x9C13694F5CEFA35E), 0xCB87B325C0F3A958, 0xB94BE053E3F30663, 0xF793514E283B7A1C, 0x1FA8014E5C451D1B], ] - rho: [ + rho: [ [u64(0xDCBFAC140A1F1210), 0x3F79FF76706A205A, 0xC2FDE078516364A9, 0xBFC7AD8DA4B3C35C, 0x1639EFF1EB3A1C83], [u64(0xA80CF6752F5F54CA), 0x20C4DDD87AE5B134, 0xAB871251112C0EB1, 0x2305D10C06AF5F9E, @@ -2596,7 +2596,7 @@ const second_24 = [ [u64(0x7AE77D1AF4E09B4A), 0x325C0F3A958CB87B, 0xF98331DCA5F029F1, 0x93514E283B7A1CF7, 0x005397114746C7EA], ] - pi: [ + pi: [ [u64(0xDCBFAC140A1F1210), 0x78DCFA364FB47062, 0xA80CF6752F5F54CA, 0x7AE77D1AF4E09B4A, 0xECA8D88020AE1B47], [u64(0x20C4DDD87AE5B134), 0x325C0F3A958CB87B, 0x290E8A2495E581EA, 0x3F79FF76706A205A, @@ -2608,7 +2608,7 @@ const second_24 = [ [u64(0x005397114746C7EA), 0xD1B995E87E6B120A, 0x1639EFF1EB3A1C83, 0xBB0F72027664D631, 0xCB0AE341B21071BA], ] - chi: [ + chi: [ [u64(0x9096AE138B1F5812), 0xB87D1A760FD734E2, 0x7A1CF3362D4724CF, 0xFA617D1BF5E495EB, 0xB5A9C8CC044E1AC7], [u64(0xA1D6B9F878FB944D), 0x135C1E3E9300A36D, 0x284FC20CACA78DF8, 0x3B29DE529E6BB11A, @@ -2620,7 +2620,7 @@ const second_24 = [ [u64(0x2013C6D937A666CE), 0xD3B990E0EE639A13, 0x173BE7F17B9A9DA3, 0xBE17F066766EF621, 0xC918C2727B01158A], ] - iota: [ + iota: [ [u64(0x9096AE130B1FD899), 0xB87D1A760FD734E2, 0x7A1CF3362D4724CF, 0xFA617D1BF5E495EB, 0xB5A9C8CC044E1AC7], [u64(0xA1D6B9F878FB944D), 0x135C1E3E9300A36D, 0x284FC20CACA78DF8, 0x3B29DE529E6BB11A, @@ -2647,7 +2647,7 @@ const second_24 = [ [u64(0x2BB6007FBE762A66), 0xD81C564667B3D6BB, 0x1C9E2157F24AD10B, 0xB5B236C0FFBEBA89, 0xC2BD04D4F2D15922], ] - rho: [ + rho: [ [u64(0x016C019B847C353E), 0x0B4D9452987B5FE8, 0x5F32E5F511264B47, 0x0EF098D737A526F5, 0x9D122CB7DD80914D], [u64(0x70BF3E97C2278359), 0x8F68C0AD5388D0AE, 0x1B92FCD53F6064C7, 0x7C9F64541F1C20F0, @@ -2659,7 +2659,7 @@ const second_24 = [ [u64(0xFDF3B153315DB003), 0x64667B3D6BBD81C5, 0x2568858E4F10ABF9, 0xB236C0FFBEBA89B5, 0x41353CB45648B0AF], ] - pi: [ + pi: [ [u64(0x016C019B847C353E), 0xA35A17BFCF0F8225, 0x70BF3E97C2278359, 0xFDF3B153315DB003, 0xC3ABB6AAA7BF7E82], [u64(0x8F68C0AD5388D0AE), 0x64667B3D6BBD81C5, 0x30ED7B128FD5081C, 0x0B4D9452987B5FE8, @@ -2671,7 +2671,7 @@ const second_24 = [ [u64(0x41353CB45648B0AF), 0x5B61A45D1A9D853B, 0x9D122CB7DD80914D, 0x8E3E01D8AF5A9A45, 0xE55E2C0543DBA66A], ] - chi: [ + chi: [ [u64(0x216F24DB244B103F), 0xB84A937FDF0DC827, 0x7DBD3E37920FE53A, 0xED61D9D6165D9004, 0xC28332AEA4BF5F22], [u64(0x96B8C0AF17889A8C), 0x44EB7B3D65A5A175, 0x92D9FB4D2157818C, 0x8B4C957A986F47E8, @@ -2683,7 +2683,7 @@ const second_24 = [ [u64(0xCF35FC9005C8702F), 0x1F45CC5D3A2D84FB, 0x9D526DB7D0509949, 0x8C3205D82778D5AD, 0xD10A2D441B9B2633], ] - iota: [ + iota: [ [u64(0xA16F24DB244B10B4), 0xB84A937FDF0DC827, 0x7DBD3E37920FE53A, 0xED61D9D6165D9004, 0xC28332AEA4BF5F22], [u64(0x96B8C0AF17889A8C), 0x44EB7B3D65A5A175, 0x92D9FB4D2157818C, 0x8B4C957A986F47E8, @@ -2710,7 +2710,7 @@ const second_24 = [ [u64(0x93469241AF3551A9), 0x4336A28C90D0A57D, 0xC12103667AADB8CF, 0xD0416B098D85F42B, 0x8D794395B16607B5], ] - rho: [ + rho: [ [u64(0x5A76ED02B885C137), 0x3C319A443535AA64, 0x3527BF707609A5CC, 0x26830E2CF0201F15, 0xEDDCE1C63A84E66B], [u64(0x4739A6D19055127C), 0x7B2C7F1CF68FABA0, 0xF7A22BFBD648F89F, 0xAA8B47CD10D7A8F9, @@ -2722,7 +2722,7 @@ const second_24 = [ [u64(0x0D79AA8D4C9A3492), 0x28C90D0A57D4336A, 0x56DC67E09081B33D, 0x416B098D85F42BD0, 0x50E56C5981ED635E], ] - pi: [ + pi: [ [u64(0x5A76ED02B885C137), 0x2631083A2E681D61, 0x4739A6D19055127C, 0x0D79AA8D4C9A3492, 0x60AA35508BD98ADE], [u64(0x7B2C7F1CF68FABA0), 0x28C90D0A57D4336A, 0x373B7BE34F982F6F, 0x3C319A443535AA64, @@ -2734,7 +2734,7 @@ const second_24 = [ [u64(0x50E56C5981ED635E), 0x449D0533B27A70A0, 0xEDDCE1C63A84E66B, 0xEDD34AD9263728B2, 0x2D8C61F6CDEF27BC], ] - chi: [ + chi: [ [u64(0x5EB46D82B0A5D572), 0x3317BA4A0E6199E5, 0x0F39A6DDA056127C, 0xCEFB8B368ED26409, 0x207615F00BD92AD6], [u64(0x3B3D7F0EF7CFEABA), 0xA2414D8757023B5B, 0x36707AE2CA7C04BF, 0x34308A441506A864, @@ -2746,7 +2746,7 @@ const second_24 = [ [u64(0x71ED7E45C7E749DE), 0x4C550033E3EE52AA, 0xDDDEB8E4750CCB68, 0xDDD35A991712A2D6, 0x3B8DABF499C9769D], ] - iota: [ + iota: [ [u64(0xDEB46D82B0A555FB), 0x3317BA4A0E6199E5, 0x0F39A6DDA056127C, 0xCEFB8B368ED26409, 0x207615F00BD92AD6], [u64(0x3B3D7F0EF7CFEABA), 0xA2414D8757023B5B, 0x36707AE2CA7C04BF, 0x34308A441506A864, @@ -2773,7 +2773,7 @@ const second_24 = [ [u64(0xB8AABC5ACCE0C60C), 0x8512C22CE8E9DD78, 0x14997AFB7E0B44BA, 0x149498861C152D04, 0xF2CA69EB92CEF94F], ] - rho: [ + rho: [ [u64(0xC2F0509FFD2B0437), 0x3EFC8292F5387574, 0x9BECDE076EC21D80, 0xB86B8BA57F6C5786, 0xA3B5195DEC68F0C8], [u64(0x760B9F82165B67B9), 0x0623D2279FD48ABE, 0x2328B4DA797766D9, 0x9E20568107517D3C, @@ -2785,7 +2785,7 @@ const second_24 = [ [u64(0xD667063065C555E2), 0x22CE8E9DD788512C, 0x05A25D0A4CBD7DBF, 0x9498861C152D0414, 0x9A7AE4B3BE53FCB2], ] - pi: [ + pi: [ [u64(0xC2F0509FFD2B0437), 0x1B7C4A5588C64366, 0x760B9F82165B67B9, 0xD667063065C555E2, 0x4473307237F1326F], [u64(0x0623D2279FD48ABE), 0x22CE8E9DD788512C, 0xB76050F958209417, 0x3EFC8292F5387574, @@ -2797,7 +2797,7 @@ const second_24 = [ [u64(0x9A7AE4B3BE53FCB2), 0x2E07C7067581FC81, 0xA3B5195DEC68F0C8, 0x14ACC6DA5D7E317B, 0x58E9DE4729F43A46], ] - chi: [ + chi: [ [u64(0x136C74C7BD096537), 0x825C1A57A0844FE6, 0x3E18968411492C31, 0xD76732786D82576B, 0x4471297A334426F4], [u64(0x2623C227959C8ABA), 0x26CE8E1DD6993110, 0xB3E8D6E9480D9017, 0x3229C09673B8FD72, @@ -2809,7 +2809,7 @@ const second_24 = [ [u64(0x9E796693BC87763A), 0x0E85438E2289EC89, 0x22D55924A44860CE, 0x3C344658CD46116F, 0xE1699842E1FC7346], ] - iota: [ + iota: [ [u64(0x936C74C7BD09E534), 0x825C1A57A0844FE6, 0x3E18968411492C31, 0xD76732786D82576B, 0x4471297A334426F4], [u64(0x2623C227959C8ABA), 0x26CE8E1DD6993110, 0xB3E8D6E9480D9017, 0x3229C09673B8FD72, @@ -2836,7 +2836,7 @@ const second_24 = [ [u64(0x8D05218E048171D6), 0x1DF904939A8FEB65, 0x31A91E391C4E6722, 0x2F48014575401683, 0xF215DF5F59FA74AA], ] - rho: [ + rho: [ [u64(0x7591ABAB888402B7), 0x509A86564A1C53B9, 0xC72A4F4126265D96, 0x1F61D06335DA28B0, 0xD8581B2705DE8A33], [u64(0x9CDB815319725460), 0xC919A4E808C93CFB, 0x9B519D44A0C2776E, 0xABBF0B4CF8430D53, @@ -2848,7 +2848,7 @@ const second_24 = [ [u64(0x70240B8EB468290C), 0x4939A8FEB651DF90, 0x27339118D48F1C8E, 0x480145754016832F, 0x77D7D67E9D2ABC85], ] - pi: [ + pi: [ [u64(0x7591ABAB888402B7), 0x6123C92D8C1DD32C, 0x9CDB815319725460, 0x70240B8EB468290C, 0xD34A3E8B16023C9E], [u64(0xC919A4E808C93CFB), 0x4939A8FEB651DF90, 0x4B38F12DFF7C302A, 0x509A86564A1C53B9, @@ -2860,7 +2860,7 @@ const second_24 = [ [u64(0x77D7D67E9D2ABC85), 0xCAFCB6B1BCB24707, 0xD8581B2705DE8A33, 0xFC08A89F1F6107CC, 0xB69B99B3C0B726B8], ] - chi: [ + chi: [ [u64(0x53B5B8BC0FA440B3), 0xE7218E2C8C3BD32A, 0xBCDD894319F2D220, 0xFB65128E14AA0D4A, 0xF0682F83C68E3C92], [u64(0x4890ECC028431973), 0x61ACA8F26E10DFD1, 0x0B39B568FF6A312D, 0x14B8E6455708D328, @@ -2872,7 +2872,7 @@ const second_24 = [ [u64(0xFFDFD23E9D6380CD), 0xC2E496638EF24B97, 0x9B786B0BE3D2AA39, 0xFC922CCF5575557D, 0xB20E5987E9F6A4D8], ] - iota: [ + iota: [ [u64(0xD3B5B8BC0FA4C0B1), 0xE7218E2C8C3BD32A, 0xBCDD894319F2D220, 0xFB65128E14AA0D4A, 0xF0682F83C68E3C92], [u64(0x4890ECC028431973), 0x61ACA8F26E10DFD1, 0x0B39B568FF6A312D, 0x14B8E6455708D328, @@ -2899,7 +2899,7 @@ const second_24 = [ [u64(0x62D3873410618D85), 0x5FE8C36903F046DF, 0x06743E016ED0A771, 0x619E79C5D8775835, 0x2F020C8D64F4A990], ] - rho: [ + rho: [ [u64(0x6FABC531872124BC), 0x4BE37275B3FF3A10, 0x061FA6748BB9B168, 0x5FD28E8EF6DE0738, 0x4839382F627D31D9], [u64(0x890357397B6D17C0), 0x54D426DBDEFAEFBE, 0xA3C8D1AA7E8EF81C, 0xA83763153423385F, @@ -2911,7 +2911,7 @@ const second_24 = [ [u64(0xA0830C6C2B169C39), 0x36903F046DF5FE8C, 0x6853B8833A1F00B7, 0x9E79C5D877583561, 0x8323593D2A640BC0], ] - pi: [ + pi: [ [u64(0x6FABC531872124BC), 0x6D4703F2F5389901, 0x890357397B6D17C0, 0xA0830C6C2B169C39, 0x30472579B2982AC2], [u64(0x54D426DBDEFAEFBE), 0x36903F046DF5FE8C, 0x8032557EE5DFBA06, 0x4BE37275B3FF3A10, @@ -2923,7 +2923,7 @@ const second_24 = [ [u64(0x8323593D2A640BC0), 0x83587545B9B56F7F, 0x4839382F627D31D9, 0x43C835A096D48520, 0x43330E2A67983146], ] - chi: [ + chi: [ [u64(0x6483D411A72534BD), 0x6D48838277309861, 0xB84FD5B86B4D12E1, 0x008B8DE667165C35, 0x18168DF892802AF3], [u64(0x64556E8FDEB8EDC8), 0x9EB07E0559F7F69B, 0x8E13512EA797AA46, 0x1BD55E24B3FF3D11, @@ -2935,7 +2935,7 @@ const second_24 = [ [u64(0x93777BF772BEC0C2), 0x91C84941B17009F3, 0x48093869E6EF99DF, 0x08A847B1063DA720, 0x843B5E282B9FB142], ] - iota: [ + iota: [ [u64(0xE483D411A725343D), 0x6D48838277309861, 0xB84FD5B86B4D12E1, 0x008B8DE667165C35, 0x18168DF892802AF3], [u64(0x64556E8FDEB8EDC8), 0x9EB07E0559F7F69B, 0x8E13512EA797AA46, 0x1BD55E24B3FF3D11, @@ -2962,7 +2962,7 @@ const second_24 = [ [u64(0x5F6D4AC53349E7F8), 0x5DD27873F0872EC9, 0x8413095BA718BEE5, 0xC4B2768347CA801A, 0x48216F1A6A689678], ] - rho: [ + rho: [ [u64(0x5DFC5C5BBD667524), 0xD73D978D4370BC86, 0x0982EF9388729FC0, 0xAA3A5973E80B58FA, 0x16CA230DAFAA85A4], [u64(0x501D1B2789BCC788), 0x17897D2EB9D19439, 0x22C8CAF7C4912B09, 0x3663AAF1D7A71533, @@ -2974,7 +2974,7 @@ const second_24 = [ [u64(0x299A4F3FC2FB6A56), 0x873F0872EC95DD27, 0x8C5F72C20984ADD3, 0xB2768347CA801AC4, 0x5BC69A9A259E1208], ] - pi: [ + pi: [ [u64(0x5DFC5C5BBD667524), 0xD3E19886867AADA6, 0x501D1B2789BCC788, 0x299A4F3FC2FB6A56, 0x83A949C5BFE77714], [u64(0x17897D2EB9D19439), 0x873F0872EC95DD27, 0xAA2540ECE62686E1, 0xD73D978D4370BC86, @@ -2986,7 +2986,7 @@ const second_24 = [ [u64(0x5BC69A9A259E1208), 0x5D71B3F291554B94, 0x16CA230DAFAA85A4, 0x9A517DB9C7DD8CA3, 0x7356C46A0084070A], ] - chi: [ + chi: [ [u64(0x75FA5ECABB421D24), 0xDB617F078618AF66, 0x51970E3589FDE680, 0x095A074D467A695F, 0x03AB5B85BFE77644], [u64(0x4739656E99D897ED), 0xB15E0812BB10DD14, 0xB871C2A9AEA69C25, 0x0E2BB38D49562CB0, @@ -2998,7 +2998,7 @@ const second_24 = [ [u64(0x59C7BBBE250F9211), 0x596FB382F9D01B95, 0xBCEA63C5C9A885C5, 0x4C74ED39C6DD1823, 0x4F02E05040848F89], ] - iota: [ + iota: [ [u64(0x75FA5ECABB429D2E), 0xDB617F078618AF66, 0x51970E3589FDE680, 0x095A074D467A695F, 0x03AB5B85BFE77644], [u64(0x4739656E99D897ED), 0xB15E0812BB10DD14, 0xB871C2A9AEA69C25, 0x0E2BB38D49562CB0, @@ -3025,7 +3025,7 @@ const second_24 = [ [u64(0x7071859FC537F81E), 0x70D98DA319E8719A, 0x955C5DE42990EFCA, 0x65C2D31826E5722C, 0x66B4DE71A0BCE586], ] - rho: [ + rho: [ [u64(0x730EC9FFDDC02B4B), 0x09A1903DD95E832E, 0xBB1CC8077BFA872A, 0xF1BE741F5D20F041, 0x32C365970084157F], [u64(0x892D389B1A44F885), 0xA36BB32F1F131AFE, 0x78EE2AE971DE28EF, 0x98E3F1B08955CBB5, @@ -3037,7 +3037,7 @@ const second_24 = [ [u64(0xFE29BFC0F3838C2C), 0xDA319E8719A70D98, 0xC877E54AAE2EF214, 0xC2D31826E5722C65, 0x379C682F396199AD], ] - pi: [ + pi: [ [u64(0x730EC9FFDDC02B4B), 0xC3694E91931CA97B, 0x892D389B1A44F885, 0xFE29BFC0F3838C2C, 0xFE4C8AF3C06FC06F], [u64(0xA36BB32F1F131AFE), 0xDA319E8719A70D98, 0x3ACDB0619BCE34A6, 0x09A1903DD95E832E, @@ -3049,7 +3049,7 @@ const second_24 = [ [u64(0x379C682F396199AD), 0xA0AC47D340E9A8E8, 0x32C365970084157F, 0x076FD2D8DEDDD50F, 0x7DCA76A4AC501C12], ] - chi: [ + chi: [ [u64(0x730A813F1D282E4A), 0xE2650E91F1442B59, 0x092D7A055A64B885, 0x8E679500D303A4ED, 0x7E4BAEB9406DA27B], [u64(0x724BB73F3F03F87A), 0xDAD2AF3799A2450D, 0x7A9EB8613FDE1CE7, 0x08B0553FDD5F563E, @@ -3061,7 +3061,7 @@ const second_24 = [ [u64(0xB7FD5A2F3B728919), 0xB8BCD7D5484AAC68, 0x0003E5F7810E115D, 0x06EFD2E5D681D60D, 0x7DFA27A082D00412], ] - iota: [ + iota: [ [u64(0xF30A813F9D282E40), 0xE2650E91F1442B59, 0x092D7A055A64B885, 0x8E679500D303A4ED, 0x7E4BAEB9406DA27B], [u64(0x724BB73F3F03F87A), 0xDAD2AF3799A2450D, 0x7A9EB8613FDE1CE7, 0x08B0553FDD5F563E, @@ -3088,7 +3088,7 @@ const second_24 = [ [u64(0xC672BD98B91DE4FD), 0xC9333062CA25C18C, 0x718C024003617CB9, 0x7760355254EEBBE9, 0x0C75C01700BF69F6], ] - rho: [ + rho: [ [u64(0xA9D374DBCC55173A), 0x0391223B8BCFB75A, 0x9FA47F0858CC0FFA, 0xFD3B2FA97CC1C904, 0x6D7444426C049249], [u64(0x028C2C8638C665A3), 0x28FA629DF0E4BBAC, 0x4C647472FB593226, 0xF392BF77BE887FC7, @@ -3100,7 +3100,7 @@ const second_24 = [ [u64(0xC5C8EF27EE3395EC), 0x062CA25C18CC9333, 0xB0BE5CB8C6012001, 0x60355254EEBBE977, 0x7005C02FDA7D831D], ] - pi: [ + pi: [ [u64(0xA9D374DBCC55173A), 0xC7B1F2450F67C19E, 0x028C2C8638C665A3, 0xC5C8EF27EE3395EC, 0xF4CCD42F0F009109], [u64(0x28FA629DF0E4BBAC), 0x062CA25C18CC9333, 0xBCC34DF466FFC953, 0x0391223B8BCFB75A, @@ -3112,7 +3112,7 @@ const second_24 = [ [u64(0x7005C02FDA7D831D), 0x223A84933C96F4C8, 0x6D7444426C049249, 0x9A16A4716A12C3C4, 0xFBF581F073354A86], ] - chi: [ + chi: [ [u64(0xB9D2EDB9C355533B), 0x5E31AF454F67CD56, 0x03AC9C86B8C667AB, 0x89ACBB679E2395C8, 0x446CD4AF8B01B109], [u64(0xCD7A429DD0B2A388), 0x663E222BBECCE336, 0xDCD74FE02E5DE136, 0xB31022BA8BC972CA, @@ -3124,7 +3124,7 @@ const second_24 = [ [u64(0x702DC22BEADD2B99), 0x2236848B2C1EE6E9, 0xD13705322A3D1A19, 0x9807A4696BDEE1D6, 0xF3E68BE0333F0C10], ] - iota: [ + iota: [ [u64(0x39D2EDB94355D3BA), 0x5E31AF454F67CD56, 0x03AC9C86B8C667AB, 0x89ACBB679E2395C8, 0x446CD4AF8B01B109], [u64(0xCD7A429DD0B2A388), 0x663E222BBECCE336, 0xDCD74FE02E5DE136, 0xB31022BA8BC972CA, @@ -3151,7 +3151,7 @@ const second_24 = [ [u64(0x4BD96A1E9B807629), 0x19C22CBE5D43BB59, 0xEAC3AD075B6047A9, 0xA3F30C5C1A83BC66, 0xC81223D5426251A0], ] - rho: [ + rho: [ [u64(0xD2A5600D870B50A6), 0xB394E4AB54622F18, 0x46D88993E4C725BF, 0xFA2DA8C5B66DA6B4, 0x646D3D7CC856BC6D], [u64(0x54D0A40F9F535079), 0x7E882012C32B1A1D, 0x157DE8C51BAA0AEF, 0x4F2FDA804644129A, @@ -3163,7 +3163,7 @@ const second_24 = [ [u64(0xF4DC03B14A5ECB50), 0xCBE5D43BB5919C22, 0xB023D4F561D683AD, 0xF30C5C1A83BC66A3, 0x88F5509894683204], ] - pi: [ + pi: [ [u64(0xD2A5600D870B50A6), 0x30A8E5348CA8F445, 0x54D0A40F9F535079, 0xF4DC03B14A5ECB50, 0xD2196F60C012BDAE], [u64(0x7E882012C32B1A1D), 0xCBE5D43BB5919C22, 0xE1A67FE146679473, 0xB394E4AB54622F18, @@ -3175,7 +3175,7 @@ const second_24 = [ [u64(0x88F5509894683204), 0x1C4E0753E31EC664, 0x646D3D7CC856BC6D, 0x4B4FE77305479986, 0x8931B685B34410BC], ] - chi: [ + chi: [ [u64(0x52A0EA689FDBF166), 0x34B0ECB4CCEED5D8, 0x52C0A40BBEDB12FD, 0xF0B50BF541D6CBB7, 0x623AFB75E1803E83], [u64(0x56484590642A4E3D), 0xC2C2863BB7918E22, 0xF1AA63FBC673B070, 0xB996F6A35422AA08, @@ -3187,7 +3187,7 @@ const second_24 = [ [u64(0xA4FD508AD448381D), 0xD70B1758D20FCE46, 0xC54B669C8872386F, 0x484F03791167BD8E, 0x80F1B607BB0150EC], ] - iota: [ + iota: [ [u64(0xD2A0EA689FDB71E6), 0x34B0ECB4CCEED5D8, 0x52C0A40BBEDB12FD, 0xF0B50BF541D6CBB7, 0x623AFB75E1803E83], [u64(0x56484590642A4E3D), 0xC2C2863BB7918E22, 0xF1AA63FBC673B070, 0xB996F6A35422AA08, @@ -3214,7 +3214,7 @@ const second_24 = [ [u64(0x592E0437C164C289), 0x2AD843E5C72334D2, 0x389832219D5EC2FB, 0xB59C57C4044B471A, 0x7D22E2BAAE2DAA78], ] - rho: [ + rho: [ [u64(0x1657447A84851FFF), 0x7B0BBC1F04742A6D, 0xB1B850CD2C2BE724, 0x114B5C68854BCEB5, 0x559FEB79426A9B35], [u64(0xFD6A467660763E10), 0x0DF17EA3FE090E38, 0x5C1542498B851765, 0x7F67B22D72010006, @@ -3226,7 +3226,7 @@ const second_24 = [ [u64(0xBE0B26144AC97021), 0x3E5C72334D22AD84, 0xAF617D9C4C1910CE, 0x9C57C4044B471AB5, 0xB8AEAB8B6A9E1F48], ] - pi: [ + pi: [ [u64(0x1657447A84851FFF), 0x8B8F07047C19777D, 0xFD6A467660763E10, 0xBE0B26144AC97021, 0xBA6419D2D6E9BDE2], [u64(0x0DF17EA3FE090E38), 0x3E5C72334D22AD84, 0x4E5C7D91B8EF627A, 0x7B0BBC1F04742A6D, @@ -3238,7 +3238,7 @@ const second_24 = [ [u64(0xB8AEAB8B6A9E1F48), 0xE1D247F86C7D19FE, 0x559FEB79426A9B35, 0x7B5373D3BBB20DC4, 0xA4C4B52429F4B7D4], ] - chi: [ + chi: [ [u64(0xB651C43A8473AEB9), 0x0A2F07C85C10355D, 0xFCCBC4342466AB94, 0xBA1F6454C1486521, 0xBE4508CAD6F1AD6A], [u64(0x17B17FA3BE010EA8), 0x701BD0131F22AD86, 0xDE0A3D95BBA9685B, 0xDB6B309F246ECA65, @@ -3250,7 +3250,7 @@ const second_24 = [ [u64(0xB10E910A10961F48), 0xD58237CB6D5F917E, 0x578BD2F8DAE3DB5F, 0x3A53EBD8BF860788, 0xA5CED12020F2F5C0], ] - iota: [ + iota: [ [u64(0xB651C43A0473AEB8), 0x0A2F07C85C10355D, 0xFCCBC4342466AB94, 0xBA1F6454C1486521, 0xBE4508CAD6F1AD6A], [u64(0x17B17FA3BE010EA8), 0x701BD0131F22AD86, 0xDE0A3D95BBA9685B, 0xDB6B309F246ECA65, @@ -3277,7 +3277,7 @@ const second_24 = [ [u64(0x42BC7ED6AEC36D53), 0x2630D817D30AE365, 0xA4393D2464B6A944, 0xC9E1040401D37593, 0x567C3EFC9EA787DB], ] - rho: [ + rho: [ [u64(0xA9DC1646F96E0136), 0x10D9AD315A2D5B4A, 0x1A30B246CBD820D7, 0xAB955F4B256C5078, 0x6AD8AFB00B928723], [u64(0x49DAF185FDEE4831), 0x48736C347D7725FD, 0x58EBD3ED7D0BADB5, 0x1C1AAD06E6FFCC93, @@ -3289,7 +3289,7 @@ const second_24 = [ [u64(0xB5761B6A9A15E3F6), 0x817D30AE3652630D, 0x5B54A2521C9E9232, 0xE1040401D37593C9, 0x0FBF27A9E1F6D59F], ] - pi: [ + pi: [ [u64(0xA9DC1646F96E0136), 0xE3573BE213EDFBEA, 0x49DAF185FDEE4831, 0xB5761B6A9A15E3F6, 0xCB5A113BE3A6CF69], [u64(0x48736C347D7725FD), 0x817D30AE3652630D, 0x1EEA66C42BDF9547, 0x10D9AD315A2D5B4A, @@ -3301,7 +3301,7 @@ const second_24 = [ [u64(0x0FBF27A9E1F6D59F), 0xE4D6CC03CA8AB420, 0x6AD8AFB00B928723, 0x9129867F24B65AE1, 0x2071AE1672CEBFDC], ] - chi: [ + chi: [ [u64(0xAD5C954D796E4B34), 0xF957B9A2DA65FB38, 0x68CE61B6B9CE68A1, 0xFD5449A6BF174743, 0x900E3129E7BADD7B], [u64(0x6A332CD07057B56D), 0x85773DAE1275AF0D, 0xDEEA66C4BA8F974F, 0x97DDAD33D8994B40, @@ -3313,7 +3313,7 @@ const second_24 = [ [u64(0x4F9C4F99E5E7F156), 0xE4FECC0FEE98B425, 0x7CF8A9F009831265, 0x91A0226E649E42E9, 0x20D06CD26A8FBF5C], ] - iota: [ + iota: [ [u64(0x2D5C954DF96ECB3C), 0xF957B9A2DA65FB38, 0x68CE61B6B9CE68A1, 0xFD5449A6BF174743, 0x900E3129E7BADD7B], [u64(0x6A332CD07057B56D), 0x85773DAE1275AF0D, 0xDEEA66C4BA8F974F, 0x97DDAD33D8994B40, diff --git a/vlib/encoding/utf8/utf8_tables.v b/vlib/encoding/utf8/utf8_tables.v index 6c982883bcbcf4..40584593459cf5 100644 --- a/vlib/encoding/utf8/utf8_tables.v +++ b/vlib/encoding/utf8/utf8_tables.v @@ -546,7 +546,7 @@ const max_latin_1 = rune(0x00ff) // Represents all unicode in unicode category L. const letter_table = RangeTable{ - r16: [ + r16: [ Range16{0x0041, 0x005a, 1}, Range16{0x0061, 0x007a, 1}, Range16{0x00aa, 0x00b5, 11}, @@ -907,7 +907,7 @@ const letter_table = RangeTable{ Range16{0xffd2, 0xffd7, 1}, Range16{0xffda, 0xffdc, 1}, ] - r32: [ + r32: [ Range32{0x10000, 0x1000b, 1}, Range32{0x1000d, 0x10026, 1}, Range32{0x10028, 0x1003a, 1}, @@ -1141,7 +1141,7 @@ const letter_table = RangeTable{ // Represents all unicodes in unicode category Z with property white space. const white_space_table = RangeTable{ - r16: [ + r16: [ Range16{0x0009, 0x000d, 1}, Range16{0x0020, 0x0085, 101}, Range16{0x00a0, 0x1680, 5600}, @@ -1156,7 +1156,7 @@ const white_space_table = RangeTable{ // Represents all unicodes in unicode category N. const number_table = RangeTable{ - r16: [ + r16: [ Range16{0x0030, 0x0039, 1}, Range16{0x00b2, 0x00b3, 1}, Range16{0x00b9, 0x00bc, 3}, @@ -1224,7 +1224,7 @@ const number_table = RangeTable{ Range16{0xabf0, 0xabf9, 1}, Range16{0xff10, 0xff19, 1}, ] - r32: [ + r32: [ Range32{0x10107, 0x10133, 1}, Range32{0x10140, 0x10178, 1}, Range32{0x1018a, 0x1018b, 1}, diff --git a/vlib/encoding/xml/encoding_test.v b/vlib/encoding/xml/encoding_test.v index eb8429aa3784a9..d8b9452cb3d304 100644 --- a/vlib/encoding/xml/encoding_test.v +++ b/vlib/encoding/xml/encoding_test.v @@ -10,7 +10,7 @@ fn test_node() { 'test:key': ' test_value ' 'test:other': '123456' } - children: [ + children: [ xml.XMLNode{ name: 'child' attributes: { @@ -25,7 +25,7 @@ fn test_node() { attributes: { 'k': 'v' } - children: [ + children: [ 'Hello, world!', xml.XMLNode{ name: 'c' @@ -41,7 +41,7 @@ fn test_node() { 'uri': '{B58B0392-4F1F-4190-BB64-5DF3571DCE5F}' 'xmlns:xcalcf': 'http://schemas.microsoft.com/office/spreadsheetml/2018/calcfeatures' } - children: [ + children: [ xml.XMLNode{ name: 'xcalcf:calcFeatures' children: [ @@ -130,7 +130,7 @@ fn test_doc() { 'test:key': ' test_value ' 'test:other': '123456' } - children: [ + children: [ xml.XMLNode{ name: 'child' attributes: { @@ -147,7 +147,7 @@ fn test_doc() { attributes: { 'k': 'v' } - children: [ + children: [ 'Hello, world!', xml.XMLNode{ name: 'c' diff --git a/vlib/encoding/xml/parser_test.v b/vlib/encoding/xml/parser_test.v index e739d87c9e6ba5..84eec494492225 100644 --- a/vlib/encoding/xml/parser_test.v +++ b/vlib/encoding/xml/parser_test.v @@ -31,7 +31,7 @@ const xml_elements = [ attributes: { 'id': 'c2' } - children: [ + children: [ 'Sample Text', ] }, @@ -80,7 +80,7 @@ const xml_elements = [ attributes: { 'id': 'c9' } - children: [ + children: [ 'More Sample Text', ] }, diff --git a/vlib/encoding/xml/test/gtk/gtk_test.v b/vlib/encoding/xml/test/gtk/gtk_test.v index 03f81de001b47c..e842024091156c 100644 --- a/vlib/encoding/xml/test/gtk/gtk_test.v +++ b/vlib/encoding/xml/test/gtk/gtk_test.v @@ -36,13 +36,13 @@ fn test_large_gtk_file() ! { 'name': 'new' 'c:identifier': 'gtk_window_new' } - children: [ + children: [ xml.XMLNodeContents(xml.XMLNode{ name: 'doc' attributes: { 'xml:space': 'preserve' } - children: [ + children: [ xml.XMLNodeContents('Creates a new `GtkWindow`. To get an undecorated window (no window borders), use @@ -62,13 +62,13 @@ To delete a `GtkWindow`, call [method@Gtk.Window.destroy].'), attributes: { 'transfer-ownership': 'none' } - children: [ + children: [ xml.XMLNodeContents(xml.XMLNode{ name: 'doc' attributes: { 'xml:space': 'preserve' } - children: [xml.XMLNodeContents('a new `GtkWindow`.')] + children: [xml.XMLNodeContents('a new `GtkWindow`.')] }), xml.XMLNodeContents(xml.XMLNode{ name: 'type' @@ -76,7 +76,7 @@ To delete a `GtkWindow`, call [method@Gtk.Window.destroy].'), 'name': 'Widget' 'c:type': 'GtkWidget*' } - children: [] + children: [] }), ] }), diff --git a/vlib/encoding/xml/test/local/08_comments/comment_test.v b/vlib/encoding/xml/test/local/08_comments/comment_test.v index 1ffc58d7219c71..6bd39728b2dc6c 100644 --- a/vlib/encoding/xml/test/local/08_comments/comment_test.v +++ b/vlib/encoding/xml/test/local/08_comments/comment_test.v @@ -10,7 +10,7 @@ fn test_valid_parsing() ! { text: ' Employee Information' }, ] - root: xml.XMLNode{ + root: xml.XMLNode{ name: 'address' children: [ xml.XMLComment{ diff --git a/vlib/encoding/xml/test/local/13_doctype_element/doctype_test.v b/vlib/encoding/xml/test/local/13_doctype_element/doctype_test.v index e6efb88c3ccbcb..87a39afca34914 100644 --- a/vlib/encoding/xml/test/local/13_doctype_element/doctype_test.v +++ b/vlib/encoding/xml/test/local/13_doctype_element/doctype_test.v @@ -35,7 +35,7 @@ fn test_valid_parsing() { ] } } - root: xml.XMLNode{ + root: xml.XMLNode{ name: 'note' children: [ xml.XMLNode{ diff --git a/vlib/encoding/xml/test/local/14_attributes/attributes_test.v b/vlib/encoding/xml/test/local/14_attributes/attributes_test.v index 798a2f782f83fd..2de02726280e0e 100644 --- a/vlib/encoding/xml/test/local/14_attributes/attributes_test.v +++ b/vlib/encoding/xml/test/local/14_attributes/attributes_test.v @@ -12,21 +12,21 @@ fn test_valid_parsing() { attributes: { 'category': 'web' } - children: [ + children: [ xml.XMLNode{ name: 'title' attributes: { 'lang': 'en' 'code:type': 'const char*' } - children: ['Learning XML'] + children: ['Learning XML'] }, xml.XMLNode{ name: 'author' attributes: { 'attr': ' surrounding spaces ' } - children: ['Erik T. Ray'] + children: ['Erik T. Ray'] }, xml.XMLNode{ name: 'year' diff --git a/vlib/encoding/xml/test/local/19_single_letter_tag/shared_test.v b/vlib/encoding/xml/test/local/19_single_letter_tag/shared_test.v index 7cbe39a7abb703..f35c629858ef4c 100644 --- a/vlib/encoding/xml/test/local/19_single_letter_tag/shared_test.v +++ b/vlib/encoding/xml/test/local/19_single_letter_tag/shared_test.v @@ -13,7 +13,7 @@ fn test_valid_parsing() { 'count': '5' 'uniqueCount': '5' } - children: [ + children: [ xml.XMLNode{ name: 'si' children: [ @@ -22,7 +22,7 @@ fn test_valid_parsing() { attributes: { 'a': '1' } - children: ['Item 1'] + children: ['Item 1'] }, ] }, diff --git a/vlib/flag/README.md b/vlib/flag/README.md index 7d17e114d0cce7..02ee2f1ecec655 100644 --- a/vlib/flag/README.md +++ b/vlib/flag/README.md @@ -210,4 +210,4 @@ fn main() { println('an_int: ${an_int} | a_bool: ${a_bool} | a_float: ${a_float} | a_string: "${a_string}" ') println(additional_args.join_lines()) } -``` +``` \ No newline at end of file diff --git a/vlib/flag/flag_to.v b/vlib/flag/flag_to.v index 614e5f1a82e87d..ace81bc6700c05 100644 --- a/vlib/flag/flag_to.v +++ b/vlib/flag/flag_to.v @@ -340,7 +340,7 @@ pub fn to_doc[T](dc DocConfig) !string { delimiter: dc.delimiter style: dc.style } - input: [] + input: [] } fm.si = fm.get_struct_info[T]()! return fm.to_doc(dc)! diff --git a/vlib/flag/flag_to_doc_test.v b/vlib/flag/flag_to_doc_test.v index c1aef6b3291dca..1299b3cd329b0f 100644 --- a/vlib/flag/flag_to_doc_test.v +++ b/vlib/flag/flag_to_doc_test.v @@ -176,20 +176,20 @@ fn test_flag_to_doc_spacing_and_new_lines() { assert flag.to_doc[DocTest]( description: 'Flag to doc test. Content here' - footer: ' + footer: ' Footer content' - fields: unsafe { field_docs } + fields: unsafe { field_docs } )! == doc4 // Test in compact mode also assert flag.to_doc[DocTest]( - options: flag.DocOptions{ + options: flag.DocOptions{ compact: true } description: 'Flag to doc test. Content here' - footer: ' + footer: ' Footer content' - fields: unsafe { field_docs } + fields: unsafe { field_docs } )! == doc5 } diff --git a/vlib/gg/gg.c.v b/vlib/gg/gg.c.v index 8a1ff1505da5b1..3542e5de74324f 100644 --- a/vlib/gg/gg.c.v +++ b/vlib/gg/gg.c.v @@ -628,12 +628,12 @@ pub fn (ctx &Context) end(options EndOptions) { pub struct FPSConfig { pub mut: - x int // horizontal position on screen - y int // vertical position on screen - width int // minimum width - height int // minimum height - show bool // do not show by default, use `-d show_fps` or set it manually in your app to override with: `app.gg.fps.show = true` - text_config gx.TextCfg = gx.TextCfg{ + x int // horizontal position on screen + y int // vertical position on screen + width int // minimum width + height int // minimum height + show bool // do not show by default, use `-d show_fps` or set it manually in your app to override with: `app.gg.fps.show = true` + text_config gx.TextCfg = gx.TextCfg{ color: gx.yellow size: 20 align: .center diff --git a/vlib/json/README.md b/vlib/json/README.md index c9538d2273cf2d..478b41266a37be 100644 --- a/vlib/json/README.md +++ b/vlib/json/README.md @@ -46,4 +46,4 @@ fn main() { println('JSON encoding of employee y: ${ss}') assert ss == s } -``` +``` \ No newline at end of file diff --git a/vlib/json/json_encode_with_ptr_test.v b/vlib/json/json_encode_with_ptr_test.v index 33322d0b563d63..eaa9206077d5fe 100644 --- a/vlib/json/json_encode_with_ptr_test.v +++ b/vlib/json/json_encode_with_ptr_test.v @@ -15,8 +15,8 @@ fn test_json_encode_with_ptr() { name: 'foo' } data := MyStruct{ - user: &user - users: { + user: &user + users: { 'keyfoo': user } users2: { diff --git a/vlib/json/json_test.v b/vlib/json/json_test.v index 08bc5014ac8037..90fbddb28c788c 100644 --- a/vlib/json/json_test.v +++ b/vlib/json/json_test.v @@ -273,7 +273,7 @@ fn test_nested_type() { cities: [City{'Donlon'}, City{'Termanches'}] }, ] - users: { + users: { 'Foo': User{ age: 10 nums: [1, 2, 3] @@ -291,7 +291,7 @@ fn test_nested_type() { pets: 'little boo' } } - extra: { + extra: { '2': { 'n1': 2 'n2': 4 @@ -527,7 +527,7 @@ fn test_encoding_struct_with_pointers() { association: &Association{ price: APrice{} } - price: APrice{} + price: APrice{} } assert json.encode(value) == '{"association":{"price":{}},"price":{}}' } diff --git a/vlib/net/html/parser.v b/vlib/net/html/parser.v index 094b514cfa6941..14f2079cd6e9ca 100644 --- a/vlib/net/html/parser.v +++ b/vlib/net/html/parser.v @@ -29,10 +29,10 @@ mut: lexical_attributes LexicalAttributes = LexicalAttributes{ current_tag: &Tag{} } - filename string = 'direct-parse' - initialized bool - tags []&Tag - debug_file os.File + filename string = 'direct-parse' + initialized bool + tags []&Tag + debug_file os.File } // This function is used to add a tag for the parser ignore it's content. diff --git a/vlib/net/http/cookie_test.v b/vlib/net/http/cookie_test.v index 6f7f87ac1949ab..5924a7f2411614 100644 --- a/vlib/net/http/cookie_test.v +++ b/vlib/net/http/cookie_test.v @@ -21,7 +21,7 @@ const write_set_cookie_tests = [ name: 'cookie-1' value: 'v1' } - raw: 'cookie-1=v1' + raw: 'cookie-1=v1' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -29,7 +29,7 @@ const write_set_cookie_tests = [ value: 'two' max_age: 3600 } - raw: 'cookie-2=two; Max-Age=3600' + raw: 'cookie-2=two; Max-Age=3600' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -37,7 +37,7 @@ const write_set_cookie_tests = [ value: 'three' domain: '.example.com' } - raw: 'cookie-3=three; domain=example.com' + raw: 'cookie-3=three; domain=example.com' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -45,7 +45,7 @@ const write_set_cookie_tests = [ value: 'four' path: '/restricted/' } - raw: 'cookie-4=four; path=/restricted/' + raw: 'cookie-4=four; path=/restricted/' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -53,7 +53,7 @@ const write_set_cookie_tests = [ value: 'five' domain: 'wrong;bad.abc' } - raw: 'cookie-5=five' + raw: 'cookie-5=five' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -61,7 +61,7 @@ const write_set_cookie_tests = [ value: 'six' domain: 'bad-.abc' } - raw: 'cookie-6=six' + raw: 'cookie-6=six' }, // SetCookieTestCase{ // cookie: &http.Cookie{name: 'cookie-7', value: 'seven', domain: '127.0.0.1'}, @@ -73,7 +73,7 @@ const write_set_cookie_tests = [ value: 'eight' domain: '::1' } - raw: 'cookie-8=eight' + raw: 'cookie-8=eight' }, // { // cookie: &http.Cookie{name: 'cookie-9', value: 'expiring', expires: time.unix(1257894000, 0)}, @@ -94,7 +94,7 @@ const write_set_cookie_tests = [ value: 'samesite-default' same_site: .same_site_default_mode } - raw: 'cookie-12=samesite-default; SameSite' + raw: 'cookie-12=samesite-default; SameSite' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -102,7 +102,7 @@ const write_set_cookie_tests = [ value: 'samesite-lax' same_site: .same_site_lax_mode } - raw: 'cookie-13=samesite-lax; SameSite=Lax' + raw: 'cookie-13=samesite-lax; SameSite=Lax' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -110,7 +110,7 @@ const write_set_cookie_tests = [ value: 'samesite-strict' same_site: .same_site_strict_mode } - raw: 'cookie-14=samesite-strict; SameSite=Strict' + raw: 'cookie-14=samesite-strict; SameSite=Strict' }, SetCookieTestCase{ cookie: &http.Cookie{ @@ -118,7 +118,7 @@ const write_set_cookie_tests = [ value: 'samesite-none' same_site: .same_site_none_mode } - raw: 'cookie-15=samesite-none; SameSite=None' + raw: 'cookie-15=samesite-none; SameSite=None' }, // The 'special' cookies have values containing commas or spaces which // are disallowed by RFC 6265 but are common in the wild. @@ -127,102 +127,102 @@ const write_set_cookie_tests = [ name: 'special-1' value: 'a z' } - raw: 'special-1=a z' + raw: 'special-1=a z' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'special-2' value: ' z' } - raw: 'special-2=" z"' + raw: 'special-2=" z"' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'special-3' value: 'a ' } - raw: 'special-3="a "' + raw: 'special-3="a "' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'special-4' value: ' ' } - raw: 'special-4=" "' + raw: 'special-4=" "' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'special-5' value: 'a,z' } - raw: 'special-5=a,z' + raw: 'special-5=a,z' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'special-6' value: ',z' } - raw: 'special-6=",z"' + raw: 'special-6=",z"' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'special-7' value: 'a,' } - raw: 'special-7="a,"' + raw: 'special-7="a,"' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'special-8' value: ',' } - raw: 'special-8=","' + raw: 'special-8=","' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'empty-value' value: '' } - raw: 'empty-value=' + raw: 'empty-value=' }, SetCookieTestCase{ cookie: &http.Cookie{ name: '' } - raw: '' + raw: '' }, SetCookieTestCase{ cookie: &http.Cookie{ name: '\t' } - raw: '' + raw: '' }, SetCookieTestCase{ cookie: &http.Cookie{ name: '\r' } - raw: '' + raw: '' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'a\nb' value: 'v' } - raw: '' + raw: '' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'a\nb' value: 'v' } - raw: '' + raw: '' }, SetCookieTestCase{ cookie: &http.Cookie{ name: 'a\rb' value: 'v' } - raw: '' + raw: '' }, ] const add_cookies_tests = [ @@ -235,7 +235,7 @@ const add_cookies_tests = [ name: 'cookie-1' value: 'v1' }] - raw: 'cookie-1=v1' + raw: 'cookie-1=v1' }, AddCookieTestCase{ cookie: [&http.Cookie{ @@ -249,7 +249,7 @@ const add_cookies_tests = [ name: 'cookie-3' value: 'v3' }] - raw: 'cookie-1=v1; cookie-2=v2; cookie-3=v3' + raw: 'cookie-1=v1; cookie-2=v2; cookie-3=v3' }, ] diff --git a/vlib/net/http/file/static_server.v b/vlib/net/http/file/static_server.v index 48cd8c6e1e43b4..ddf2b0ef2c36fe 100644 --- a/vlib/net/http/file/static_server.v +++ b/vlib/net/http/file/static_server.v @@ -33,7 +33,7 @@ pub fn serve(params StaticServeParams) { mut nparams := params nparams.folder = os.norm_path(os.real_path(params.folder)) mut server := &http.Server{ - handler: StaticHttpHandler{ + handler: StaticHttpHandler{ params: nparams } addr: params.on diff --git a/vlib/net/http/mime/db.v b/vlib/net/http/mime/db.v index fafa5f88526a22..bb81f6c85580a9 100644 --- a/vlib/net/http/mime/db.v +++ b/vlib/net/http/mime/db.v @@ -1774,9 +1774,9 @@ const db = { charset: '' } 'application/octet-stream': MimeType{ - source: 'iana' - extensions: ['bin', 'dms', 'lrf', 'mar', 'so', 'dist', 'distz', 'pkg', 'bpk', 'dump', 'elc', - 'deploy', 'exe', 'dll', 'deb', 'dmg', 'iso', 'img', 'msi', 'msp', 'msm', 'buffer'] + source: 'iana' + extensions: ['bin', 'dms', 'lrf', 'mar', 'so', 'dist', 'distz', 'pkg', 'bpk', 'dump', + 'elc', 'deploy', 'exe', 'dll', 'deb', 'dmg', 'iso', 'img', 'msi', 'msp', 'msm', 'buffer'] compressible: false charset: '' } diff --git a/vlib/net/http/server_test.v b/vlib/net/http/server_test.v index b50c0e530c6cc9..552d72af22eb53 100644 --- a/vlib/net/http/server_test.v +++ b/vlib/net/http/server_test.v @@ -155,7 +155,7 @@ fn test_server_custom_handler() { progress_calls.chunks << chunk.clone() progress_calls.reads << read_so_far } - on_finish: fn (req &http.Request, final_size u64) ! { + on_finish: fn (req &http.Request, final_size u64) ! { mut progress_calls := unsafe { &ProgressCalls(req.user_ptr) } eprintln('>>>>>>>> on_finish, req.url: ${req.url}, final_size: ${final_size}') progress_calls.finished_was_called = true diff --git a/vlib/net/websocket/websocket_client.v b/vlib/net/websocket/websocket_client.v index 9d8687d2467639..b0628ece6c5aa6 100644 --- a/vlib/net/websocket/websocket_client.v +++ b/vlib/net/websocket/websocket_client.v @@ -92,13 +92,13 @@ pub: pub fn new_client(address string, opt ClientOpt) !&Client { uri := parse_uri(address)! return &Client{ - conn: unsafe { nil } - is_server: false - ssl_conn: ssl.new_ssl_conn()! - is_ssl: address.starts_with('wss') - logger: opt.logger - uri: uri - client_state: ClientState{ + conn: unsafe { nil } + is_server: false + ssl_conn: ssl.new_ssl_conn()! + is_ssl: address.starts_with('wss') + logger: opt.logger + uri: uri + client_state: ClientState{ state: .closed } id: rand.uuid_v4() diff --git a/vlib/orm/orm_fk_test.v b/vlib/orm/orm_fk_test.v index 9963b22dffd134..dc5cadd9abdbba 100644 --- a/vlib/orm/orm_fk_test.v +++ b/vlib/orm/orm_fk_test.v @@ -32,13 +32,13 @@ fn test_field_after_fkeys() { }! person := Person{ - age: 21 - brothers: [Brother{ + age: 21 + brothers: [Brother{ name: 'aaa' }, Brother{ name: 'bbb' }] - sisters: [Sister{ + sisters: [Sister{ name: 'ccc' }, Sister{ name: 'ddd' diff --git a/vlib/orm/orm_insert_test.v b/vlib/orm/orm_insert_test.v index 1a88e30a29044c..40efc880994bcc 100644 --- a/vlib/orm/orm_insert_test.v +++ b/vlib/orm/orm_insert_test.v @@ -305,7 +305,7 @@ fn test_orm_insert_with_multiple_child_elements() { name: 'Steve' }, ] - notes: [ + notes: [ Note{ text: 'First note' }, diff --git a/vlib/os/os_stat_default.c.v b/vlib/os/os_stat_default.c.v index 40a4fee9f7a5c2..d2362c5c96c587 100644 --- a/vlib/os/os_stat_default.c.v +++ b/vlib/os/os_stat_default.c.v @@ -88,13 +88,13 @@ pub fn (st Stat) get_filetype() FileType { // in owner/group/others format pub fn (st Stat) get_mode() FileMode { return FileMode{ - typ: st.get_filetype() - owner: FilePermission{ + typ: st.get_filetype() + owner: FilePermission{ read: (st.mode & u32(C.S_IRUSR)) != 0 write: (st.mode & u32(C.S_IWUSR)) != 0 execute: (st.mode & u32(C.S_IXUSR)) != 0 } - group: FilePermission{ + group: FilePermission{ read: (st.mode & u32(C.S_IRGRP)) != 0 write: (st.mode & u32(C.S_IWGRP)) != 0 execute: (st.mode & u32(C.S_IXGRP)) != 0 diff --git a/vlib/os/os_stat_windows.c.v b/vlib/os/os_stat_windows.c.v index 22072b01d1c02e..26778c709cfdef 100644 --- a/vlib/os/os_stat_windows.c.v +++ b/vlib/os/os_stat_windows.c.v @@ -51,13 +51,13 @@ pub fn (st Stat) get_filetype() FileType { // in owner/group/others format, however, they will all be the same for Windows pub fn (st Stat) get_mode() FileMode { return FileMode{ - typ: st.get_filetype() - owner: FilePermission{ + typ: st.get_filetype() + owner: FilePermission{ read: (st.mode & u32(C.S_IREAD)) != 0 write: (st.mode & u32(C.S_IWRITE)) != 0 execute: (st.mode & u32(C.S_IEXEC)) != 0 } - group: FilePermission{ + group: FilePermission{ read: (st.mode & u32(C.S_IREAD)) != 0 write: (st.mode & u32(C.S_IWRITE)) != 0 execute: (st.mode & u32(C.S_IEXEC)) != 0 diff --git a/vlib/sokol/gfx/enums.v b/vlib/sokol/gfx/enums.v index 388a7f99a05b34..81368ce9ef0527 100644 --- a/vlib/sokol/gfx/enums.v +++ b/vlib/sokol/gfx/enums.v @@ -382,5 +382,5 @@ pub enum UniformLayout as u32 { uniformlayout_native // default: layout depends on currently active backend uniformlayout_std140 // std140: memory layout according to std140 _num - _force_u32 = 0x7FFFFFFF + _force_u32 = 0x7FFFFFFF } diff --git a/vlib/v/ast/ast.v b/vlib/v/ast/ast.v index 59faaffc480901..d43e80dad09d67 100644 --- a/vlib/v/ast/ast.v +++ b/vlib/v/ast/ast.v @@ -338,6 +338,7 @@ pub: i int has_default_expr bool has_prev_newline bool + has_break_line bool attrs []Attr is_pub bool default_val string @@ -468,6 +469,7 @@ pub: end_comments []Comment next_comments []Comment has_prev_newline bool + has_break_line bool pub mut: expr Expr // `val1` name string // 'field1' @@ -573,6 +575,7 @@ pub: method_idx int rec_mut bool // is receiver mutable has_prev_newline bool + has_break_line bool rec_share ShareType language Language // V, C, JS file_mode Language // whether *the file*, where a function was a '.c.v', '.js.v' etc. @@ -1381,6 +1384,7 @@ pub: next_comments []Comment // comments between current EnumField and next EnumField has_expr bool // true, when .expr has a value has_prev_newline bool // empty newline before Enumfield + has_break_line bool attrs []Attr pub mut: expr Expr // the value of current EnumField; 123 in `ename = 123` diff --git a/vlib/v/ast/table.v b/vlib/v/ast/table.v index c10222323b6566..0cb6ac0db4ace1 100644 --- a/vlib/v/ast/table.v +++ b/vlib/v/ast/table.v @@ -98,7 +98,7 @@ pub fn new_table() &Table { global_scope: &Scope{ parent: unsafe { nil } } - cur_fn: unsafe { nil } + cur_fn: unsafe { nil } } t.register_builtin_type_symbols() t.is_fmt = true diff --git a/vlib/v/checker/assign.v b/vlib/v/checker/assign.v index 0f5996d853e417..0d4c909847686b 100644 --- a/vlib/v/checker/assign.v +++ b/vlib/v/checker/assign.v @@ -731,13 +731,13 @@ or use an explicit `unsafe{ a[..] }`, if you do not want a copy of the slice.', } node = ast.AssignStmt{ - op: .assign - pos: node.pos - end_comments: node.end_comments - left: node.left - right: [ + op: .assign + pos: node.pos + end_comments: node.end_comments + left: node.left + right: [ ast.Expr(ast.InfixExpr{ - left: ast.CastExpr{ + left: ast.CastExpr{ expr: node.left[0] typ: modified_left_type typname: c.table.type_str(modified_left_type) diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v index 854aa497be07fb..4e242dfc2b7a97 100644 --- a/vlib/v/checker/checker.v +++ b/vlib/v/checker/checker.v @@ -146,9 +146,9 @@ pub fn new_checker(table &ast.Table, pref_ &pref.Preferences) &Checker { timers_should_print = true } mut checker := &Checker{ - table: table - pref: pref_ - timers: util.new_timers( + table: table + pref: pref_ + timers: util.new_timers( should_print: timers_should_print label: 'checker' ) diff --git a/vlib/v/checker/infix.v b/vlib/v/checker/infix.v index 272e565ac0c13d..3187823758f46b 100644 --- a/vlib/v/checker/infix.v +++ b/vlib/v/checker/infix.v @@ -696,7 +696,7 @@ fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type { } node = ast.InfixExpr{ - left: ast.CastExpr{ + left: ast.CastExpr{ expr: node.left typ: modified_left_type typname: c.table.type_str(modified_left_type) diff --git a/vlib/v/checker/lambda_expr.v b/vlib/v/checker/lambda_expr.v index 96e40e594a9849..bc727722500116 100644 --- a/vlib/v/checker/lambda_expr.v +++ b/vlib/v/checker/lambda_expr.v @@ -107,7 +107,7 @@ pub fn (mut c Checker) lambda_expr(mut node ast.LambdaExpr, exp_typ ast.Type) as scope: node.scope.parent generic_names: generic_names } - typ: typ + typ: typ } if node.func.decl.generic_names.len > 0 { c.table.register_fn_generic_types(node.func.decl.fkey()) @@ -141,7 +141,7 @@ pub fn (mut c Checker) lambda_expr_fix_type_of_param(mut node ast.LambdaExpr, mu pub fn (mut c Checker) support_lambda_expr_in_sort(param_type ast.Type, return_type ast.Type, mut expr ast.LambdaExpr) { is_auto_rec := param_type.is_ptr() mut expected_fn := ast.Fn{ - params: [ + params: [ ast.Param{ name: 'zza' typ: param_type @@ -162,7 +162,7 @@ pub fn (mut c Checker) support_lambda_expr_in_sort(param_type ast.Type, return_t pub fn (mut c Checker) support_lambda_expr_one_param(param_type ast.Type, return_type ast.Type, mut expr ast.LambdaExpr) { mut expected_fn := ast.Fn{ - params: [ + params: [ ast.Param{ name: 'xx' typ: param_type diff --git a/vlib/v/checker/orm.v b/vlib/v/checker/orm.v index c8e81447bf558a..fb6b46622a3d47 100644 --- a/vlib/v/checker/orm.v +++ b/vlib/v/checker/orm.v @@ -72,12 +72,12 @@ fn (mut c Checker) sql_expr(mut node ast.SqlExpr) ast.Type { foreign_typ := c.get_field_foreign_table_type(field) mut subquery_expr := ast.SqlExpr{ - pos: node.pos - has_where: true - where_expr: ast.None{} - typ: field.typ.clear_flag(.option).set_flag(.result) - db_expr: node.db_expr - table_expr: ast.TypeNode{ + pos: node.pos + has_where: true + where_expr: ast.None{} + typ: field.typ.clear_flag(.option).set_flag(.result) + db_expr: node.db_expr + table_expr: ast.TypeNode{ pos: node.table_expr.pos typ: foreign_typ } @@ -89,9 +89,9 @@ fn (mut c Checker) sql_expr(mut node ast.SqlExpr) ast.Type { c.inside_sql = tmp_inside_sql subquery_expr.where_expr = ast.InfixExpr{ - op: .eq - pos: subquery_expr.pos - left: ast.Ident{ + op: .eq + pos: subquery_expr.pos + left: ast.Ident{ language: .v tok_kind: .eq scope: c.fn_scope @@ -102,7 +102,7 @@ fn (mut c Checker) sql_expr(mut node ast.SqlExpr) ast.Type { kind: .unresolved info: ast.IdentVar{} } - right: ast.Ident{ + right: ast.Ident{ language: .c mod: 'main' tok_kind: .eq @@ -299,9 +299,9 @@ fn (mut c Checker) sql_stmt_line(mut node ast.SqlStmtLine) ast.Type { foreign_typ := c.get_field_foreign_table_type(field) mut subquery_expr := ast.SqlStmtLine{ - pos: node.pos - kind: node.kind - table_expr: ast.TypeNode{ + pos: node.pos + kind: node.kind + table_expr: ast.TypeNode{ pos: node.table_expr.pos typ: foreign_typ } diff --git a/vlib/v/doc/doc.v b/vlib/v/doc/doc.v index d826b14188267e..893074c24cd8ca 100644 --- a/vlib/v/doc/doc.v +++ b/vlib/v/doc/doc.v @@ -99,10 +99,10 @@ pub fn (sk SymbolKind) str() string { @[minify] pub struct Doc { pub mut: - prefs &pref.Preferences = new_vdoc_preferences() - base_path string - table &ast.Table = ast.new_table() - checker checker.Checker = checker.Checker{ + prefs &pref.Preferences = new_vdoc_preferences() + base_path string + table &ast.Table = ast.new_table() + checker checker.Checker = checker.Checker{ table: unsafe { nil } pref: unsafe { nil } } diff --git a/vlib/v/fmt/align.v b/vlib/v/fmt/align.v index 79440e6dcee84e..47f982a2c05839 100644 --- a/vlib/v/fmt/align.v +++ b/vlib/v/fmt/align.v @@ -13,6 +13,7 @@ mut: struct AlignConfig { pub: ignore_newline bool // ignore newline or comment + use_break_line bool use_threshold bool threshold int = 25 } @@ -38,13 +39,14 @@ fn (mut fa FieldAlign) add_new_info(len int, line int) { } @[direct_array_access] -fn (mut fa FieldAlign) add_info(len int, line int) { +fn (mut fa FieldAlign) add_info(len int, line int, has_break_line bool) { if fa.infos.len == 0 { fa.add_new_info(len, line) return } i := fa.infos.len - 1 - if !fa.cfg.ignore_newline && line - fa.infos[i].line_nr > 1 { + if !fa.cfg.ignore_newline && ((fa.cfg.use_break_line && has_break_line) + || (!fa.cfg.use_break_line && line - fa.infos[i].line_nr > 1)) { fa.add_new_info(len, line) return } diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v index 61c14da39687c2..e0a5d123e6d50e 100644 --- a/vlib/v/fmt/fmt.v +++ b/vlib/v/fmt/fmt.v @@ -1039,28 +1039,28 @@ pub fn (mut f Fmt) enum_decl(node ast.EnumDecl) { f.writeln('enum ${name} {') f.comments(node.comments, same_line: true, level: .indent) - mut value_align := new_field_align() - mut attr_align := new_field_align() - mut comment_align := new_field_align() + mut value_align := new_field_align(use_break_line: true) + mut attr_align := new_field_align(use_threshold: true) + mut comment_align := new_field_align(use_threshold: true) for field in node.fields { if field.has_expr { - value_align.add_info(field.name.len, field.pos.line_nr) + value_align.add_info(field.name.len, field.pos.line_nr, field.has_break_line) } attrs_len := inline_attrs_len(field.attrs) if field.attrs.len > 0 { if field.has_expr { - attr_align.add_info(field.expr.str().len + 2, field.pos.line_nr) + attr_align.add_info(field.expr.str().len + 2, field.pos.line_nr, field.has_break_line) } else { - attr_align.add_info(field.name.len, field.pos.line_nr) + attr_align.add_info(field.name.len, field.pos.line_nr, field.has_break_line) } } if field.comments.len > 0 { if field.attrs.len > 0 { - comment_align.add_info(attrs_len, field.pos.line_nr) + comment_align.add_info(attrs_len, field.pos.line_nr, field.has_break_line) } else if field.has_expr { - comment_align.add_info(field.expr.str().len + 2, field.pos.line_nr) + comment_align.add_info(field.expr.str().len + 2, field.pos.line_nr, field.has_break_line) } else { - comment_align.add_info(field.name.len, field.pos.line_nr) + comment_align.add_info(field.name.len, field.pos.line_nr, field.has_break_line) } } } @@ -1397,7 +1397,7 @@ pub fn (mut f Fmt) interface_decl(node ast.InterfaceDecl) { } } - mut type_align := new_field_align() + mut type_align := new_field_align(use_break_line: true) mut comment_align := new_field_align(use_threshold: true) mut default_expr_align := new_field_align(use_threshold: true) mut attr_align := new_field_align(use_threshold: true) @@ -1412,7 +1412,7 @@ pub fn (mut f Fmt) interface_decl(node ast.InterfaceDecl) { end_comments := method.comments.filter(it.pos.pos > method.pos.pos) if end_comments.len > 0 { method_str := f.table.stringify_fn_decl(&method, f.cur_mod, f.mod2alias, false).all_after_first('fn ') - method_comment_align.add_info(method_str.len, method.pos.line_nr) + method_comment_align.add_info(method_str.len, method.pos.line_nr, method.has_break_line) } } @@ -1464,12 +1464,12 @@ pub fn (mut f Fmt) calculate_alignment(fields []ast.StructField, mut type_align field_types << ft attrs_len := inline_attrs_len(field.attrs) end_pos := field.pos.pos + field.pos.len - type_align.add_info(field.name.len, field.pos.line_nr) + type_align.add_info(field.name.len, field.pos.line_nr, field.has_break_line) if field.has_default_expr { - default_expr_align.add_info(ft.len, field.pos.line_nr) + default_expr_align.add_info(ft.len, field.pos.line_nr, field.has_break_line) } if field.attrs.len > 0 { - attr_align.add_info(ft.len, field.pos.line_nr) + attr_align.add_info(ft.len, field.pos.line_nr, field.has_break_line) } for comment in field.comments { if comment.pos.pos >= end_pos { @@ -1478,7 +1478,7 @@ pub fn (mut f Fmt) calculate_alignment(fields []ast.StructField, mut type_align if prev_state != AlignState.has_attributes { comment_align.add_new_info(attrs_len, comment.pos.line_nr) } else { - comment_align.add_info(attrs_len, comment.pos.line_nr) + comment_align.add_info(attrs_len, comment.pos.line_nr, field.has_break_line) } prev_state = AlignState.has_attributes } else if field.has_default_expr { @@ -1486,14 +1486,15 @@ pub fn (mut f Fmt) calculate_alignment(fields []ast.StructField, mut type_align comment_align.add_new_info(field.default_expr.str().len + 2, comment.pos.line_nr) } else { - comment_align.add_info(field.default_expr.str().len + 2, comment.pos.line_nr) + comment_align.add_info(field.default_expr.str().len + 2, comment.pos.line_nr, + field.has_break_line) } prev_state = AlignState.has_default_expression } else { if prev_state != AlignState.has_everything { comment_align.add_new_info(ft.len, comment.pos.line_nr) } else { - comment_align.add_info(ft.len, comment.pos.line_nr) + comment_align.add_info(ft.len, comment.pos.line_nr, field.has_break_line) } prev_state = AlignState.has_everything } diff --git a/vlib/v/fmt/struct.v b/vlib/v/fmt/struct.v index 8355b5d23a8d3f..b369f70f826854 100644 --- a/vlib/v/fmt/struct.v +++ b/vlib/v/fmt/struct.v @@ -26,7 +26,7 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) { f.writeln(' {}') return } - mut type_align := new_field_align() + mut type_align := new_field_align(use_break_line: true) mut default_expr_align := new_field_align(use_threshold: true) mut attr_align := new_field_align(use_threshold: true) mut comment_align := new_field_align(use_threshold: true) @@ -278,12 +278,13 @@ pub fn (mut f Fmt) struct_init(node ast.StructInit) { } f.comments(node.update_expr_comments, same_line: true, has_nl: true, level: .keep) } - mut value_align := new_field_align() + mut value_align := new_field_align(use_break_line: true) mut comment_align := new_field_align(use_threshold: true) for init_field in node.init_fields { - value_align.add_info(init_field.name.len, init_field.pos.line_nr) + value_align.add_info(init_field.name.len, init_field.pos.line_nr, init_field.has_break_line) if init_field.end_comments.len > 0 { - comment_align.add_info(init_field.expr.str().len, init_field.pos.line_nr) + comment_align.add_info(init_field.expr.str().len, init_field.pos.line_nr, + init_field.has_break_line) } } for i, init_field in node.init_fields { diff --git a/vlib/v/fmt/tests/array_init_comment_ending_keep.vv b/vlib/v/fmt/tests/array_init_comment_ending_keep.vv index 2740455a75160e..37da1f8715072f 100644 --- a/vlib/v/fmt/tests/array_init_comment_ending_keep.vv +++ b/vlib/v/fmt/tests/array_init_comment_ending_keep.vv @@ -2,7 +2,7 @@ import net.http const write_set_cookie_tests = [ ReadSetCookiesTestCase{ - header: { + header: { 'Set-Cookie': ['special-7=","'] } cookies: [&http.Cookie{ diff --git a/vlib/v/fmt/tests/enum_fields_with_empty_line_1_keep.vv b/vlib/v/fmt/tests/enum_fields_with_empty_line_1_keep.vv index 7f4258fbe8f038..c696a0ccc4966b 100644 --- a/vlib/v/fmt/tests/enum_fields_with_empty_line_1_keep.vv +++ b/vlib/v/fmt/tests/enum_fields_with_empty_line_1_keep.vv @@ -2,7 +2,7 @@ enum Info { aa = 1 // aa bbb // bbb - cccc = 5 /* cccc + cccc = 5 /* cccc --- cccc */ ddddd = 10 // ddddd diff --git a/vlib/v/fmt/tests/enum_fields_with_empty_line_2_keep.vv b/vlib/v/fmt/tests/enum_fields_with_empty_line_2_keep.vv index 0b34fb6e2ee270..0ce1bd17dc9731 100644 --- a/vlib/v/fmt/tests/enum_fields_with_empty_line_2_keep.vv +++ b/vlib/v/fmt/tests/enum_fields_with_empty_line_2_keep.vv @@ -2,7 +2,7 @@ enum Info { aa = 1 // aa bbb // bbb - cccc = 5 /* cccc + cccc = 5 /* cccc --- cccc */ ddddd = 10 // ddddd diff --git a/vlib/v/fmt/tests/structs_comments_keep.vv b/vlib/v/fmt/tests/structs_comments_keep.vv index 12d9dc97a7718f..c4c7c9d28afdf6 100644 --- a/vlib/v/fmt/tests/structs_comments_keep.vv +++ b/vlib/v/fmt/tests/structs_comments_keep.vv @@ -41,7 +41,7 @@ struct SomeStruct { mut: // 2 // 3 - somefield int /* + somefield int /* 9 10 */ diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 0e539337c89ac0..472b77af46aad6 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -332,10 +332,10 @@ pub fn gen(files []&ast.File, mut table ast.Table, pref_ &pref.Preferences) (str is_cc_msvc: pref_.ccompiler == 'msvc' use_segfault_handler: !('no_segfault_handler' in pref_.compile_defines || pref_.os in [.wasm32, .wasm32_emscripten]) - static_modifier: if pref_.parallel_cc { 'static' } else { '' } - has_reflection: 'v.reflection' in table.modules - has_debugger: 'v.debug' in table.modules - reflection_strings: &reflection_strings + static_modifier: if pref_.parallel_cc { 'static' } else { '' } + has_reflection: 'v.reflection' in table.modules + has_debugger: 'v.debug' in table.modules + reflection_strings: &reflection_strings } global_g.comptime = &comptime.ComptimeInfo{ @@ -2440,7 +2440,7 @@ fn (mut g Gen) get_sumtype_casting_fn(got_ ast.Type, exp_ ast.Type) string { } else { got_sym.idx } - exp: if exp_.has_flag(.option) { + exp: if exp_.has_flag(.option) { new_exp := ast.idx_to_type(exp).set_flag(.option) new_exp } else { diff --git a/vlib/v/gen/js/sourcemap/basic_test.v b/vlib/v/gen/js/sourcemap/basic_test.v index 452678485f15dd..d0ab9b636d8aa5 100644 --- a/vlib/v/gen/js/sourcemap/basic_test.v +++ b/vlib/v/gen/js/sourcemap/basic_test.v @@ -7,7 +7,7 @@ fn test_simple() { mlist := [ MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -18,7 +18,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 0 } @@ -29,7 +29,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 2 } @@ -40,7 +40,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 9 } @@ -51,7 +51,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 10 } @@ -62,7 +62,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 13 } @@ -73,7 +73,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 14 } @@ -84,7 +84,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 27 } @@ -95,7 +95,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 28 } @@ -106,7 +106,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 2 gen_column: 29 } @@ -117,7 +117,7 @@ fn test_simple() { } }, MappingInput{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 3 gen_column: 0 } diff --git a/vlib/v/gen/js/sourcemap/compare_test.v b/vlib/v/gen/js/sourcemap/compare_test.v index eec19873958603..b9614f016dce8d 100644 --- a/vlib/v/gen/js/sourcemap/compare_test.v +++ b/vlib/v/gen/js/sourcemap/compare_test.v @@ -2,7 +2,7 @@ module sourcemap fn test_cmp_eq() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -15,7 +15,7 @@ fn test_cmp_eq() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -32,7 +32,7 @@ fn test_cmp_eq() { fn test_cmp_name() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -45,7 +45,7 @@ fn test_cmp_name() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -62,7 +62,7 @@ fn test_cmp_name() { fn test_cmp_name_empty() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -75,7 +75,7 @@ fn test_cmp_name_empty() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -92,7 +92,7 @@ fn test_cmp_name_empty() { fn test_cmp_name_empty_empty() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -105,7 +105,7 @@ fn test_cmp_name_empty_empty() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -122,7 +122,7 @@ fn test_cmp_name_empty_empty() { fn test_cmp_source_position_empty_eq() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -132,7 +132,7 @@ fn test_cmp_source_position_empty_eq() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -146,7 +146,7 @@ fn test_cmp_source_position_empty_eq() { fn test_cmp_source_position_empty_diff() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -159,7 +159,7 @@ fn test_cmp_source_position_empty_diff() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -173,7 +173,7 @@ fn test_cmp_source_position_empty_diff() { fn test_cmp_source_position_column_diff() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -186,7 +186,7 @@ fn test_cmp_source_position_column_diff() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -203,7 +203,7 @@ fn test_cmp_source_position_column_diff() { fn test_cmp_source_position_line_diff() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -216,7 +216,7 @@ fn test_cmp_source_position_line_diff() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -233,7 +233,7 @@ fn test_cmp_source_position_line_diff() { fn test_cmp_sources() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -246,7 +246,7 @@ fn test_cmp_sources() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -263,7 +263,7 @@ fn test_cmp_sources() { fn test_cmp_gen_column() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -276,7 +276,7 @@ fn test_cmp_gen_column() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 99 } @@ -293,7 +293,7 @@ fn test_cmp_gen_column() { fn test_cmp_gen_line() { a := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 0 } @@ -306,7 +306,7 @@ fn test_cmp_gen_line() { } b := Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: 1 gen_column: 99 } diff --git a/vlib/v/gen/js/sourcemap/mappings.v b/vlib/v/gen/js/sourcemap/mappings.v index 0d2b35c9b80fa8..c4d0a02b93cac5 100644 --- a/vlib/v/gen/js/sourcemap/mappings.v +++ b/vlib/v/gen/js/sourcemap/mappings.v @@ -41,7 +41,7 @@ mut: fn new_mappings() Mappings { return Mappings{ - last: Mapping{ + last: Mapping{ GenPosition: GenPosition{ gen_column: 0 gen_line: 0 @@ -59,7 +59,7 @@ fn (mut m Mappings) add_mapping(gen_line u32, gen_column u32, sources_ind u32, s m.is_sorted = false } m.values << Mapping{ - GenPosition: GenPosition{ + GenPosition: GenPosition{ gen_line: gen_line gen_column: gen_column } diff --git a/vlib/v/gen/native/builtins.v b/vlib/v/gen/native/builtins.v index 9cd984d1671b7f..14b2427cd6f7ac 100644 --- a/vlib/v/gen/native/builtins.v +++ b/vlib/v/gen/native/builtins.v @@ -27,19 +27,19 @@ pub fn (mut g Gen) init_builtins() { // used to keep executable size small and the bytecode distraction-free .int_to_string: BuiltinFn{ // 32-bit signed integer to string conversion - body: fn (builtin BuiltinFn, mut g Gen) { + body: fn (builtin BuiltinFn, mut g Gen) { g.code_gen.convert_int_to_string(builtin.arg_regs[0], builtin.arg_regs[1]) } arg_regs: [Amd64Register.rcx, Amd64Register.rdi] } .bool_to_string: BuiltinFn{ - body: fn (builtin BuiltinFn, mut g Gen) { + body: fn (builtin BuiltinFn, mut g Gen) { g.code_gen.convert_bool_to_string(builtin.arg_regs[0]) } arg_regs: [Amd64Register.rax] } .reverse_string: BuiltinFn{ - body: fn (builtin BuiltinFn, mut g Gen) { + body: fn (builtin BuiltinFn, mut g Gen) { g.code_gen.reverse_string(builtin.arg_regs[0]) } arg_regs: [Amd64Register.rdi] diff --git a/vlib/v/gen/native/elf.v b/vlib/v/gen/native/elf.v index 7cf7ee4d1d6591..2e1c7a7f2973b9 100644 --- a/vlib/v/gen/native/elf.v +++ b/vlib/v/gen/native/elf.v @@ -453,7 +453,7 @@ fn (mut g Gen) create_section(name string, typ i32, link i32, info i32, addralig addralign: addralign entsize: entsize } - data: data + data: data } } diff --git a/vlib/v/gen/native/gen.v b/vlib/v/gen/native/gen.v index 1f89611524d828..2edff4d67c6901 100644 --- a/vlib/v/gen/native/gen.v +++ b/vlib/v/gen/native/gen.v @@ -338,8 +338,8 @@ pub fn gen(files []&ast.File, mut table ast.Table, out_name string, pref_ &pref. eprintln('No available backend for this configuration. Use `-a arm64` or `-a amd64`.') exit(1) } - structs: []Struct{len: table.type_symbols.len} - eval: eval.new_eval(table, pref_) + structs: []Struct{len: table.type_symbols.len} + eval: eval.new_eval(table, pref_) } g.code_gen.g = g diff --git a/vlib/v/parser/comptime.v b/vlib/v/parser/comptime.v index 21c0cd57623946..a6f7b68f77a18d 100644 --- a/vlib/v/parser/comptime.v +++ b/vlib/v/parser/comptime.v @@ -244,8 +244,8 @@ fn (mut p Parser) comptime_call() ast.ComptimeCall { embed_file: ast.EmbeddedFile{ compression_type: embed_compression_type } - args: [arg] - pos: start_pos.extend(p.prev_tok.pos()) + args: [arg] + pos: start_pos.extend(p.prev_tok.pos()) } } // Compile vweb html template to V code, parse that V code and embed the resulting V function diff --git a/vlib/v/parser/expr.v b/vlib/v/parser/expr.v index 31965a130ab4a0..d59c9660344334 100644 --- a/vlib/v/parser/expr.v +++ b/vlib/v/parser/expr.v @@ -462,7 +462,7 @@ fn (mut p Parser) check_expr(precedence int) !ast.Expr { kind: or_kind pos: or_pos } - scope: p.scope + scope: p.scope } } return node diff --git a/vlib/v/parser/fn.v b/vlib/v/parser/fn.v index 043d1b64894a25..85dbb403116b73 100644 --- a/vlib/v/parser/fn.v +++ b/vlib/v/parser/fn.v @@ -109,8 +109,8 @@ fn (mut p Parser) call_expr(language ast.Language, mod string) ast.CallExpr { kind: or_kind pos: or_pos } - scope: p.scope - comments: comments + scope: p.scope + comments: comments } } @@ -654,7 +654,7 @@ run them via `v file.v` instead', is_conditional: conditional_ctdefine_idx != ast.invalid_type_idx ctdefine_idx: conditional_ctdefine_idx // - receiver: ast.StructField{ + receiver: ast.StructField{ name: rec.name typ: rec.typ } @@ -870,7 +870,7 @@ fn (mut p Parser) anon_fn() ast.AnonFn { p.inside_defer = old_inside_defer // name := p.table.get_type_name(typ) return ast.AnonFn{ - decl: ast.FnDecl{ + decl: ast.FnDecl{ name: name short_name: '' mod: p.mod diff --git a/vlib/v/parser/orm.v b/vlib/v/parser/orm.v index db542db4db472a..4f26b5ebb37a7c 100644 --- a/vlib/v/parser/orm.v +++ b/vlib/v/parser/orm.v @@ -216,9 +216,9 @@ fn (mut p Parser) parse_sql_stmt_line() ast.SqlStmtLine { typ := p.parse_type() typ_pos := p.tok.pos() return ast.SqlStmtLine{ - kind: kind - pos: pos.extend(p.prev_tok.pos()) - table_expr: ast.TypeNode{ + kind: kind + pos: pos.extend(p.prev_tok.pos()) + table_expr: ast.TypeNode{ typ: typ pos: typ_pos } @@ -235,9 +235,9 @@ fn (mut p Parser) parse_sql_stmt_line() ast.SqlStmtLine { typ := p.parse_type() typ_pos := p.tok.pos() return ast.SqlStmtLine{ - kind: kind - pos: pos.extend(p.prev_tok.pos()) - table_expr: ast.TypeNode{ + kind: kind + pos: pos.extend(p.prev_tok.pos()) + table_expr: ast.TypeNode{ typ: typ pos: typ_pos } @@ -314,7 +314,7 @@ fn (mut p Parser) parse_sql_stmt_line() ast.SqlStmtLine { } } return ast.SqlStmtLine{ - table_expr: ast.TypeNode{ + table_expr: ast.TypeNode{ typ: table_type pos: table_pos } diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v index 1a831e2b66cebf..2ac63336231c7b 100644 --- a/vlib/v/parser/parser.v +++ b/vlib/v/parser/parser.v @@ -166,10 +166,10 @@ pub fn parse_text(text string, path string, mut table ast.Table, comments_mode s eprintln('> ${@MOD}.${@FN} comments_mode: ${comments_mode:-20} | path: ${path:-20} | text: ${text}') } mut p := Parser{ - scanner: scanner.new_scanner(text, comments_mode, pref_) - table: table - pref: pref_ - scope: &ast.Scope{ + scanner: scanner.new_scanner(text, comments_mode, pref_) + table: table + pref: pref_ + scope: &ast.Scope{ start_pos: 0 parent: table.global_scope } @@ -246,10 +246,10 @@ pub fn parse_file(path string, mut table ast.Table, comments_mode scanner.Commen eprintln('> ${@MOD}.${@FN} comments_mode: ${comments_mode:-20} | path: ${path}') } mut p := Parser{ - scanner: scanner.new_scanner_file(path, comments_mode, pref_) or { panic(err) } - table: table - pref: pref_ - scope: &ast.Scope{ + scanner: scanner.new_scanner_file(path, comments_mode, pref_) or { panic(err) } + table: table + pref: pref_ + scope: &ast.Scope{ start_pos: 0 parent: table.global_scope } @@ -523,6 +523,12 @@ fn (p &Parser) has_prev_newline() bool { return false } +fn (p &Parser) has_prev_line_comment_or_label() bool { + return p.prev_tok.kind == .colon || (p.prev_tok.kind == .comment + && p.tok.line_nr - p.prev_tok.line_nr == 1 + && p.prev_tok.line_nr - p.peek_token(-2).line_nr > 0) +} + fn (p &Parser) is_array_type() bool { mut i := 1 mut tok := p.tok @@ -2244,7 +2250,7 @@ fn (mut p Parser) parse_multi_expr(is_top_level bool) ast.Stmt { vals: left pos: tok.pos() } - pos: pos + pos: pos } } @@ -2327,7 +2333,7 @@ fn (mut p Parser) ident(language ast.Language) ast.Ident { is_volatile: false is_option: is_option } - scope: p.scope + scope: p.scope } } is_following_concrete_types := p.is_following_concrete_types() @@ -2368,16 +2374,16 @@ fn (mut p Parser) ident(language ast.Language) ast.Ident { } } return ast.Ident{ - tok_kind: p.tok.kind - kind: .unresolved - name: name - comptime: p.comptime_if_cond - language: language - mod: p.mod - pos: pos - is_mut: is_mut - mut_pos: mut_pos - info: ast.IdentVar{ + tok_kind: p.tok.kind + kind: .unresolved + name: name + comptime: p.comptime_if_cond + language: language + mod: p.mod + pos: pos + is_mut: is_mut + mut_pos: mut_pos + info: ast.IdentVar{ typ: typ is_mut: is_mut is_static: is_static @@ -2385,8 +2391,8 @@ fn (mut p Parser) ident(language ast.Language) ast.Ident { is_option: or_kind != ast.OrKind.absent share: ast.sharetype_from_flags(is_shared, is_atomic) } - scope: p.scope - or_expr: ast.OrExpr{ + scope: p.scope + or_expr: ast.OrExpr{ kind: or_kind stmts: or_stmts pos: or_pos @@ -2911,7 +2917,7 @@ fn (mut p Parser) name_expr() ast.Expr { } pos.extend(p.tok.pos()) return ast.SelectorExpr{ - expr: ast.Ident{ + expr: ast.Ident{ name: name scope: p.scope } @@ -2943,10 +2949,10 @@ fn (mut p Parser) name_expr() ast.Expr { field_name := p.check_name() pos.extend(p.tok.pos()) return ast.Ident{ - name: p.prepend_mod(typ_name) + '__static__' + field_name - mod: p.mod - kind: .function - info: ast.IdentFn{ + name: p.prepend_mod(typ_name) + '__static__' + field_name + mod: p.mod + kind: .function + info: ast.IdentFn{ typ: fn_type } pos: pos @@ -3102,16 +3108,16 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { if p.tok.kind == .key_orelse { or_stmts_high, or_pos_high = p.or_block(.no_err_var) return ast.IndexExpr{ - left: left - pos: pos_high - index: ast.RangeExpr{ + left: left + pos: pos_high + index: ast.RangeExpr{ low: ast.empty_expr high: high has_high: has_high pos: pos_high is_gated: is_gated } - or_expr: ast.OrExpr{ + or_expr: ast.OrExpr{ kind: .block stmts: or_stmts_high pos: or_pos_high @@ -3131,16 +3137,16 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { } return ast.IndexExpr{ - left: left - pos: pos_high - index: ast.RangeExpr{ + left: left + pos: pos_high + index: ast.RangeExpr{ low: ast.empty_expr high: high has_high: has_high pos: pos_high is_gated: is_gated } - or_expr: ast.OrExpr{ + or_expr: ast.OrExpr{ kind: or_kind_high stmts: or_stmts_high pos: or_pos_high @@ -3170,9 +3176,9 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { if p.tok.kind == .key_orelse { or_stmts_low, or_pos_low = p.or_block(.no_err_var) return ast.IndexExpr{ - left: left - pos: pos_low - index: ast.RangeExpr{ + left: left + pos: pos_low + index: ast.RangeExpr{ low: expr high: high has_high: has_high @@ -3180,7 +3186,7 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { pos: pos_low is_gated: is_gated } - or_expr: ast.OrExpr{ + or_expr: ast.OrExpr{ kind: .block stmts: or_stmts_low pos: or_pos_low @@ -3200,9 +3206,9 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { } return ast.IndexExpr{ - left: left - pos: pos_low - index: ast.RangeExpr{ + left: left + pos: pos_low + index: ast.RangeExpr{ low: expr high: high has_high: has_high @@ -3210,7 +3216,7 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { pos: pos_low is_gated: is_gated } - or_expr: ast.OrExpr{ + or_expr: ast.OrExpr{ kind: or_kind_low stmts: or_stmts_low pos: or_pos_low @@ -3229,10 +3235,10 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { if p.tok.kind == .key_orelse { or_stmts, or_pos = p.or_block(.no_err_var) return ast.IndexExpr{ - left: left - index: expr - pos: pos - or_expr: ast.OrExpr{ + left: left + index: expr + pos: pos + or_expr: ast.OrExpr{ kind: .block stmts: or_stmts pos: or_pos @@ -3251,10 +3257,10 @@ fn (mut p Parser) index_expr(left ast.Expr, is_gated bool) ast.IndexExpr { } } return ast.IndexExpr{ - left: left - index: expr - pos: pos - or_expr: ast.OrExpr{ + left: left + index: expr + pos: pos + or_expr: ast.OrExpr{ kind: or_kind stmts: or_stmts pos: or_pos @@ -3342,8 +3348,8 @@ fn (mut p Parser) dot_expr(left ast.Expr) ast.Expr { kind: or_kind pos: or_pos } - scope: p.scope - comments: comments + scope: p.scope + comments: comments } return mcall_expr } @@ -4171,6 +4177,7 @@ fn (mut p Parser) enum_decl() ast.EnumDecl { pre_comments := p.eat_comments() pos := p.tok.pos() has_prev_newline := p.has_prev_newline() + has_break_line := has_prev_newline || p.has_prev_line_comment_or_label() val := p.check_name() vals << val mut expr := ast.empty_expr @@ -4198,6 +4205,7 @@ fn (mut p Parser) enum_decl() ast.EnumDecl { expr: expr has_expr: has_expr has_prev_newline: has_prev_newline + has_break_line: has_break_line pre_comments: pre_comments comments: comments next_comments: next_comments @@ -4293,11 +4301,11 @@ fn (mut p Parser) enum_decl() ast.EnumDecl { } idx := p.table.register_sym(ast.TypeSymbol{ - kind: .enum_ - name: name - cname: util.no_dots(name) - mod: p.mod - info: ast.Enum{ + kind: .enum_ + name: name + cname: util.no_dots(name) + mod: p.mod + info: ast.Enum{ vals: vals is_flag: is_flag is_multi_allowed: is_multi_allowed @@ -4408,11 +4416,11 @@ fn (mut p Parser) type_decl() ast.TypeDecl { variant_types := sum_variants.map(it.typ) prepend_mod_name := p.prepend_mod(name) typ := p.table.register_sym(ast.TypeSymbol{ - kind: .sum_type - name: prepend_mod_name - cname: util.no_dots(prepend_mod_name) - mod: p.mod - info: ast.SumType{ + kind: .sum_type + name: prepend_mod_name + cname: util.no_dots(prepend_mod_name) + mod: p.mod + info: ast.SumType{ variants: variant_types is_generic: generic_types.len > 0 generic_types: generic_types @@ -4462,7 +4470,7 @@ fn (mut p Parser) type_decl() ast.TypeDecl { parent_type: parent_type language: parent_language } - is_pub: is_pub + is_pub: is_pub }) type_end_pos := p.prev_tok.pos() if idx in [ast.string_type_idx, ast.rune_type_idx, ast.array_type_idx, ast.map_type_idx] { diff --git a/vlib/v/parser/struct.v b/vlib/v/parser/struct.v index 1d6ef1f1522c2c..d0a518ad30b366 100644 --- a/vlib/v/parser/struct.v +++ b/vlib/v/parser/struct.v @@ -193,6 +193,7 @@ fn (mut p Parser) struct_decl(is_anon bool) ast.StructDecl { || p.peek_tok.kind == .dot) && language == .v && p.peek_tok.kind != .key_fn is_on_top := ast_fields.len == 0 && !(is_field_pub || is_field_mut || is_field_global) has_prev_newline := p.has_prev_newline() + has_break_line := has_prev_newline || p.has_prev_line_comment_or_label() mut field_name := '' mut typ := ast.no_type mut type_pos := token.Pos{} @@ -311,6 +312,7 @@ fn (mut p Parser) struct_decl(is_anon bool) ast.StructDecl { default_expr: default_expr has_default_expr: has_default_expr has_prev_newline: has_prev_newline + has_break_line: has_break_line attrs: p.attrs is_pub: is_embed || is_field_pub is_mut: is_embed || is_field_mut @@ -369,7 +371,7 @@ fn (mut p Parser) struct_decl(is_anon bool) ast.StructDecl { attrs: attrs is_anon: is_anon } - is_pub: is_pub + is_pub: is_pub } if p.table.has_deep_child_no_ref(&sym, name) { p.error_with_pos('invalid recursive struct `${orig_name}`', name_pos) @@ -431,6 +433,7 @@ fn (mut p Parser) struct_init(typ_str string, kind ast.StructInitKind, is_option mut has_update_expr := false mut update_expr_pos := token.Pos{} mut has_prev_newline := false + mut has_break_line := false for p.tok.kind !in [.rcbr, .rpar, .eof] { mut field_name := '' mut expr := ast.empty_expr @@ -457,6 +460,7 @@ fn (mut p Parser) struct_init(typ_str string, kind ast.StructInitKind, is_option prev_comments = p.eat_comments() first_field_pos = p.tok.pos() has_prev_newline = p.has_prev_newline() + has_break_line = has_prev_newline || p.has_prev_line_comment_or_label() field_name = p.check_name() p.check(.colon) expr = p.expr(0) @@ -491,6 +495,7 @@ fn (mut p Parser) struct_init(typ_str string, kind ast.StructInitKind, is_option next_comments: nline_comments parent_type: typ has_prev_newline: has_prev_newline + has_break_line: has_break_line } } } @@ -513,11 +518,11 @@ fn (mut p Parser) struct_init(typ_str string, kind ast.StructInitKind, is_option } else { p.prev_tok.pos() }) - no_keys: no_keys - is_short_syntax: kind == .short_syntax - is_anon: kind == .anon - pre_comments: pre_comments - generic_types: struct_init_generic_types + no_keys: no_keys + is_short_syntax: kind == .short_syntax + is_anon: kind == .anon + pre_comments: pre_comments + generic_types: struct_init_generic_types } } @@ -563,12 +568,12 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl { } // Declare the type reg_idx := p.table.register_sym( - is_pub: is_pub - kind: .interface_ - name: interface_name - cname: util.no_dots(interface_name) - mod: p.mod - info: ast.Interface{ + is_pub: is_pub + kind: .interface_ + name: interface_name + cname: util.no_dots(interface_name) + mod: p.mod + info: ast.Interface{ types: [] is_generic: generic_types.len > 0 generic_types: generic_types @@ -665,6 +670,7 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl { if p.peek_tok.kind == .lpar { method_start_pos := p.tok.pos() has_prev_newline := p.has_prev_newline() + has_break_line := has_prev_newline || p.has_prev_line_comment_or_label() line_nr := p.tok.line_nr name := p.check_name() @@ -698,6 +704,7 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl { pos: method_start_pos.extend(p.prev_tok.pos()) scope: p.scope has_prev_newline: has_prev_newline + has_break_line: has_break_line } if p.tok.kind.is_start_of_type() && p.tok.line_nr == line_nr { method.return_type_pos = p.tok.pos() @@ -726,6 +733,7 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl { // interface fields field_pos := p.tok.pos() has_prev_newline := p.has_prev_newline() + has_break_line := has_prev_newline || p.has_prev_line_comment_or_label() field_name := p.check_name() mut type_pos := p.tok.pos() field_typ := p.parse_type() @@ -739,6 +747,7 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl { comments: comments is_pub: true has_prev_newline: has_prev_newline + has_break_line: has_break_line } info.fields << ast.StructField{ name: field_name @@ -746,6 +755,7 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl { is_pub: true is_mut: is_mut has_prev_newline: has_prev_newline + has_break_line: has_break_line } } } diff --git a/vlib/v/parser/tmpl.v b/vlib/v/parser/tmpl.v index 728bea79874754..34e304755bbf70 100644 --- a/vlib/v/parser/tmpl.v +++ b/vlib/v/parser/tmpl.v @@ -265,7 +265,7 @@ fn vweb_tmpl_${fn_name}() string { pos: start_of_line_pos + position last_line: lines.len } - reporter: .parser + reporter: .parser }) continue } @@ -280,7 +280,7 @@ fn vweb_tmpl_${fn_name}() string { pos: start_of_line_pos + position last_line: lines.len } - reporter: .parser + reporter: .parser }) continue } @@ -298,7 +298,7 @@ fn vweb_tmpl_${fn_name}() string { col: err.col() last_line: lines.len } - reporter: .parser + reporter: .parser }) []string{} } else { @@ -311,7 +311,7 @@ fn vweb_tmpl_${fn_name}() string { pos: start_of_line_pos last_line: lines.len } - reporter: .parser + reporter: .parser }) []string{} } diff --git a/vlib/v/tests/builtin_arrays/array_filter_using_direct_closure_test.v b/vlib/v/tests/builtin_arrays/array_filter_using_direct_closure_test.v index 5792487190794f..94eec19af57fb6 100644 --- a/vlib/v/tests/builtin_arrays/array_filter_using_direct_closure_test.v +++ b/vlib/v/tests/builtin_arrays/array_filter_using_direct_closure_test.v @@ -16,8 +16,8 @@ fn test_array_filter_using_direct_closure() { filenames := ['one', 'two', 'three'] files := filenames.map(fn (f string) File { return File{ - name: f - typ: if f == 'one' { + name: f + typ: if f == 'one' { 'file' } else { 'dir' diff --git a/vlib/v/tests/comptime/comptime_selector_ptr_test.v b/vlib/v/tests/comptime/comptime_selector_ptr_test.v index 174cac62bf513a..1c1172694433ad 100644 --- a/vlib/v/tests/comptime/comptime_selector_ptr_test.v +++ b/vlib/v/tests/comptime/comptime_selector_ptr_test.v @@ -32,7 +32,7 @@ fn test_main() { association: &Association{ price: APrice{} } - price: APrice{} + price: APrice{} } assert get_value_from_ref(&Association{ diff --git a/vlib/v/tests/conditions/ifs/if_smartcast_test.v b/vlib/v/tests/conditions/ifs/if_smartcast_test.v index e41785c9137755..cfc6d1ff724bde 100644 --- a/vlib/v/tests/conditions/ifs/if_smartcast_test.v +++ b/vlib/v/tests/conditions/ifs/if_smartcast_test.v @@ -288,7 +288,7 @@ pub mut: fn test_nested_pointer_smartcast() { mut s := All_in_one{ - ptr: &Sum1(Foo1{ + ptr: &Sum1(Foo1{ a: 1 }) ptrs: [&SumAll(Sum2(Bar1{ diff --git a/vlib/v/tests/options/option_auto_eq_test.v b/vlib/v/tests/options/option_auto_eq_test.v index 87cb8d6d70ca26..e0653a375c3408 100644 --- a/vlib/v/tests/options/option_auto_eq_test.v +++ b/vlib/v/tests/options/option_auto_eq_test.v @@ -11,7 +11,7 @@ pub fn PartialEmoji.parse(j json2.Any) !PartialEmoji { match j { map[string]json2.Any { return PartialEmoji{ - id: if s := j['id'] { + id: if s := j['id'] { if s !is json2.Null { ?int(s.int()) } else { @@ -56,13 +56,13 @@ pub fn Button.parse(j json2.Any) !Button { match j { map[string]json2.Any { return Button{ - style: unsafe { ButtonStyle(j['style']!.int()) } - label: if s := j['label'] { + style: unsafe { ButtonStyle(j['style']!.int()) } + label: if s := j['label'] { ?string(s as string) } else { none } - emoji: if o := j['emoji'] { + emoji: if o := j['emoji'] { dump(PartialEmoji.parse(o)!) ?PartialEmoji(PartialEmoji.parse(o)!) } else { @@ -73,12 +73,12 @@ pub fn Button.parse(j json2.Any) !Button { } else { none } - url: if s := j['url'] { + url: if s := j['url'] { ?string(s as string) } else { none } - disabled: if b := j['disabled'] { + disabled: if b := j['disabled'] { ?bool(b as bool) } else { none diff --git a/vlib/v/token/token.v b/vlib/v/token/token.v index cabec6c14c9483..e6072ab2c79287 100644 --- a/vlib/v/token/token.v +++ b/vlib/v/token/token.v @@ -76,12 +76,12 @@ pub enum Kind { lsbr // [ nilsbr // #[ rsbr // ] - eq // == - ne // != - gt // > - lt // < - ge // >= - le // <= + eq // == + ne // != + gt // > + lt // < + ge // >= + le // <= comment nl dot // . diff --git a/vlib/v/transformer/transformer.v b/vlib/v/transformer/transformer.v index 6896d83d6f2aeb..8fdcd7eab716f4 100644 --- a/vlib/v/transformer/transformer.v +++ b/vlib/v/transformer/transformer.v @@ -1145,7 +1145,7 @@ pub fn (mut t Transformer) fn_decl_trace_calls(mut node ast.FnDecl) { expr: ast.StringLiteral{ val: fname } - typ: ast.string_type_idx + typ: ast.string_type_idx }, ] } diff --git a/vlib/v2/ast/desugar.v b/vlib/v2/ast/desugar.v index c03e06ebe02e3b..64b09d6f6a91ed 100644 --- a/vlib/v2/ast/desugar.v +++ b/vlib/v2/ast/desugar.v @@ -54,7 +54,7 @@ pub fn (or_expr &OrExpr) desugar() Expr { // args: [or_expr.expr.lhs, or_expr.expr.expr] // } // array.len - cond: InfixExpr{ + cond: InfixExpr{ lhs: SelectorExpr{ lhs: or_expr.expr.lhs rhs: Ident{ @@ -64,7 +64,7 @@ pub fn (or_expr &OrExpr) desugar() Expr { op: .gt rhs: or_expr.expr.expr } - stmts: [ExprStmt{ + stmts: [ExprStmt{ expr: or_expr.expr }] else_expr: IfExpr{ @@ -73,7 +73,7 @@ pub fn (or_expr &OrExpr) desugar() Expr { } } else { return IfExpr{ - cond: InfixExpr{ + cond: InfixExpr{ lhs: or_expr.expr op: .eq rhs: BasicLiteral{ diff --git a/vlib/veb/csrf/csrf_test.v b/vlib/veb/csrf/csrf_test.v index 6a64404633ed2f..7de50ac794fd42 100644 --- a/vlib/veb/csrf/csrf_test.v +++ b/vlib/veb/csrf/csrf_test.v @@ -49,7 +49,7 @@ fn test_protect() { form: { csrf_config.token_name: token } - req: http.Request{ + req: http.Request{ method: .post } } @@ -82,7 +82,7 @@ fn test_timeout() { form: { short_time_config.token_name: token } - req: http.Request{ + req: http.Request{ method: .post } } @@ -107,7 +107,7 @@ fn test_valid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } mut valid := csrf.protect(mut ctx, csrf_config_origin) @@ -127,7 +127,7 @@ fn test_invalid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } mut valid := csrf.protect(mut ctx, csrf_config_origin) @@ -142,7 +142,7 @@ fn test_invalid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } valid = csrf.protect(mut ctx, csrf_config_origin) @@ -156,7 +156,7 @@ fn test_invalid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } valid = csrf.protect(mut ctx, csrf_config_origin) diff --git a/vlib/veb/tests/large_payload_test.v b/vlib/veb/tests/large_payload_test.v index eb0898a8d11a54..fa5d509ab83151 100644 --- a/vlib/veb/tests/large_payload_test.v +++ b/vlib/veb/tests/large_payload_test.v @@ -90,7 +90,7 @@ fn test_bigger_content_length() { header: http.new_header_from_map({ .content_length: '10' }) - data: data + data: data })! // Content-length is larger than the data sent, so the request should timeout @@ -105,7 +105,7 @@ fn test_smaller_content_length() { header: http.new_header_from_map({ .content_length: '5' }) - data: data + data: data })! assert x.status() == .bad_request diff --git a/vlib/vweb/csrf/csrf_test.v b/vlib/vweb/csrf/csrf_test.v index 394356034eeaab..b3fbb06b397a71 100644 --- a/vlib/vweb/csrf/csrf_test.v +++ b/vlib/vweb/csrf/csrf_test.v @@ -108,7 +108,7 @@ fn test_valid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } mut valid := csrf.protect(mut ctx, csrf_config_origin) @@ -127,7 +127,7 @@ fn test_invalid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } mut valid := csrf.protect(mut ctx, csrf_config_origin) @@ -142,7 +142,7 @@ fn test_invalid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } valid = csrf.protect(mut ctx, csrf_config_origin) @@ -156,7 +156,7 @@ fn test_invalid_origin() { form: { csrf_config.token_name: token } - req: req + req: req } valid = csrf.protect(mut ctx, csrf_config_origin) @@ -233,7 +233,7 @@ fn exit_after_timeout[T](mut app T, timeout_in_ms int) { fn test_run_app_in_background() { mut app := &App{ - csrf: csrf.CsrfApp{ + csrf: csrf.CsrfApp{ secret: 'my-256bit-secret' allowed_hosts: [allowed_origin] session_cookie: session_id_cookie_name diff --git a/vlib/x/json2/decoder.v b/vlib/x/json2/decoder.v index 047684de5de8a0..90883a5993e4f4 100644 --- a/vlib/x/json2/decoder.v +++ b/vlib/x/json2/decoder.v @@ -112,7 +112,7 @@ fn skip_bom(file_content string) string { fn new_parser(srce string, convert_type bool) Parser { src := skip_bom(srce) return Parser{ - scanner: &Scanner{ + scanner: &Scanner{ text: src.bytes() } convert_type: convert_type diff --git a/vlib/x/json2/tests/json_module_compatibility_test/json_test.v b/vlib/x/json2/tests/json_module_compatibility_test/json_test.v index 3f2cc788d127d6..d95dfd2887e599 100644 --- a/vlib/x/json2/tests/json_module_compatibility_test/json_test.v +++ b/vlib/x/json2/tests/json_module_compatibility_test/json_test.v @@ -277,7 +277,7 @@ fn test_encoding_struct_with_pointers() { association: &Association{ price: APrice{} } - price: APrice{} + price: APrice{} } // println(value) assert json.encode(value) == '{"association":{"price":{}},"price":{}}' @@ -314,7 +314,7 @@ fn test_nested_type() { cities: [City{'Donlon'}, City{'Termanches'}] }, ] - users: { + users: { 'Foo': User{ age: 10 nums: [1, 2, 3] @@ -332,7 +332,7 @@ fn test_nested_type() { pets: 'little boo' } } - extra: { + extra: { '2': { 'n1': 2 'n2': 4 diff --git a/vlib/x/sessions/tests/session_app_test.v b/vlib/x/sessions/tests/session_app_test.v index d6a685ff13d677..6523f17a79f67e 100644 --- a/vlib/x/sessions/tests/session_app_test.v +++ b/vlib/x/sessions/tests/session_app_test.v @@ -94,7 +94,7 @@ fn testsuite_begin() { cookie_options: sessions.CookieOptions{ cookie_name: cookie_name } - max_age: max_age + max_age: max_age } } diff --git a/vlib/x/vweb/tests/large_payload_test.v b/vlib/x/vweb/tests/large_payload_test.v index a67c3e09db735b..f187952f4b0927 100644 --- a/vlib/x/vweb/tests/large_payload_test.v +++ b/vlib/x/vweb/tests/large_payload_test.v @@ -90,7 +90,7 @@ fn test_bigger_content_length() { header: http.new_header_from_map({ .content_length: '10' }) - data: data + data: data })! // Content-length is larger than the data sent, so the request should timeout @@ -105,7 +105,7 @@ fn test_smaller_content_length() { header: http.new_header_from_map({ .content_length: '5' }) - data: data + data: data })! assert x.status() == .bad_request