From 9051ac8921da3e2dcbf1785ceffa7f11fea36f5c Mon Sep 17 00:00:00 2001 From: Turiiya <34311583+ttytm@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:21:15 +0200 Subject: [PATCH] all: fix typos (#19634) --- .github/workflows/bootstrapping_works_ci.yml | 2 +- GNUmakefile | 2 +- cmd/tools/test_os_process.v | 2 +- .../tests/testdata/newlines/main.comments.out | 2 +- cmd/tools/vdoc/tests/testdata/newlines/main.v | 2 +- examples/graphs/bellman-ford.v | 2 +- examples/graphs/dijkstra.v | 4 +- examples/graphs/minimal_spann_tree_prim.v | 8 ++-- .../sokol/03_march_tracing_glsl/rt_glsl.v | 16 ++++---- vlib/arrays/map_of.v | 2 +- vlib/builtin/array.v | 6 +-- vlib/builtin/array_d_gcboehm_opt.v | 2 +- vlib/builtin/int_test.v | 10 ++--- vlib/builtin/js/string.js.v | 4 +- vlib/builtin/string.v | 14 +++---- vlib/builtin/string_interpolation.v | 2 +- .../ed25519/internal/edwards25519/extra.v | 2 +- .../ed25519/internal/edwards25519/table.v | 2 +- vlib/crypto/md5/md5block_generic.v | 2 +- vlib/crypto/pem/decode.v | 16 ++++---- vlib/crypto/sha1/sha1block_generic.v | 2 +- vlib/crypto/sha256/sha256block_generic.v | 2 +- vlib/crypto/sha512/sha512block_generic.v | 2 +- vlib/io/reader.v | 2 +- vlib/net/http/cookie.v | 2 +- vlib/net/tcp.v | 2 +- vlib/os/file.c.v | 4 +- vlib/os/file_test.v | 2 +- vlib/os/filepath.v | 2 +- vlib/os/os.c.v | 6 +-- vlib/os/os.v | 28 ++++++------- vlib/os/os_android_outside_termux.c.v | 2 +- vlib/os/os_test.v | 2 +- vlib/os/process_nix.c.v | 2 +- vlib/regex/regex.v | 2 +- vlib/sync/stdatomic/atomic.c.v | 2 +- vlib/time/private_test.v | 2 +- vlib/time/time.v | 2 +- vlib/time/time_nix.c.v | 2 +- vlib/time/time_windows.c.v | 4 +- vlib/toml/any.v | 4 +- vlib/toml/checker/checker.v | 4 +- vlib/toml/scanner/scanner.v | 2 +- vlib/toml/tests/iarna_toml_spec_test.v | 2 +- vlib/toml/token/pos.v | 4 +- vlib/toml/token/token.v | 6 +-- vlib/v/checker/assign.v | 2 +- vlib/v/checker/fn.v | 2 +- .../tests/infix_sumtype_in_array_err.out | 2 +- .../tests/infix_sumtype_in_array_err.vv | 2 +- vlib/v/eval/eval.v | 2 +- vlib/v/eval/expr.v | 4 +- vlib/v/fmt/tests/infix_expr_expected.vv | 2 +- vlib/v/fmt/tests/infix_expr_input.vv | 2 +- vlib/v/gen/c/cgen.v | 24 ++++++------ vlib/v/gen/c/fn.v | 2 +- vlib/v/gen/c/infix.v | 2 +- vlib/v/gen/c/reflection.v | 2 +- vlib/v/gen/c/str_intp.v | 2 +- .../check_combination_of_alias_and_sumtype.vv | 4 +- vlib/v/gen/c/utils.v | 2 +- vlib/v/gen/js/js.v | 8 ++-- vlib/v/gen/js/jsgen_test.v | 2 +- vlib/v/gen/js/util.v | 2 +- vlib/v/gen/native/amd64.v | 4 +- vlib/v/gen/native/builtins.v | 2 +- vlib/v/gen/native/elf.v | 2 +- vlib/v/gen/native/expr.v | 2 +- vlib/v/gen/native/gen.v | 6 +-- vlib/v/gen/native/pe.v | 12 +++--- vlib/v/gen/wasm/mem.v | 2 +- vlib/v/live/live_test.v | 2 +- vlib/v/pref/default.v | 4 +- vlib/v/pref/pref.v | 10 ++--- vlib/v/preludes/test_runner.v | 4 +- vlib/v/slow_tests/assembly/asm_test.amd64.v | 2 +- vlib/v/slow_tests/assembly/asm_test.i386.v | 2 +- vlib/v/tests/array_slice_test.v | 2 +- vlib/v/tests/autolock_array2_test.v | 2 +- .../comptime_call_tmpl_variable_scope_test.v | 2 +- vlib/v/tests/generic_complex_sumtype_test.v | 2 +- .../generics_return_generics_struct_test.v | 2 +- vlib/v/tests/go_wait_option_test.v | 4 +- .../tests/interface_embedding_complex_test.v | 2 +- ...ith_complex_sumtype_exprs_add_print_test.v | 2 +- .../match_with_complex_sumtype_exprs_test.v | 2 +- .../project_with_c_code_3/mod1/wrapper.v | 4 +- vlib/v/tests/retry_test.v | 2 +- vlib/v/tests/shared_unordered_mixed_test.v | 2 +- .../v/tests/string_interpolation_array_test.v | 2 +- vlib/v/tests/struct_test.v | 6 +-- vlib/v/tests/sumtype_equality_test.v | 2 +- vlib/v/tests/var_option_struct_test.v | 2 +- vlib/v/token/keywords_matcher_trie.v | 2 +- vlib/v/token/pos.v | 4 +- vlib/v/transformer/index_state.v | 2 +- vlib/v/transformer/transformer.v | 2 +- vlib/v/util/suggestions.v | 2 +- vlib/v/util/util.v | 2 +- vlib/vweb/README.md | 2 +- vlib/vweb/vweb.v | 6 +-- vlib/x/json2/scanner.v | 4 +- vlib/x/ttf/README.md | 39 +++++++++++++++---- vlib/x/ttf/common.v | 2 +- vlib/x/ttf/render_bmp.v | 8 ++-- vlib/x/ttf/render_sokol_cpu.v | 4 +- vlib/x/ttf/text_block.v | 6 +-- vlib/x/ttf/ttf.v | 4 +- 108 files changed, 235 insertions(+), 214 deletions(-) diff --git a/.github/workflows/bootstrapping_works_ci.yml b/.github/workflows/bootstrapping_works_ci.yml index 18825e3a0..ff241cbb9 100644 --- a/.github/workflows/bootstrapping_works_ci.yml +++ b/.github/workflows/bootstrapping_works_ci.yml @@ -1,4 +1,4 @@ -name: Bootstraping works +name: Bootstrapping works on: schedule: diff --git a/GNUmakefile b/GNUmakefile index 0abda59dc..29c2f0fa9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -154,7 +154,7 @@ endif fresh_tcc: rm -rf $(TMPTCC) ifndef local -# Check wether a TCC branch exists for the user's system configuration. +# Check whether a TCC branch exists for the user's system configuration. ifneq (,$(findstring thirdparty-$(TCCOS)-$(TCCARCH), $(shell git ls-remote --heads $(TCCREPO) | sed 's/^[a-z0-9]*\trefs.heads.//'))) $(GITFASTCLONE) --branch thirdparty-$(TCCOS)-$(TCCARCH) $(TCCREPO) $(TMPTCC) @$(MAKE) --quiet check_for_working_tcc 2> /dev/null diff --git a/cmd/tools/test_os_process.v b/cmd/tools/test_os_process.v index 7113dadbb..3eecbc0a5 100644 --- a/cmd/tools/test_os_process.v +++ b/cmd/tools/test_os_process.v @@ -59,7 +59,7 @@ fn main() { Prints lines periodically (-period_ms), to stdout/stderr (-target). After a while (-timeout_ms), exit with (-exitcode). This program is useful for platform independent testing - of child process/standart input/output control. + of child process/standard input/output control. It is used in V's `os` module tests. ") return diff --git a/cmd/tools/vdoc/tests/testdata/newlines/main.comments.out b/cmd/tools/vdoc/tests/testdata/newlines/main.comments.out index f3ee94297..a789d11bb 100644 --- a/cmd/tools/vdoc/tests/testdata/newlines/main.comments.out +++ b/cmd/tools/vdoc/tests/testdata/newlines/main.comments.out @@ -15,7 +15,7 @@ fn funky() - bar # test ########### deep test - #a shouldnt have a newline test + #a shouldn't have a newline test | foo bar | yes | |-----------|--------| diff --git a/cmd/tools/vdoc/tests/testdata/newlines/main.v b/cmd/tools/vdoc/tests/testdata/newlines/main.v index 8d2bf9011..1c93d8512 100644 --- a/cmd/tools/vdoc/tests/testdata/newlines/main.v +++ b/cmd/tools/vdoc/tests/testdata/newlines/main.v @@ -12,7 +12,7 @@ // - bar // # test // ########### deep test -// #a shouldnt have a newline +// #a shouldn't have a newline // test // // | foo bar | yes | diff --git a/examples/graphs/bellman-ford.v b/examples/graphs/bellman-ford.v index 5b316d2c3..ff9da9f28 100644 --- a/examples/graphs/bellman-ford.v +++ b/examples/graphs/bellman-ford.v @@ -11,7 +11,7 @@ http://rascunhointeligente.blogspot.com/2010/10/o-algoritmo-de-bellman-ford-um.h code by CCS */ -const large = 999999 // almost inifinity +const large = 999999 // almost infinity // a structure to represent a weighted edge in graph struct EDGE { diff --git a/examples/graphs/dijkstra.v b/examples/graphs/dijkstra.v index ee4b3b588..89c227e03 100644 --- a/examples/graphs/dijkstra.v +++ b/examples/graphs/dijkstra.v @@ -125,7 +125,7 @@ fn dijkstra(g [][]int, s int) { push_pq(mut pq_queue, s, 0) // goes s with priority 0 mut n := g.len - mut dist := []int{len: n, init: -1} // dist with -1 instead of INIFINITY + mut dist := []int{len: n, init: -1} // dist with -1 instead of INFINITE mut path := []int{len: n, init: -1} // previous node of each shortest path // Distance of source vertex from itself is always 0 @@ -133,7 +133,7 @@ fn dijkstra(g [][]int, s int) { for pq_queue.len != 0 { mut v := departure_priority(mut pq_queue) - // for all W adjcents vertices of v + // for all W adjacents vertices of v mut adjs_of_v := all_adjacents(g, v) // all_ADJ of v .... // print('\n ADJ ${v} is ${adjs_of_v}') mut new_dist := 0 diff --git a/examples/graphs/minimal_spann_tree_prim.v b/examples/graphs/minimal_spann_tree_prim.v index 40036f31e..3aeadfb93 100644 --- a/examples/graphs/minimal_spann_tree_prim.v +++ b/examples/graphs/minimal_spann_tree_prim.v @@ -1,5 +1,5 @@ /* -Exploring PRIMS, +Exploring PRIMS, The data example is from https://www.geeksforgeeks.org/prims-minimum-spanning-tree-mst-greedy-algo-5/ @@ -117,7 +117,7 @@ fn prim_mst(g [][]int, s int) { push_pq(mut pq_queue, s, 0) // goes s with priority 0 mut n := g.len - mut dist := []int{len: n, init: -1} // dist with -1 instead of INIFINITY + mut dist := []int{len: n, init: -1} // dist with -1 instead of INFINITE mut path := []int{len: n, init: -1} // previous node of each shortest path // Distance of source vertex from itself is always 0 @@ -125,7 +125,7 @@ fn prim_mst(g [][]int, s int) { for pq_queue.len != 0 { mut v := departure_priority(mut pq_queue) - // for all W adjcents vertices of v + // for all W adjacents vertices of v mut adjs_of_v := all_adjacents(g, v) // all_ADJ of v .... // print('\n :${dist} :: ${pq_queue}') // print('\n ADJ ${v} is ${adjs_of_v}') @@ -209,7 +209,7 @@ fn main() { [5, 15, 4, 0], ] - // To find number of coluns + // To find number of columns // mut cols := an_array[0].len mut graph := [][]int{} // the graph: adjacency matrix // for index, g_value in [graph_01, graph_02, graph_03] { diff --git a/examples/sokol/03_march_tracing_glsl/rt_glsl.v b/examples/sokol/03_march_tracing_glsl/rt_glsl.v index 97c60c2af..2a3494b2e 100644 --- a/examples/sokol/03_march_tracing_glsl/rt_glsl.v +++ b/examples/sokol/03_march_tracing_glsl/rt_glsl.v @@ -278,12 +278,12 @@ fn draw_cube_glsl(app App) { tr_matrix := calc_tr_matrices(dw, dh, 0, 0, 2.3) gfx.apply_viewport(0, 0, ws.width, ws.height, true) - // apply the pipline and bindings + // apply the pipeline and bindings gfx.apply_pipeline(app.cube_pip_glsl) gfx.apply_bindings(app.cube_bind) // Uniforms - // *** vertex shadeer uniforms *** + // *** vertex shader uniforms *** // passing the view matrix as uniform // res is a 4x4 matrix of f32 thus: 4*16 byte of size vs_uniforms_range := gfx.Range{ @@ -292,20 +292,18 @@ fn draw_cube_glsl(app App) { } gfx.apply_uniforms(.vs, C.SLOT_vs_params, &vs_uniforms_range) - // vfmt off // *** fragment shader uniforms *** time_ticks := f32(time.ticks() - app.ticks) / 1000 mut tmp_fs_params := [ f32(ws.width), - ws.height * ratio, // x,y resolution to pass to FS - app.mouse_x, // mouse x + ws.height * ratio, // x,y resolution to pass to FS + app.mouse_x, // mouse x ws.height - app.mouse_y * 2, // mouse y scaled - time_ticks, // time as f32 - app.frame_count, // frame count + time_ticks, // time as f32 + app.frame_count, // frame count 0, - 0 // padding bytes , see "fs_params" struct paddings in rt_glsl.h + 0, // padding bytes , see "fs_params" struct paddings in rt_glsl.h ]! - // vfmt on fs_uniforms_range := gfx.Range{ ptr: unsafe { &tmp_fs_params } size: usize(sizeof(tmp_fs_params)) diff --git a/vlib/arrays/map_of.v b/vlib/arrays/map_of.v index 29df6127a..a28c3386d 100644 --- a/vlib/arrays/map_of.v +++ b/vlib/arrays/map_of.v @@ -17,7 +17,7 @@ pub fn map_of_indexes[T](array []T) map[T][]int { } // map_of_counts returns a map, where each key is an unique value in `array`, -// and each value for that key is how many times that value occures in `array`. +// and each value for that key is how many times that value occurs in `array`. // It can be useful for building histograms of discrete measurements. // Example: arrays.map_of_counts([1,2,3,4,4,2,1,4,4]) == {1: 2, 2: 2, 3: 1, 4: 4} pub fn map_of_counts[T](array []T) map[T]int { diff --git a/vlib/builtin/array.v b/vlib/builtin/array.v index 9ec29d3d6..40bc95f2e 100644 --- a/vlib/builtin/array.v +++ b/vlib/builtin/array.v @@ -203,7 +203,7 @@ fn (mut a array) ensure_cap(required int) { } // repeat returns a new array with the given array elements repeated given times. -// `cgen` will replace this with an apropriate call to `repeat_to_depth()` +// `cgen` will replace this with an appropriate call to `repeat_to_depth()` // // This is a dummy placeholder that will be overridden by `cgen` with an appropriate // call to `repeat_to_depth()`. However the `checker` needs it here. @@ -627,7 +627,7 @@ fn (a array) clone_static_to_depth(depth int) array { } // clone returns an independent copy of a given array. -// this will be overwritten by `cgen` with an apropriate call to `.clone_to_depth()` +// this will be overwritten by `cgen` with an appropriate call to `.clone_to_depth()` // However the `checker` needs it here. pub fn (a &array) clone() array { return unsafe { a.clone_to_depth(0) } @@ -827,7 +827,7 @@ pub fn (a array) map(callback fn (voidptr) voidptr) array // being compared. // // Example: array.sort() // will sort the array in ascending order -// Example: array.sort(b < a) // will sort the array in decending order +// Example: array.sort(b < a) // will sort the array in descending order // Example: array.sort(b.name < a.name) // will sort descending by the .name field pub fn (mut a array) sort(callback fn (voidptr, voidptr) int) diff --git a/vlib/builtin/array_d_gcboehm_opt.v b/vlib/builtin/array_d_gcboehm_opt.v index 14ac909b1..33af568e7 100644 --- a/vlib/builtin/array_d_gcboehm_opt.v +++ b/vlib/builtin/array_d_gcboehm_opt.v @@ -111,7 +111,7 @@ fn (mut a array) ensure_cap_noscan(required int) { } // repeat returns a new array with the given array elements repeated given times. -// `cgen` will replace this with an apropriate call to `repeat_to_depth()` +// `cgen` will replace this with an appropriate call to `repeat_to_depth()` // version of `repeat()` that handles multi dimensional arrays // `unsafe` to call directly because `depth` is not checked diff --git a/vlib/builtin/int_test.v b/vlib/builtin/int_test.v index 30e44ac7d..633b698cb 100644 --- a/vlib/builtin/int_test.v +++ b/vlib/builtin/int_test.v @@ -39,7 +39,7 @@ fn test_str_methods() { assert charptr(1).str() == '0x1' } -fn test_and_precendence() { +fn test_and_precedence() { assert (2 & 0 == 0) == ((2 & 0) == 0) assert (2 & 0 != 0) == ((2 & 0) != 0) assert (0 & 0 >= 0) == ((0 & 0) >= 0) @@ -48,7 +48,7 @@ fn test_and_precendence() { assert (1 & 2 > 0) == ((1 & 2) > 0) } -fn test_or_precendence() { +fn test_or_precedence() { assert (1 | 0 == 0) == ((1 | 0) == 0) assert (1 | 0 != 1) == ((1 | 0) != 1) assert (1 | 0 >= 2) == ((1 | 0) >= 2) @@ -57,7 +57,7 @@ fn test_or_precendence() { assert (1 | 0 > 1) == ((1 | 0) > 1) } -fn test_xor_precendence() { +fn test_xor_precedence() { assert (1 ^ 0 == 2) == ((1 ^ 0) == 2) assert (1 ^ 0 != 2) == ((1 ^ 0) != 2) assert (1 ^ 0 >= 0) == ((1 ^ 0) >= 0) @@ -66,12 +66,12 @@ fn test_xor_precendence() { assert (1 ^ 0 > 1) == ((1 ^ 0) > 1) } -fn test_left_shift_precendence() { +fn test_left_shift_precedence() { assert (2 << 4 | 3) == ((2 << 4) | 3) assert (2 << 4 | 3) != (2 << (4 | 3)) } -fn test_right_shift_precendence() { +fn test_right_shift_precedence() { assert (256 >> 4 | 3) == ((256 >> 4) | 3) assert (256 >> 4 | 3) != (256 >> (4 | 3)) } diff --git a/vlib/builtin/js/string.js.v b/vlib/builtin/js/string.js.v index 7029cea05..a6e85361b 100644 --- a/vlib/builtin/js/string.js.v +++ b/vlib/builtin/js/string.js.v @@ -432,7 +432,7 @@ pub fn (mut s []string) sort() { s.sort_with_compare(compare_strings) } -// sort_ignore_case sorts the string array using case insesitive comparing. +// sort_ignore_case sorts the string array using case insensitive comparing. pub fn (mut s []string) sort_ignore_case() { s.sort_with_compare(compare_lower_strings) } @@ -484,7 +484,7 @@ pub fn (s string) repeat(count int) string { // TODO: Make these functions actually work. // strip_margin allows multi-line strings to be formatted in a way that removes white-space -// before a delimeter. by default `|` is used. +// before a delimiter. By default `|` is used. // Note: the delimiter has to be a byte at this time. That means surrounding // the value in ``. // diff --git a/vlib/builtin/string.v b/vlib/builtin/string.v index a970b5465..d32f0eb0a 100644 --- a/vlib/builtin/string.v +++ b/vlib/builtin/string.v @@ -77,7 +77,7 @@ pub fn (s string) runes() []rune { // cstring_to_vstring creates a new V string copy of the C style string, // pointed by `s`. This function is most likely what you want to use when // working with C style pointers to 0 terminated strings (i.e. `char*`). -// It is recomended to use it, unless you *do* understand the implications of +// It is recommended to use it, unless you *do* understand the implications of // tos/tos2/tos3/tos4/tos5 in terms of memory management and interactions with // -autofree and `[manualfree]`. // It will panic, if the pointer `s` is 0. @@ -745,7 +745,7 @@ pub fn (s string) split_any(delim string) []string { mut i := 0 // check empty source string if s.len > 0 { - // if empty delimiter string using defautl split + // if empty delimiter string using default split if delim.len <= 0 { return s.split('') } @@ -813,7 +813,7 @@ pub fn (s string) rsplit(delim string) []string { return s.rsplit_nth(delim, 0) } -// split_once devides string into pair of string by `delim`. +// split_once divides string into pair of string by `delim`. // Example: // ```v // path, ext := 'file.ts.dts'.splice_once('.')? @@ -832,7 +832,7 @@ pub fn (s string) split_once(delim string) ?(string, string) { return result[0], result[1] } -// rsplit_once devides string into pair of string by `delim`. +// rsplit_once divides string into pair of string by `delim`. // Example: // ```v // path, ext := 'file.ts.dts'.splice_once('.')? @@ -1592,7 +1592,7 @@ pub fn (s string) trim(cutset string) string { return s.substr(left, right) } -// trim_indexes gets the new start and end indicies of a string when any of the characters given in `cutset` were stripped from the start and end of the string. Should be used as an input to `substr()`. If the string contains only the characters in `cutset`, both values returned are zero. +// trim_indexes gets the new start and end indices of a string when any of the characters given in `cutset` were stripped from the start and end of the string. Should be used as an input to `substr()`. If the string contains only the characters in `cutset`, both values returned are zero. // Example: left, right := '-hi-'.trim_indexes('-') [direct_array_access] pub fn (s string) trim_indexes(cutset string) (int, int) { @@ -1719,7 +1719,7 @@ fn compare_lower_strings(a &string, b &string) int { return compare_strings(&aa, &bb) } -// sort_ignore_case sorts the string array using case insesitive comparing. +// sort_ignore_case sorts the string array using case insensitive comparing. [inline] pub fn (mut s []string) sort_ignore_case() { s.sort_with_compare(compare_lower_strings) @@ -2096,7 +2096,7 @@ pub fn (s string) fields() []string { } // strip_margin allows multi-line strings to be formatted in a way that removes white-space -// before a delimeter. by default `|` is used. +// before a delimiter. By default `|` is used. // Note: the delimiter has to be a byte at this time. That means surrounding // the value in ``. // diff --git a/vlib/builtin/string_interpolation.v b/vlib/builtin/string_interpolation.v index 007541c12..723828c47 100644 --- a/vlib/builtin/string_interpolation.v +++ b/vlib/builtin/string_interpolation.v @@ -147,7 +147,7 @@ pub fn get_str_intp_u32_format(fmt_type StrIntpType, in_width int, in_precision return res } -// convert from struct to formated string +// convert from struct to formatted string [manualfree] fn (data &StrIntpData) process_str_intp_data(mut sb strings.Builder) { x := data.fmt diff --git a/vlib/crypto/ed25519/internal/edwards25519/extra.v b/vlib/crypto/ed25519/internal/edwards25519/extra.v index 4935675df..4f171caa6 100644 --- a/vlib/crypto/ed25519/internal/edwards25519/extra.v +++ b/vlib/crypto/ed25519/internal/edwards25519/extra.v @@ -326,7 +326,7 @@ pub fn (mut v Point) vartime_multiscalar_mult(scalars []Scalar, points []Point) // at each iteration and checking whether there is a nonzero // coefficient to look up a multiple of. // - // Skip trying to find the first nonzero coefficent, because + // Skip trying to find the first nonzero coefficient, because // searching might be more work than a few extra doublings. // k == i, l == j for k := 255; k >= 0; k-- { diff --git a/vlib/crypto/ed25519/internal/edwards25519/table.v b/vlib/crypto/ed25519/internal/edwards25519/table.v index bf160ffe4..8709b1f44 100644 --- a/vlib/crypto/ed25519/internal/edwards25519/table.v +++ b/vlib/crypto/ed25519/internal/edwards25519/table.v @@ -38,7 +38,7 @@ fn (mut v ProjLookupTable) from_p3(q Point) { for i := 0; i < 7; i++ { // Compute (i+1)*Q as Q + i*Q and convert to a ProjCached // This is needlessly complicated because the API has explicit - // recievers instead of creating stack objects and relying on RVO + // receivers instead of creating stack objects and relying on RVO v.points[i + 1].from_p3(tmp_p3.from_p1(tmp_p1.add(q, v.points[i]))) } } diff --git a/vlib/crypto/md5/md5block_generic.v b/vlib/crypto/md5/md5block_generic.v index 9f0d5b049..309b6f231 100644 --- a/vlib/crypto/md5/md5block_generic.v +++ b/vlib/crypto/md5/md5block_generic.v @@ -4,7 +4,7 @@ // This is the generic version with no architecture optimizations. // In its own file so that an architecture -// optimized verision can be substituted +// optimized version can be substituted module md5 diff --git a/vlib/crypto/pem/decode.v b/vlib/crypto/pem/decode.v index ba8670488..ec0d8ec82 100644 --- a/vlib/crypto/pem/decode.v +++ b/vlib/crypto/pem/decode.v @@ -54,20 +54,20 @@ fn parse_headers(block string) ?(map[string][]string, string) { return map[string][]string{}, block } - // seperate lines instead of iterating over them, + // separate lines instead of iterating over them, // so that we can manually index them - headers_seperated := headers_str.split_into_lines() + headers_separated := headers_str.split_into_lines() // index the key/value separator ':', otherwise // return none because it should exist // the initialisation of this function already tells us headers are present - mut colon_index := headers_seperated[0].index(colon) or { return none } + mut colon_index := headers_separated[0].index(colon) or { return none } mut headers := map[string][]string{} mut index := 0 - for index < headers_seperated.len - 1 { - line := headers_seperated[index] + for index < headers_separated.len - 1 { + line := headers_separated[index] if line.len == 0 { break } @@ -75,10 +75,10 @@ fn parse_headers(block string) ?(map[string][]string, string) { key := line[..colon_index].trim_space() mut val := line[colon_index + 1..].trim_space() - for colon_index = 0; index < headers_seperated.len - 1 && colon_index == 0; { + for colon_index = 0; index < headers_separated.len - 1 && colon_index == 0; { index++ - colon_index = headers_seperated[index].index(colon) or { - val += headers_seperated[index].trim_space() + colon_index = headers_separated[index].index(colon) or { + val += headers_separated[index].trim_space() 0 } } diff --git a/vlib/crypto/sha1/sha1block_generic.v b/vlib/crypto/sha1/sha1block_generic.v index 4879ec5c3..d56c0020a 100644 --- a/vlib/crypto/sha1/sha1block_generic.v +++ b/vlib/crypto/sha1/sha1block_generic.v @@ -3,7 +3,7 @@ // that can be found in the LICENSE file. // This is the generic version with no architecture optimizations. // In its own file so that an architecture -// optimized verision can be substituted +// optimized version can be substituted module sha1 import math.bits diff --git a/vlib/crypto/sha256/sha256block_generic.v b/vlib/crypto/sha256/sha256block_generic.v index 3d91248bb..d99106315 100644 --- a/vlib/crypto/sha256/sha256block_generic.v +++ b/vlib/crypto/sha256/sha256block_generic.v @@ -4,7 +4,7 @@ // SHA256 block step. // This is the generic version with no architecture optimizations. // In its own file so that an architecture -// optimized verision can be substituted +// optimized version can be substituted module sha256 import math.bits diff --git a/vlib/crypto/sha512/sha512block_generic.v b/vlib/crypto/sha512/sha512block_generic.v index f180fac38..f37f7b2db 100644 --- a/vlib/crypto/sha512/sha512block_generic.v +++ b/vlib/crypto/sha512/sha512block_generic.v @@ -4,7 +4,7 @@ // SHA512 block step. // This is the generic version with no architecture optimizations. // In its own file so that an architecture -// optimized verision can be substituted +// optimized version can be substituted module sha512 import math.bits diff --git a/vlib/io/reader.v b/vlib/io/reader.v index 58f0186ec..ea4df0db9 100644 --- a/vlib/io/reader.v +++ b/vlib/io/reader.v @@ -5,7 +5,7 @@ pub struct Eof { Error } -// NotExpected is a generic error that means that we receave a not expecte error. +// NotExpected is a generic error that means that we receave a not expected error. pub struct NotExpected { cause string code int diff --git a/vlib/net/http/cookie.v b/vlib/net/http/cookie.v index 46bb20f6e..ea917358f 100644 --- a/vlib/net/http/cookie.v +++ b/vlib/net/http/cookie.v @@ -148,7 +148,7 @@ pub fn (c &Cookie) str() string { b.write_string('; expires=') b.write_string(time_str) } - // TODO: Fix this. Techically a max age of 0 or less should be 0 + // TODO: Fix this. Technically a max age of 0 or less should be 0 // We need a way to not have a max age. if c.max_age > 0 { b.write_string('; Max-Age=') diff --git a/vlib/net/tcp.v b/vlib/net/tcp.v index a2ebb80b1..16fd44bb2 100644 --- a/vlib/net/tcp.v +++ b/vlib/net/tcp.v @@ -398,7 +398,7 @@ fn new_tcp_socket(family AddrFamily) !TcpSocket { } // TODO(emily): - // we shouldnt be using ioctlsocket in the 21st century + // we shouldn't be using ioctlsocket in the 21st century // use the non-blocking socket option instead please :) // TODO(emily): diff --git a/vlib/os/file.c.v b/vlib/os/file.c.v index 77b9e09c7..4131fd369 100644 --- a/vlib/os/file.c.v +++ b/vlib/os/file.c.v @@ -5,7 +5,7 @@ pub struct Eof { Error } -// NotExpected is a generic error that means that we receave a not expecte error. +// NotExpected is a generic error that means that we receave a not expected error. pub struct NotExpected { cause string code int @@ -841,7 +841,7 @@ pub enum SeekMode { // .start -> the origin is the start of the file // .current -> the current position/cursor in the file // .end -> the end of the file -// If the file is not seek-able, or an error occures, the error will +// If the file is not seek-able, or an error occurs, the error will // be returned to the caller. // A successful call to the fseek() function clears the end-of-file // indicator for the file. diff --git a/vlib/os/file_test.v b/vlib/os/file_test.v index 868ab2999..fc1582be6 100644 --- a/vlib/os/file_test.v +++ b/vlib/os/file_test.v @@ -151,7 +151,7 @@ fn test_read_eof_last_read_partial_buffer_fill() { // test_read_eof_last_read_full_buffer_fill tests that when reading a file the // end-of-file is detected and results in a none error being returned. This test -// simulates file reading where the end-of-file is reached at the beinning of an +// simulates file reading where the end-of-file is reached at the beginning of an // fread that returns no data. fn test_read_eof_last_read_full_buffer_fill() { mut f := os.open_file(tfile, 'w')! diff --git a/vlib/os/filepath.v b/vlib/os/filepath.v index 06c2308e6..f90402955 100644 --- a/vlib/os/filepath.v +++ b/vlib/os/filepath.v @@ -203,7 +203,7 @@ fn clean_path(path string) string { } continue } - // turn foward slash into a back slash on a Windows system + // turn forward slash into a back slash on a Windows system $if windows { if curr == os.fslash { sb.write_u8(os.bslash) diff --git a/vlib/os/os.c.v b/vlib/os/os.c.v index e85070a70..9310b7af3 100644 --- a/vlib/os/os.c.v +++ b/vlib/os/os.c.v @@ -1011,7 +1011,7 @@ pub fn chown(path string, owner int, group int) ! { } // open_append tries to open a file from a given path. -// If successfull, it and returns a `File` for appending. +// If successful, it and returns a `File` for appending. pub fn open_append(path string) !File { mut file := File{} $if windows { @@ -1036,7 +1036,7 @@ pub fn open_append(path string) !File { // execvp - loads and executes a new child process, *in place* of the current process. // The child process executable is located in `cmdpath`. // The arguments, that will be passed to it are in `args`. -// Note: this function will NOT return when successfull, since +// Note: this function will NOT return when successful, since // the child process will take control over execution. pub fn execvp(cmdpath string, cmdargs []string) ! { mut cargs := []&char{} @@ -1063,7 +1063,7 @@ pub fn execvp(cmdpath string, cmdargs []string) ! { // The child process executable is located in `cmdpath`. // The arguments, that will be passed to it are in `args`. // You can pass environment variables to through `envs`. -// Note: this function will NOT return when successfull, since +// Note: this function will NOT return when successful, since // the child process will take control over execution. pub fn execve(cmdpath string, cmdargs []string, envs []string) ! { mut cargv := []&char{} diff --git a/vlib/os/os.v b/vlib/os/os.v index ac7361265..1aad30eff 100644 --- a/vlib/os/os.v +++ b/vlib/os/os.v @@ -55,8 +55,8 @@ fn executable_fallback() string { } } if !is_abs_path(exepath) { - other_seperator := if path_separator == '/' { '\\' } else { '/' } - rexepath := exepath.replace(other_seperator, path_separator) + other_separator := if path_separator == '/' { '\\' } else { '/' } + rexepath := exepath.replace(other_separator, path_separator) if rexepath.contains(path_separator) { exepath = join_path_single(os.wd_at_startup, exepath) } else { @@ -227,7 +227,7 @@ pub fn is_dir_empty(path string) bool { return res } -// file_ext will return the part after the last occurence of `.` in `path`. +// file_ext will return the part after the last occurrence of `.` in `path`. // The `.` is included. // Examples: // ```v @@ -256,8 +256,8 @@ pub fn dir(opath string) string { if opath == '' { return '.' } - other_seperator := if path_separator == '/' { '\\' } else { '/' } - path := opath.replace(other_seperator, path_separator) + other_separator := if path_separator == '/' { '\\' } else { '/' } + path := opath.replace(other_separator, path_separator) pos := path.last_index(path_separator) or { return '.' } if pos == 0 && path_separator == '/' { return '/' @@ -273,8 +273,8 @@ pub fn base(opath string) string { if opath == '' { return '.' } - other_seperator := if path_separator == '/' { '\\' } else { '/' } - path := opath.replace(other_seperator, path_separator) + other_separator := if path_separator == '/' { '\\' } else { '/' } + path := opath.replace(other_separator, path_separator) if path == path_separator { return path_separator } @@ -287,11 +287,11 @@ pub fn base(opath string) string { return path[pos + 1..] } -// file_name will return all characters found after the last occurence of `path_separator`. +// file_name will return all characters found after the last occurrence of `path_separator`. // file extension is included. pub fn file_name(opath string) string { - other_seperator := if path_separator == '/' { '\\' } else { '/' } - path := opath.replace(other_seperator, path_separator) + other_separator := if path_separator == '/' { '\\' } else { '/' } + path := opath.replace(other_separator, path_separator) return path.all_after_last(path_separator) } @@ -610,7 +610,7 @@ fn impl_walk_ext(path string, ext string, mut out []string) { } // walk traverses the given directory `path`. -// When a file is encountred, it will call the callback `f` with current file as argument. +// When a file is encountered, it will call the callback `f` with current file as argument. // Note: walk can be called even for deeply nested folders, // since it does not recurse, but processes them iteratively. pub fn walk(path string, f fn (string)) { @@ -645,7 +645,7 @@ pub fn walk(path string, f fn (string)) { pub type FnWalkContextCB = fn (voidptr, string) // walk_with_context traverses the given directory `path`. -// For each encountred file *and* directory, it will call your `fcb` callback, +// For each encountered file *and* directory, it will call your `fcb` callback, // passing it the arbitrary `context` in its first parameter, // and the path to the file in its second parameter. // Note: walk_with_context can be called even for deeply nested folders, @@ -695,8 +695,8 @@ pub struct MkdirParams { // mkdir_all will create a valid full path of all directories given in `path`. pub fn mkdir_all(opath string, params MkdirParams) ! { - other_seperator := if path_separator == '/' { '\\' } else { '/' } - path := opath.replace(other_seperator, path_separator) + other_separator := if path_separator == '/' { '\\' } else { '/' } + path := opath.replace(other_separator, path_separator) mut p := if path.starts_with(path_separator) { path_separator } else { '' } path_parts := path.trim_left(path_separator).split(path_separator) for subdir in path_parts { diff --git a/vlib/os/os_android_outside_termux.c.v b/vlib/os/os_android_outside_termux.c.v index 30bd39cc5..c9caa53ac 100644 --- a/vlib/os/os_android_outside_termux.c.v +++ b/vlib/os/os_android_outside_termux.c.v @@ -67,7 +67,7 @@ pub fn (a &Asset) get_length() int { fn C.AAsset_getLength64(&C.AAsset) i64 // get_length_64 returns the total size of the asset data using -// a 64-bit number insted of 32-bit as `get_length`. +// a 64-bit number instead of 32-bit as `get_length`. pub fn (a &Asset) get_length_64() i64 { return C.AAsset_getLength64(a) } diff --git a/vlib/os/os_test.v b/vlib/os/os_test.v index 2b646b59b..431d663d3 100644 --- a/vlib/os/os_test.v +++ b/vlib/os/os_test.v @@ -764,7 +764,7 @@ fn test_posix_set_bit() { } mode = u32(s.st_mode) & 0o0777 assert mode == 0o0777 - // Note: setting the sticky bit is platform dependend + // Note: setting the sticky bit is platform dependent // `chmod -s -g -t` os.posix_set_permission_bit(fpath, os.s_isuid, false) os.posix_set_permission_bit(fpath, os.s_isgid, false) diff --git a/vlib/os/process_nix.c.v b/vlib/os/process_nix.c.v index d871a2536..5592307de 100644 --- a/vlib/os/process_nix.c.v +++ b/vlib/os/process_nix.c.v @@ -35,7 +35,7 @@ fn (mut p Process) unix_spawn_process() int { C.setpgid(0, 0) } if p.use_stdio_ctl { - // Redirect the child standart in/out/err to the pipes that + // Redirect the child standard in/out/err to the pipes that // were created in the parent. // Close the parent's pipe fds, the child do not need them: fd_close(pipeset[1]) diff --git a/vlib/regex/regex.v b/vlib/regex/regex.v index 7f661ca4c..ce5282a48 100644 --- a/vlib/regex/regex.v +++ b/vlib/regex/regex.v @@ -1004,7 +1004,7 @@ fn (mut re RE) impl_compile(in_txt string) (int, int) { // manage negation groups if negate_flag == true { re.prog[pc].group_neg = true - re.prog[pc].rep_min = 0 // may be not catched, but it is ok + re.prog[pc].rep_min = 0 // may not be caught, but it is ok } // set the group id diff --git a/vlib/sync/stdatomic/atomic.c.v b/vlib/sync/stdatomic/atomic.c.v index f1bf15202..fa975a7c4 100644 --- a/vlib/sync/stdatomic/atomic.c.v +++ b/vlib/sync/stdatomic/atomic.c.v @@ -1,7 +1,7 @@ module stdatomic // Implement the atomic operations. For now TCC does not support the atomic -// versions on nix so it uses locks to simulate the same behavor. +// versions on nix so it uses locks to simulate the same behavior. // // On windows tcc can simulate with other atomic operations. // diff --git a/vlib/time/private_test.v b/vlib/time/private_test.v index eceb63c95..7e69c4037 100644 --- a/vlib/time/private_test.v +++ b/vlib/time/private_test.v @@ -1,7 +1,7 @@ // tests that use and test private functions module time -// test the old behavor is same as new, the unix time should always be local time +// test the old behavior is same as new, the unix time should always be local time fn test_new_is_same_as_old_for_all_platforms() { t := C.time(0) tm := C.localtime(&t) diff --git a/vlib/time/time.v b/vlib/time/time.v index 7a0bd68f0..69ffc4042 100644 --- a/vlib/time/time.v +++ b/vlib/time/time.v @@ -224,7 +224,7 @@ pub fn (t Time) relative() string { return '${prefix}${y} years${suffix}' } -// relative_short returns a string saying how long ago a time occured as follows: +// relative_short returns a string saying how long ago a time occurred as follows: // 0-30 seconds: `"now"`; 30-60 seconds: `"1m"`; anything else is rounded to the // nearest minute, hour, day, or year // diff --git a/vlib/time/time_nix.c.v b/vlib/time/time_nix.c.v index 6c20e4faf..f46de43b8 100644 --- a/vlib/time/time_nix.c.v +++ b/vlib/time/time_nix.c.v @@ -21,7 +21,7 @@ struct C.tm { fn C.timegm(&C.tm) C.time_t -// prefering localtime_r over the localtime because +// preferring localtime_r over the localtime because // from docs localtime_r is thread safe, fn C.localtime_r(t &C.time_t, tm &C.tm) diff --git a/vlib/time/time_windows.c.v b/vlib/time/time_windows.c.v index 466043f01..694e313cb 100644 --- a/vlib/time/time_windows.c.v +++ b/vlib/time/time_windows.c.v @@ -128,7 +128,7 @@ pub fn (t Time) local() Time { // win_now calculates current time using winapi to get higher resolution on windows // GetSystemTimeAsFileTime is used and converted to local time. It can resolve time -// down to millisecond. Other more precice methods can be implemented in the future +// down to millisecond. Other more precise methods can be implemented in the future fn win_now() Time { ft_utc := C._FILETIME{} C.GetSystemTimeAsFileTime(&ft_utc) @@ -152,7 +152,7 @@ fn win_now() Time { // win_utc calculates current time using winapi to get higher resolution on windows // GetSystemTimeAsFileTime is used. It can resolve time down to millisecond -// other more precice methods can be implemented in the future +// other more precise methods can be implemented in the future fn win_utc() Time { ft_utc := C._FILETIME{} C.GetSystemTimeAsFileTime(&ft_utc) diff --git a/vlib/toml/any.v b/vlib/toml/any.v index e72ca04bd..172cd063b 100644 --- a/vlib/toml/any.v +++ b/vlib/toml/any.v @@ -235,8 +235,8 @@ pub fn (m map[string]Any) to_inline_toml() string { mut i := 1 for k, v in m { key := if k.contains(' ') { '"${k}"' } else { k } - delimeter := if i < m.len { ',' } else { '' } - toml_text += ' ${key} = ${v.to_toml()}${delimeter}' + delimiter := if i < m.len { ',' } else { '' } + toml_text += ' ${key} = ${v.to_toml()}${delimiter}' i++ } return toml_text + ' }' diff --git a/vlib/toml/checker/checker.v b/vlib/toml/checker/checker.v index ff4d4a92a..84287abe1 100644 --- a/vlib/toml/checker/checker.v +++ b/vlib/toml/checker/checker.v @@ -559,11 +559,11 @@ pub fn (c Checker) check_comment(comment ast.Comment) ! { break } ch_byte := u8(ch) - // Check for carrige return + // Check for carriage return if ch_byte == 0x0D { st := s.state() return error(@MOD + '.' + @STRUCT + '.' + @FN + - ' carrige return character `${ch_byte.hex()}` is not allowed in comments (${st.line_nr},${st.col}).') + ' carriage return character `${ch_byte.hex()}` is not allowed in comments (${st.line_nr},${st.col}).') } // Check for control characters (allow TAB) if util.is_illegal_ascii_control_character(ch_byte) { diff --git a/vlib/toml/scanner/scanner.v b/vlib/toml/scanner/scanner.v index 9a5916e2d..55fe3afd9 100644 --- a/vlib/toml/scanner/scanner.v +++ b/vlib/toml/scanner/scanner.v @@ -13,7 +13,7 @@ pub const ( ) // Scanner contains the necessary fields for the state of the scan process. -// the task the scanner does is also refered to as "lexing" or "tokenizing". +// the task the scanner does is also referred to as "lexing" or "tokenizing". // The Scanner methods are based on much of the work in `vlib/strings/textscanner`. pub struct Scanner { pub: diff --git a/vlib/toml/tests/iarna_toml_spec_test.v b/vlib/toml/tests/iarna_toml_spec_test.v index 40d21878a..a569b17e3 100644 --- a/vlib/toml/tests/iarna_toml_spec_test.v +++ b/vlib/toml/tests/iarna_toml_spec_test.v @@ -178,7 +178,7 @@ fn test_iarna_toml_spec_tests() { "'import sys, yaml, json; json.dump(yaml.load(sys.stdin, Loader=yaml.FullLoader), sys.stdout, indent=4)'", '<', iarna_yaml_path, '>', converted_json_path]) or { contents := os.read_file(iarna_yaml_path)! - // NOTE there's known errors with the python convertion method. + // NOTE there's known errors with the python convention method. // For now we just ignore them as it's a broken tool - not a wrong test-case. // Uncomment this print to see/check them. // eprintln(err.msg() + '\n$contents') diff --git a/vlib/toml/token/pos.v b/vlib/toml/token/pos.v index 78ac6cdc2..5a03f70d7 100644 --- a/vlib/toml/token/pos.v +++ b/vlib/toml/token/pos.v @@ -7,7 +7,7 @@ module token pub struct Pos { pub: len int // length of the literal in the source - line_nr int // the line number in the source where the token occured + line_nr int // the line number in the source where the token occurred pos int // the position of the token in scanner text - col int // the column in the source where the token occured + col int // the column in the source where the token occurred } diff --git a/vlib/toml/token/token.v b/vlib/toml/token/token.v index 08f8c9054..d40baa3d1 100644 --- a/vlib/toml/token/token.v +++ b/vlib/toml/token/token.v @@ -8,8 +8,8 @@ pub struct Token { pub: kind Kind // the token number/enum; for quick comparisons lit string // literal representation of the token - col int // the column in the source where the token occured - line_nr int // the line number in the source where the token occured + col int // the column in the source where the token occurred + line_nr int // the line number in the source where the token occurred pos int // the position of the token in scanner text len int // length of the literal } @@ -34,7 +34,7 @@ pub enum Kind { lsbr // [ rsbr // ] nl // \n linefeed / newline character - cr // \r carrige return + cr // \r carriage return tab // \t character whitespace // ` ` period // . diff --git a/vlib/v/checker/assign.v b/vlib/v/checker/assign.v index b9ae3e5da..7a5aa1c9b 100644 --- a/vlib/v/checker/assign.v +++ b/vlib/v/checker/assign.v @@ -161,7 +161,7 @@ fn (mut c Checker) assign_stmt(mut node ast.AssignStmt) { mut right := if i < node.right.len { node.right[i] } else { node.right[0] } mut right_type := node.right_types[i] if mut right is ast.Ident { - // resolve shared right vairable + // resolve shared right variable if right_type.has_flag(.shared_f) { if c.fail_if_unreadable(right, right_type, 'right-hand side of assignment') { return diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v index 51d4ee5c3..c6ca201bd 100644 --- a/vlib/v/checker/fn.v +++ b/vlib/v/checker/fn.v @@ -1219,7 +1219,7 @@ fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast. // ... but 2. disallow passing non-pointers - that is very rarely what the user wanted, // it can lead to codegen errors (except for 'magic' functions like `json.encode` that, // the compiler has special codegen support for), so it should be opt in, that is it - // shoould require an explicit voidptr(x) cast (and probably unsafe{} ?) . + // should require an explicit voidptr(x) cast (and probably unsafe{} ?) . if call_arg.typ != param.typ && (param.typ == ast.voidptr_type || final_param_sym.idx == ast.voidptr_type_idx || param.typ == ast.nil_type || final_param_sym.idx == ast.nil_type_idx) diff --git a/vlib/v/checker/tests/infix_sumtype_in_array_err.out b/vlib/v/checker/tests/infix_sumtype_in_array_err.out index 58f61dd0e..b4440b1c8 100644 --- a/vlib/v/checker/tests/infix_sumtype_in_array_err.out +++ b/vlib/v/checker/tests/infix_sumtype_in_array_err.out @@ -3,5 +3,5 @@ vlib/v/checker/tests/infix_sumtype_in_array_err.vv:15:7: error: left operand to 14 | RuneAlias { 15 | if x in whitespace { | ~~~~~~~~~~~~~~~ - 16 | // doing `if x as RuneAlias in whitepsace` here + 16 | // doing `if x as RuneAlias in whitespace` here 17 | // works but it should be doing that automatically diff --git a/vlib/v/checker/tests/infix_sumtype_in_array_err.vv b/vlib/v/checker/tests/infix_sumtype_in_array_err.vv index 5e68a1866..e21f548a6 100644 --- a/vlib/v/checker/tests/infix_sumtype_in_array_err.vv +++ b/vlib/v/checker/tests/infix_sumtype_in_array_err.vv @@ -13,7 +13,7 @@ fn main() { match x { RuneAlias { if x in whitespace { - // doing `if x as RuneAlias in whitepsace` here + // doing `if x as RuneAlias in whitespace` here // works but it should be doing that automatically // since I'm inside the RuneAlias match condition. } diff --git a/vlib/v/eval/eval.v b/vlib/v/eval/eval.v index c55abd9db..92a299a39 100644 --- a/vlib/v/eval/eval.v +++ b/vlib/v/eval/eval.v @@ -83,7 +83,7 @@ pub fn (mut e Eval) eval(mut files []&ast.File) { e.run_func(e.mods['main']['main'] or { ast.FnDecl{} } as ast.FnDecl) } -// first arg is reciever (if method) +// first arg is receiver (if method) pub fn (mut e Eval) run_func(func ast.FnDecl, _args ...Object) { e.back_trace << EvalTrace{func.idx, func.source_file.idx, func.pos.line_nr} old_mod := e.cur_mod diff --git a/vlib/v/eval/expr.v b/vlib/v/eval/expr.v index 436ff6fe3..ae8a95642 100644 --- a/vlib/v/eval/expr.v +++ b/vlib/v/eval/expr.v @@ -85,10 +85,10 @@ pub fn (mut e Eval) expr(expr ast.Expr, expecting ast.Type) Object { // // } // } // // println((e.local_vars['s'].val as string).str == voidptr_args[1]) - // println('helo?$voidptr_args') + // println('hello?$voidptr_args') // // println((byteptr(voidptr_args[1])[0])) // x := strconv.v_sprintf(args[0] as string, ...voidptr_args) - // // println('helo!') + // // println('hello!') // // println(x.len) // y := C.write(1, x.str, x.len) // println('aft') diff --git a/vlib/v/fmt/tests/infix_expr_expected.vv b/vlib/v/fmt/tests/infix_expr_expected.vv index 43d8461a0..bc3cc0d29 100644 --- a/vlib/v/fmt/tests/infix_expr_expected.vv +++ b/vlib/v/fmt/tests/infix_expr_expected.vv @@ -5,7 +5,7 @@ fn grouped_cond_single_line() { } fn unwrap_grouped_conds() { - // ...but sometimes they have to be splitted + // ...but sometimes they have to be split _ := one_condition && before_condition && (conds_inside_paren || are_kept_together || if_possible || but_this_is_really_too_much || for_one_line) diff --git a/vlib/v/fmt/tests/infix_expr_input.vv b/vlib/v/fmt/tests/infix_expr_input.vv index 7f77312d2..77745a4d0 100644 --- a/vlib/v/fmt/tests/infix_expr_input.vv +++ b/vlib/v/fmt/tests/infix_expr_input.vv @@ -4,7 +4,7 @@ fn grouped_cond_single_line() { } fn unwrap_grouped_conds() { - // ...but sometimes they have to be splitted + // ...but sometimes they have to be split _ := one_condition && before_condition && (conds_inside_paren || are_kept_together || if_possible || but_this_is_really_too_much || for_one_line) _ := (also_inside_parens || just_as_above || but_this_is_also_more || than_a_single_line_could_fit) && end_cond fields = fields.filter((it.typ in [string_type, int_type, bool_type] || c.table.types[int(it.typ)].kind == .struct_) && !it.attrs.contains('skip')) diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index f037c7845..77e9fc2ae 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -82,17 +82,17 @@ mut: sorted_global_const_names []string file &ast.File = unsafe { nil } table &ast.Table = unsafe { nil } - unique_file_path_hash u64 // a hash of file.path, used for making auxilary fn generation unique (like `compare_xyz`) + unique_file_path_hash u64 // a hash of file.path, used for making auxiliary fn generation unique (like `compare_xyz`) fn_decl &ast.FnDecl = unsafe { nil } // pointer to the FnDecl we are currently inside otherwise 0 last_fn_c_name string tmp_count int // counter for unique tmp vars (_tmp1, _tmp2 etc); resets at the start of each fn. tmp_count_af int // a separate tmp var counter for autofree fn calls tmp_count_declarations int // counter for unique tmp names (_d1, _d2 etc); does NOT reset, used for C declarations - global_tmp_count int // like tmp_count but global and not resetted in each function + global_tmp_count int // like tmp_count but global and not reset in each function discard_or_result bool // do not safe last ExprStmt of `or` block in tmp variable to defer ongoing expr usage is_direct_array_access bool // inside a `[direct_array_access fn a() {}` function is_assign_lhs bool // inside left part of assign expr (for array_set(), etc) - is_void_expr_stmt bool // ExprStmt whos result is discarded + is_void_expr_stmt bool // ExprStmt whose result is discarded is_arraymap_set bool // map or array set value state is_amp bool // for `&Foo{}` to merge PrefixExpr `&` and StructInit `Foo{}`; also for `&u8(0)` etc is_sql bool // Inside `sql db{}` statement, generating sql instead of C (e.g. `and` instead of `&&` etc) @@ -1067,9 +1067,9 @@ fn (mut g Gen) expr_string_surround(prepend string, expr ast.Expr, append string return g.out.cut_to(pos) } -// TODO this really shouldnt be seperate from typ +// TODO this really shouldn't be separate from typ // but I(emily) would rather have this generation -// all unified in one place so that it doesnt break +// all unified in one place so that it doesn't break // if one location changes fn (mut g Gen) option_type_name(t ast.Type) (string, string) { mut base := g.base_type(t) @@ -2591,7 +2591,7 @@ fn cescape_nonascii(original string) string { return res } -// cestring returns a V string, properly escaped for embeddeding in a C string literal. +// cestring returns a V string, properly escaped for embedding in a C string literal. fn cestring(s string) string { return s.replace('\\', '\\\\').replace('"', "'") } @@ -2632,7 +2632,7 @@ fn (mut g Gen) asm_stmt(stmt ast.AsmStmt) { } else { g.write(' ') } - // swap destionation and operands for att syntax + // swap destination and operands for att syntax if template.args.len != 0 && !template.is_directive { template.args.prepend(template.args.last()) template.args.delete(template.args.len - 1) @@ -5045,7 +5045,7 @@ fn (mut g Gen) return_stmt(node ast.Return) { g.write('(${styp}){') mut arg_idx := 0 for i, expr in node.exprs { - // Check if we are dealing with a multi return and handle it seperately + // Check if we are dealing with a multi return and handle it separately if g.expr_is_multi_return_call(expr) { call_expr := expr as ast.CallExpr expr_sym := g.table.sym(call_expr.return_type) @@ -5803,7 +5803,7 @@ fn (mut g Gen) write_init_function() { g.writeln('\t_closure_mtx_init();') } - // reflection bootstraping + // reflection bootstrapping if g.has_reflection { if var := g.global_const_defs['g_reflection'] { g.writeln(var.init) @@ -6185,7 +6185,7 @@ fn (mut g Gen) sort_structs(typesa []&ast.TypeSymbol) []&ast.TypeSymbol { // sort graph dep_graph_sorted := dep_graph.resolve() if !dep_graph_sorted.acyclic { - // this should no longer be called since it's catched in the parser + // this should no longer be called since it's in the parser // TODO: should it be removed? verror('cgen.sort_structs(): the following structs form a dependency cycle:\n' + dep_graph_sorted.display_cycles() + @@ -6257,7 +6257,7 @@ fn (mut g Gen) gen_or_block_stmts(cvar_name string, cast_typ string, stmts []ast g.indent-- } -// If user is accessing the return value eg. in assigment, pass the variable name. +// If user is accessing the return value eg. in assignment, pass the variable name. // If the user is not using the option return value. We need to pass a temp var // to access its fields (`.ok`, `.error` etc) // `os.cp(...)` => `Option bool tmp = os__cp(...); if (tmp.state != 0) { ... }` @@ -6768,7 +6768,7 @@ fn (mut g Gen) interface_table() string { cast_struct.writeln('\t\t.${cname} = (${field_styp}*)((char*)x + __offsetof_ptr(x, ${cctype}, ${cname})),') } else if st_sym.kind == .array && field.name in ['element_size', 'data', 'offset', 'len', 'cap', 'flags'] { - // Manaully checking, we already knows array contains above fields + // Manually checking, we already knows array contains above fields cast_struct.writeln('\t\t.${cname} = (${field_styp}*)((char*)x + __offsetof_ptr(x, ${cctype}, ${cname})),') } else { // the field is embedded in another struct diff --git a/vlib/v/gen/c/fn.v b/vlib/v/gen/c/fn.v index 7aee27899..a5e6e1887 100644 --- a/vlib/v/gen/c/fn.v +++ b/vlib/v/gen/c/fn.v @@ -2018,7 +2018,7 @@ fn (mut g Gen) call_args(node ast.CallExpr) { } } } - // only v variadic, C variadic args will be appeneded like normal args + // only v variadic, C variadic args will be appended like normal args is_variadic := expected_types.len > 0 && expected_types.last().has_flag(.variadic) && node.language == .v for i, arg in args { diff --git a/vlib/v/gen/c/infix.v b/vlib/v/gen/c/infix.v index 597446a56..59d15c709 100644 --- a/vlib/v/gen/c/infix.v +++ b/vlib/v/gen/c/infix.v @@ -603,7 +603,7 @@ fn (mut g Gen) infix_expr_in_op(node ast.InfixExpr) { } // infix_expr_in_optimization optimizes ` in ` expressions, -// and transform them in a serie of equality comparison +// and transform them in a series of equality comparison // i.e. `a in [1,2,3]` => `a == 1 || a == 2 || a == 3` fn (mut g Gen) infix_expr_in_optimization(left ast.Expr, right ast.ArrayInit) { mut elem_sym := g.table.sym(right.elem_type) diff --git a/vlib/v/gen/c/reflection.v b/vlib/v/gen/c/reflection.v index 41df3611c..0d9052b6e 100644 --- a/vlib/v/gen/c/reflection.v +++ b/vlib/v/gen/c/reflection.v @@ -202,7 +202,7 @@ fn (mut g Gen) gen_reflection_sym_info(tsym ast.TypeSymbol) string { } } -// gen_reflection_data generates code to initilized V reflection metadata +// gen_reflection_data generates code to initialized V reflection metadata fn (mut g Gen) gen_reflection_data() { // modules declaration for mod_name in g.table.modules { diff --git a/vlib/v/gen/c/str_intp.v b/vlib/v/gen/c/str_intp.v index b4d15acb4..ca3d1fd44 100644 --- a/vlib/v/gen/c/str_intp.v +++ b/vlib/v/gen/c/str_intp.v @@ -48,7 +48,7 @@ fn (mut g Gen) get_default_fmt(ftyp ast.Type, typ ast.Type) u8 { fn (mut g Gen) str_format(node ast.StringInterLiteral, i int, fmts []u8) (u64, string) { mut base := 0 // numeric base - mut upper_case := false // set upercase for the result string + mut upper_case := false // set uppercase for the result string mut typ := g.unwrap_generic(node.expr_types[i]) if node.exprs[i].is_auto_deref_var() { typ = typ.deref() diff --git a/vlib/v/gen/c/testdata/check_combination_of_alias_and_sumtype.vv b/vlib/v/gen/c/testdata/check_combination_of_alias_and_sumtype.vv index 741291bbc..4e2e90bfe 100644 --- a/vlib/v/gen/c/testdata/check_combination_of_alias_and_sumtype.vv +++ b/vlib/v/gen/c/testdata/check_combination_of_alias_and_sumtype.vv @@ -1,4 +1,4 @@ -type ParseRes = Result<[]Token, ParseErr> +type ParseRes = Result[[]Token, ParseErr] struct Token {} @@ -26,7 +26,7 @@ fn main() { r := Opt[ParseRes](None[ParseRes]{}) match r { Some[ParseRes] { - // make possible cast fo the same type! + // make possible cast of the same type! rx := Result[[]Token, ParseErr](r.value) } None[ParseRes] {} diff --git a/vlib/v/gen/c/utils.v b/vlib/v/gen/c/utils.v index e0271d39f..894c7b011 100644 --- a/vlib/v/gen/c/utils.v +++ b/vlib/v/gen/c/utils.v @@ -64,7 +64,7 @@ struct Type { typ ast.Type [required] sym &ast.TypeSymbol [required] // unaliased is `typ` once aliased have been resolved - // it may not contain informations such as flags and nr_muls + // it may not contain information such as flags and nr_muls unaliased ast.Type [required] unaliased_sym &ast.TypeSymbol [required] } diff --git a/vlib/v/gen/js/js.v b/vlib/v/gen/js/js.v index 294f07862..ae164009b 100644 --- a/vlib/v/gen/js/js.v +++ b/vlib/v/gen/js/js.v @@ -3507,7 +3507,7 @@ fn (mut g JsGen) gen_typeof_expr(it ast.TypeOf) { } fn (mut g JsGen) gen_cast_tmp(tmp string, typ_ ast.Type) { - // Skip cast if type is the same as the parrent caster + // Skip cast if type is the same as the parent caster tsym := g.table.final_sym(typ_) if !g.pref.output_es5 && (tsym.kind == .i64 || tsym.kind == .u64) { g.write('new ') @@ -3586,7 +3586,7 @@ fn (mut g JsGen) gen_type_cast_expr(it ast.CastExpr) { return } - // Skip cast if type is the same as the parrent caster + // Skip cast if type is the same as the parent caster tsym := to_type_sym if tsym.kind == .sum_type { g.expr(it.expr) @@ -3651,7 +3651,7 @@ fn (mut g JsGen) gen_integer_literal_expr(it ast.IntegerLiteral) { } } - // Skip cast if type is the same as the parrent caster + // Skip cast if type is the same as the parent caster if g.cast_stack.len > 0 { if g.cast_stack.last() in ast.integer_type_idxs { g.write('new ') @@ -3688,7 +3688,7 @@ fn (mut g JsGen) gen_float_literal_expr(it ast.FloatLiteral) { } } - // Skip cast if type is the same as the parrent caster + // Skip cast if type is the same as the parent caster if g.cast_stack.len > 0 { if g.cast_stack.last() in ast.float_type_idxs { g.write('new f32(${it.val})') diff --git a/vlib/v/gen/js/jsgen_test.v b/vlib/v/gen/js/jsgen_test.v index d3b2b13ac..36d7f65d0 100644 --- a/vlib/v/gen/js/jsgen_test.v +++ b/vlib/v/gen/js/jsgen_test.v @@ -30,7 +30,7 @@ fn test_example_compilation() { println('activate -sourcemap creation') v_options_file += ' -sourcemap' // activate souremap generation - println('add node option: --enable-source-maps') // requieres node >=12.12.0 + println('add node option: --enable-source-maps') // requires node >=12.12.0 node_options_file += ' --enable-source-maps' // activate souremap generation } jsfile := os.join_path_single(output_dir, '${file}.js') diff --git a/vlib/v/gen/js/util.v b/vlib/v/gen/js/util.v index faedcf162..9615b37a1 100644 --- a/vlib/v/gen/js/util.v +++ b/vlib/v/gen/js/util.v @@ -7,7 +7,7 @@ struct Type { typ ast.Type [required] sym &ast.TypeSymbol [required] = unsafe { nil } // unaliased is `typ` once aliased have been resolved - // it may not contain informations such as flags and nr_muls + // it may not contain information such as flags and nr_muls unaliased ast.Type [required] unaliased_sym &ast.TypeSymbol [required] = unsafe { nil } } diff --git a/vlib/v/gen/native/amd64.v b/vlib/v/gen/native/amd64.v index 084433453..23e43b253 100644 --- a/vlib/v/gen/native/amd64.v +++ b/vlib/v/gen/native/amd64.v @@ -925,7 +925,7 @@ fn (mut c Amd64) mov_extend_reg(a Amd64Register, b Amd64Register, typ ast.Type) fn (mut c Amd64) call_addr_at(addr i32, at i64) i64 { // Need to calculate the difference between current position (position after the e8 call) // and the function to call.f - // +5 is to get the posistion "e8 xx xx xx xx" + // +5 is to get the position "e8 xx xx xx xx" // Not sure about the -1. return 0xffffffff - (at + 5 - i64(addr) - 1) } @@ -3466,7 +3466,7 @@ fn (mut c Amd64) convert_int_to_string(a Register, b Register) { } c.g.println('; jump to label ${skip_zero_label}') - // handle zeros seperately + // handle zeros separately // c.mov_int_to_var(LocalVar{buffer, ast.u8_type_idx, ''}, '0'[0]) c.g.write8(0xc6) diff --git a/vlib/v/gen/native/builtins.v b/vlib/v/gen/native/builtins.v index f86f1ea44..9faa51b83 100644 --- a/vlib/v/gen/native/builtins.v +++ b/vlib/v/gen/native/builtins.v @@ -19,7 +19,7 @@ mut: calls []i64 // call addresses } -pub const inline_builtins = ['assert', 'print', 'eprint', 'println', 'eprintln', 'exit', 'C.syscall'] // classic V builtin functios accessible to the user get inlined +pub const inline_builtins = ['assert', 'print', 'eprint', 'println', 'eprintln', 'exit', 'C.syscall'] // classic V builtin functions accessible to the user get inlined pub fn (mut g Gen) init_builtins() { g.builtins = { diff --git a/vlib/v/gen/native/elf.v b/vlib/v/gen/native/elf.v index dcd6b70ff..fdc6d9688 100644 --- a/vlib/v/gen/native/elf.v +++ b/vlib/v/gen/native/elf.v @@ -375,7 +375,7 @@ mut: typ i32 // Type of the node name []u8 // Name string of the note. - desc []u8 // Descripition string of the node, must be aligned by 4 bytes + desc []u8 // Description string of the node, must be aligned by 4 bytes } fn (mut g Gen) create_note_section(typ i32, name string, desc string) NoteSection { diff --git a/vlib/v/gen/native/expr.v b/vlib/v/gen/native/expr.v index 621522612..38089c5e4 100644 --- a/vlib/v/gen/native/expr.v +++ b/vlib/v/gen/native/expr.v @@ -348,7 +348,7 @@ fn (mut g Gen) gen_print_from_expr(expr ast.Expr, typ ast.Type, name string) { } ast.BoolLiteral { // register 'true' and 'false' strings // g.expr(expr) - // XXX mov64 shuoldnt be used for addressing + // XXX mov64 shouldn't be used for addressing nl := if newline { '\n' } else { '' } if expr.val { diff --git a/vlib/v/gen/native/gen.v b/vlib/v/gen/native/gen.v index ce829a33e..0ad1083cd 100644 --- a/vlib/v/gen/native/gen.v +++ b/vlib/v/gen/native/gen.v @@ -83,7 +83,7 @@ mut: address_size() i32 adr(r Arm64Register, delta i32) // Note: Temporary! allocate_var(name string, size i32, initial_val i32) i32 - assign_stmt(node ast.AssignStmt) // TODO: make platform-independant + assign_stmt(node ast.AssignStmt) // TODO: make platform-independent builtin_decl(builtin BuiltinFn) call_addr_at(addr i32, at i64) i64 call_builtin(name Builtin) i64 @@ -107,7 +107,7 @@ mut: gen_print(s string, fd i32) gen_syscall(node ast.CallExpr) inc_var(var Var, config VarConfig) - infix_expr(node ast.InfixExpr) // TODO: make platform-independant + infix_expr(node ast.InfixExpr) // TODO: make platform-independent infloop() init_struct(var Var, init ast.StructInit) init_array(var Var, init ast.ArrayInit) @@ -520,7 +520,7 @@ pub fn (mut g Gen) link(obj_name string) { g.link_elf_file(obj_name) } .windows { - // windows linking is alredy done before codegen + // windows linking is already done before codegen } .macos { // TODO: implement linking for macos! diff --git a/vlib/v/gen/native/pe.v b/vlib/v/gen/native/pe.v index 5d23e69e2..02c045c7d 100644 --- a/vlib/v/gen/native/pe.v +++ b/vlib/v/gen/native/pe.v @@ -29,7 +29,7 @@ const ( pe_heap_size = 0x100000 // gcc default on windows // tcc defaults pe_major_linker_version = 6 - pe_minor_linker_verion = 0 + pe_minor_linker_version = 0 pe_major_os_version = 4 pe_minor_os_version = 0 pe_major_subsystem_version = 4 @@ -236,7 +236,7 @@ fn (mut g Gen) get_pe32_plus_optional_header() Pe32PlusOptionalHeader { return Pe32PlusOptionalHeader{ magic: .pe32plus major_linker_version: native.pe_major_linker_version - minor_linker_version: native.pe_minor_linker_verion + minor_linker_version: native.pe_minor_linker_version image_base: native.image_base section_alignment: native.pe_section_align file_alignment: native.pe_file_align @@ -262,7 +262,7 @@ enum Pe32PlusOPtionalHeaderField { number_of_rva_and_sizes = 108 } -// implemented because __offsetof() + [packed] structs wasn't consistend across OSs +// implemented because __offsetof() + [packed] structs wasn't consistent across OSs [inline] fn pe32_plus_optional_header_offsetof(field Pe32PlusOPtionalHeaderField) i64 { return i64(field) @@ -449,7 +449,7 @@ enum PeSectionHeaderField { pointer_to_raw_data = 20 } -// implemented because __offsetof() + [packed] structs wasn't consistend across OSs +// implemented because __offsetof() + [packed] structs wasn't consistent across OSs [inline] fn pe_section_header_offsetof(field PeSectionHeaderField) i64 { return i64(field) @@ -560,7 +560,7 @@ enum PeImportDirectoryTableField { import_address_table_rva = 16 } -// implemented because __offsetof() + [packed] structs wasn't consistend across OSs +// implemented because __offsetof() + [packed] structs wasn't consistent across OSs [inline] fn pe_idt_offsetof(field PeImportDirectoryTableField) i64 { return i64(field) @@ -667,7 +667,7 @@ fn (mut g Gen) gen_pe_idata() { g.zeroes(4) g.println('; null entry') - // dll names + // dll names for imp in imports { g.write32_at(imp.idt_pos + pe_idt_offsetof(.name_rva), i32(g.pos() - idata_pos) + idata_section.header.virtual_address) diff --git a/vlib/v/gen/wasm/mem.v b/vlib/v/gen/wasm/mem.v index 89af0433b..5bd6a8794 100644 --- a/vlib/v/gen/wasm/mem.v +++ b/vlib/v/gen/wasm/mem.v @@ -423,7 +423,7 @@ pub fn (mut g Gen) set_set(v Var) { // set pointers with value, get local, store value // set value, set local // -- set works with a single value present on the stack beforehand -// -- not optimial for copying stack memory or shuffling structs +// -- not optimal for copying stack memory or shuffling structs // -- use mov instead pub fn (mut g Gen) set(v Var) { if !v.is_address { diff --git a/vlib/v/live/live_test.v b/vlib/v/live/live_test.v index 9e61fb78e..1c3e41a38 100644 --- a/vlib/v/live/live_test.v +++ b/vlib/v/live/live_test.v @@ -22,7 +22,7 @@ If everything works fine, the output of the generated program would have changed which then is detected by the test program (the histogram checks). Since this test program is sensitive to coordination (or lack of) of several processes, -it tries to sidestep the coordination issue by polling the file system for the existance +it tries to sidestep the coordination issue by polling the file system for the existence of files, ORIGINAL.txt ... STOP.txt , which are appended to by the generated program. Note: That approach of monitoring the state of the running generated program, is clearly not ideal, diff --git a/vlib/v/pref/default.v b/vlib/v/pref/default.v index d4a5e8e34..ff6017137 100644 --- a/vlib/v/pref/default.v +++ b/vlib/v/pref/default.v @@ -94,7 +94,7 @@ pub fn (mut p Preferences) fill_with_defaults() { // compilers. // // If you do decide to break it, please *at the very least*, test it - // extensively, and make a PR about it, instead of commiting directly + // extensively, and make a PR about it, instead of committing directly // and breaking the CI, VC, and users doing `v up`. if rpath == '${p.vroot}/cmd/v' && os.is_dir('vlib/compiler') { // Building V? Use v2, since we can't overwrite a running @@ -129,7 +129,7 @@ pub fn (mut p Preferences) fill_with_defaults() { p.parse_define('emscripten') } if p.os == ._auto { - // No OS specifed? Use current system + // No OS specified? Use current system p.os = if p.backend != .wasm { get_host_os() } else { .wasi } } // diff --git a/vlib/v/pref/pref.v b/vlib/v/pref/pref.v index a2b26df64..1cf7aa7cf 100644 --- a/vlib/v/pref/pref.v +++ b/vlib/v/pref/pref.v @@ -29,9 +29,9 @@ pub enum GarbageCollectionMode { unknown no_gc boehm_full // full garbage collection mode - boehm_incr // incremental garbage colletion mode + boehm_incr // incremental garbage collection mode boehm_full_opt // full garbage collection mode - boehm_incr_opt // incremental garbage colletion mode + boehm_incr_opt // incremental garbage collection mode boehm_leak // leak detection mode (makes `gc_check_leaks()` work) } @@ -133,7 +133,7 @@ pub mut: is_help bool // -h, -help or --help was passed is_quiet bool // do not show the repetitive explanatory messages like the one for `v -prod run file.v` . is_cstrict bool // turn on more C warnings; slightly slower - eval_argument string // `println(2+2)` on `v -e "println(2+2)"`. Note that this souce code, will be evaluated in vsh mode, so 'v -e 'println(ls(".")!)' is valid. + eval_argument string // `println(2+2)` on `v -e "println(2+2)"`. Note that this source code, will be evaluated in vsh mode, so 'v -e 'println(ls(".")!)' is valid. test_runner string // can be 'simple' (fastest, but much less detailed), 'tap', 'normal' profile_file string // the profile results will be stored inside profile_file profile_no_inline bool // when true, [inline] functions would not be profiled @@ -151,7 +151,7 @@ pub mut: show_callgraph bool // -show-callgraph, print the program callgraph, in a Graphviz DOT format to stdout show_depgraph bool // -show-depgraph, print the program module dependency graph, in a Graphviz DOT format to stdout dump_c_flags string // `-dump-c-flags file.txt` - let V store all C flags, passed to the backend C compiler in `file.txt`, one C flag/value per line. - dump_modules string // `-dump-modules modules.txt` - let V store all V modules, that were used by the compiled program in `modules.txt`, one module per line. + dump_modules string // `-dump-modules modules.txt` - let V store all V modules, that were used by the compiled program in `modules.txt`, one module per line. dump_files string // `-dump-files files.txt` - let V store all V or .template file paths, that were used by the compiled program in `files.txt`, one path per line. dump_defines string // `-dump-defines defines.txt` - let V store all the defines that affect the current program and their values, one define per line + `,` + its value. use_cache bool // when set, use cached modules to speed up subsequent compilations, at the cost of slower initial ones (while the modules are cached) @@ -189,7 +189,7 @@ pub mut: prealloc bool vroot string vlib string // absolute path to the vlib/ folder - vmodules_paths []string // absolute paths to the vmodules folders, by default ['/home/user/.vmodules'], can be overriden by setting VMODULES + vmodules_paths []string // absolute paths to the vmodules folders, by default ['/home/user/.vmodules'], can be overridden by setting VMODULES out_name_c string // full os.real_path to the generated .tmp.c file; set by builder. out_name string path string // Path to file/folder to compile diff --git a/vlib/v/preludes/test_runner.v b/vlib/v/preludes/test_runner.v index 18ac7c272..33ec919a1 100644 --- a/vlib/v/preludes/test_runner.v +++ b/vlib/v/preludes/test_runner.v @@ -108,8 +108,8 @@ pub fn change_test_runner(x &TestRunner) { test_runner = *x } -// vtest_init will be caled *before* the normal _vinit() function, -// to give a chance to the test runner implemenation to change the +// vtest_init will be called *before* the normal _vinit() function, +// to give a chance to the test runner implementation to change the // test_runner global variable. The reason vtest_init is called before // _vinit, is because a _test.v file can define consts, and they in turn // may use function calls in their declaration, which may do assertions. diff --git a/vlib/v/slow_tests/assembly/asm_test.amd64.v b/vlib/v/slow_tests/assembly/asm_test.amd64.v index fd720d2c9..bc259aab0 100644 --- a/vlib/v/slow_tests/assembly/asm_test.amd64.v +++ b/vlib/v/slow_tests/assembly/asm_test.amd64.v @@ -74,7 +74,7 @@ fn test_inline_asm() { // assert loops == 1 // assert k == 5 - // not marked as mut because we derefernce m to change l + // not marked as mut because we dereference m to change l l := 5 m := &l asm amd64 { diff --git a/vlib/v/slow_tests/assembly/asm_test.i386.v b/vlib/v/slow_tests/assembly/asm_test.i386.v index cc9683e12..897a5b384 100644 --- a/vlib/v/slow_tests/assembly/asm_test.i386.v +++ b/vlib/v/slow_tests/assembly/asm_test.i386.v @@ -74,7 +74,7 @@ fn test_inline_asm() { // assert loops == 1 // assert k == 5 - // not marked as mut because we derefernce m to change l + // not marked as mut because we dereference m to change l l := 5 m := &l asm i386 { diff --git a/vlib/v/tests/array_slice_test.v b/vlib/v/tests/array_slice_test.v index a89a3087b..4cd1b3ea9 100644 --- a/vlib/v/tests/array_slice_test.v +++ b/vlib/v/tests/array_slice_test.v @@ -83,7 +83,7 @@ fn test_self_slice_push() { fn test_slice_push_child() { mut a := [1.0, 2.0625, 3.5, -7.75, 7.125, 8.4375, 0.5] mut b := unsafe { a[2..6] } // `b` is initially created as reference - mut c := unsafe { b[1..3] } // `c` is initiall reference to `a` and `b` + mut c := unsafe { b[1..3] } // `c` is initially created as references to `a` and `b` b << -2.25 // `b` should be reallocated, so `a` doesn't change c[1] = -13.5 // this should change `c` and `a` but not `b` assert c == [-7.75, -13.5] diff --git a/vlib/v/tests/autolock_array2_test.v b/vlib/v/tests/autolock_array2_test.v index 5d05de593..25e6d1131 100644 --- a/vlib/v/tests/autolock_array2_test.v +++ b/vlib/v/tests/autolock_array2_test.v @@ -8,7 +8,7 @@ fn inc_elements(shared foo []int, n int, mut sem sync.Semaphore) { for _ in 0 .. iterations_per_thread2 { foo[n]++ } - sem.post() // indicat that thread is finished + sem.post() // indicate that thread is finished } fn test_autolocked_array_2() { diff --git a/vlib/v/tests/comptime_call_tmpl_variable_scope_test.v b/vlib/v/tests/comptime_call_tmpl_variable_scope_test.v index 90f9bf3b4..b15b4f3e7 100644 --- a/vlib/v/tests/comptime_call_tmpl_variable_scope_test.v +++ b/vlib/v/tests/comptime_call_tmpl_variable_scope_test.v @@ -3,7 +3,7 @@ struct MyHeapStruct { name string } -// make sure dereferencing of heap stucts works in selector expr (in tmpl), +// make sure dereferencing of heap structs works in selector expr (in tmpl), fn test_heap_struct_dereferencing_in_selector_expr() { a := MyHeapStruct{ name: 'my_heap_struct_a' diff --git a/vlib/v/tests/generic_complex_sumtype_test.v b/vlib/v/tests/generic_complex_sumtype_test.v index 0d6f0fc97..c312e829d 100644 --- a/vlib/v/tests/generic_complex_sumtype_test.v +++ b/vlib/v/tests/generic_complex_sumtype_test.v @@ -74,7 +74,7 @@ fn min[T](tree Tree[T]) T { } } -// delete a value in BST (if nonexistant do nothing) +// delete a value in BST (if nonexistent do nothing) fn delete[T](tree Tree[T], x T) Tree[T] { return match tree { Empty { diff --git a/vlib/v/tests/generics_return_generics_struct_test.v b/vlib/v/tests/generics_return_generics_struct_test.v index 4bfe01b89..83dc555bf 100644 --- a/vlib/v/tests/generics_return_generics_struct_test.v +++ b/vlib/v/tests/generics_return_generics_struct_test.v @@ -69,7 +69,7 @@ fn test_generics_method_return_generics_struct() { assert foo.get[int](o) == 42 } -// test genrics struct str() +// test generic struct str() pub struct ArrayIterator[T] { data []T mut: diff --git a/vlib/v/tests/go_wait_option_test.v b/vlib/v/tests/go_wait_option_test.v index 68a56888f..84242e6d7 100644 --- a/vlib/v/tests/go_wait_option_test.v +++ b/vlib/v/tests/go_wait_option_test.v @@ -53,7 +53,7 @@ fn test_propagate() { assert z == 31.0 } -fn test_array_void_interate() { +fn test_array_void_iter() { mut r := []thread ?{} for i in 0 .. 3 { r << spawn g(i) @@ -67,7 +67,7 @@ fn test_array_void_interate() { assert res[2] == 2 } -fn test_array_val_interate() { +fn test_array_val_iter() { mut r := []thread ?f64{} for i in -1 .. 2 { r << spawn f(i) diff --git a/vlib/v/tests/interface_embedding_complex_test.v b/vlib/v/tests/interface_embedding_complex_test.v index bdcd53735..11c6c2e26 100644 --- a/vlib/v/tests/interface_embedding_complex_test.v +++ b/vlib/v/tests/interface_embedding_complex_test.v @@ -43,7 +43,7 @@ pub struct ContainerBase { ViewBase } -// want to excute this method +// want to execute this method pub fn (mut cb ContainerBase) init(window &Window) { dump(@METHOD) assert true diff --git a/vlib/v/tests/match_with_complex_sumtype_exprs_add_print_test.v b/vlib/v/tests/match_with_complex_sumtype_exprs_add_print_test.v index 7f25b1c86..63ef1c8c0 100644 --- a/vlib/v/tests/match_with_complex_sumtype_exprs_add_print_test.v +++ b/vlib/v/tests/match_with_complex_sumtype_exprs_add_print_test.v @@ -74,7 +74,7 @@ fn min(tree Tree) f64 { } } -// delete a value in BST (if nonexistant do nothing) +// delete a value in BST (if nonexistent do nothing) fn delete(tree Tree, x f64) Tree { return match tree { Empty { diff --git a/vlib/v/tests/match_with_complex_sumtype_exprs_test.v b/vlib/v/tests/match_with_complex_sumtype_exprs_test.v index ba8df07e8..083046a81 100644 --- a/vlib/v/tests/match_with_complex_sumtype_exprs_test.v +++ b/vlib/v/tests/match_with_complex_sumtype_exprs_test.v @@ -74,7 +74,7 @@ fn min(tree Tree) f64 { } } -// delete a value in BST (if nonexistant do nothing) +// delete a value in BST (if nonexistent do nothing) fn delete(tree Tree, x f64) Tree { return match tree { Empty { diff --git a/vlib/v/tests/project_with_c_code_3/mod1/wrapper.v b/vlib/v/tests/project_with_c_code_3/mod1/wrapper.v index a569634bb..3112b8ca6 100644 --- a/vlib/v/tests/project_with_c_code_3/mod1/wrapper.v +++ b/vlib/v/tests/project_with_c_code_3/mod1/wrapper.v @@ -1,11 +1,11 @@ module mod1 -// Note: the function here, should be overriden by the one in the wrapper.c.v file with the same name +// Note: the function here, should be overridden by the one in the wrapper.c.v file with the same name pub fn vadd(a int, b int) int { return 123456 } -// this should NOT be overriden by the different wrapper.X.v files: +// this should NOT be overridden by the different wrapper.X.v files: pub fn a_common_pure_v_fn() int { return 987654 } diff --git a/vlib/v/tests/retry_test.v b/vlib/v/tests/retry_test.v index 6b95b5421..79260e1f9 100644 --- a/vlib/v/tests/retry_test.v +++ b/vlib/v/tests/retry_test.v @@ -7,7 +7,7 @@ import os // The comment above, should make it try re-running the same test, // a maximum of 2 times. It will fail for all, but the last retry. // This is useful for reducing false positives on the CI, due to -// flakyness of specific tests like `vlib/v/live/live_test.v` for example. +// flakiness of specific tests like `vlib/v/live/live_test.v` for example. // Note: this test is supposed to be run with `v test retry_test.v`. // Running just `v retry_test.v` WILL fail. diff --git a/vlib/v/tests/shared_unordered_mixed_test.v b/vlib/v/tests/shared_unordered_mixed_test.v index a47716513..d489fbe39 100644 --- a/vlib/v/tests/shared_unordered_mixed_test.v +++ b/vlib/v/tests/shared_unordered_mixed_test.v @@ -44,7 +44,7 @@ fn doub_large(shared a Large, shared b Large, shared c Large, shared d Large, sh } fn test_mixed_order_lock_rlock() { - // initialze objects so that their sum = 1 + // initialize objects so that their sum = 1 shared a := Large{ l: 4 } diff --git a/vlib/v/tests/string_interpolation_array_test.v b/vlib/v/tests/string_interpolation_array_test.v index f1783c75d..df62f8a73 100644 --- a/vlib/v/tests/string_interpolation_array_test.v +++ b/vlib/v/tests/string_interpolation_array_test.v @@ -2,7 +2,7 @@ // a) an array of custom structs, // b) also for the custom struct itself (when the .str() for it is missing). // -// Note: this is very simillar to string_interpolation_struct_test.v +// Note: this is very similar to string_interpolation_struct_test.v // but they should NOT be merged into 1 file. If you merge it with // string_interpolation_struct_test.v, which tests whether the compiler // can generate the default method for a struct, then the b) case of diff --git a/vlib/v/tests/struct_test.v b/vlib/v/tests/struct_test.v index 483bbc030..120aba01d 100644 --- a/vlib/v/tests/struct_test.v +++ b/vlib/v/tests/struct_test.v @@ -312,19 +312,19 @@ fn test_levels() { } } -// Struct where an inizialized field is after a non-initilized field. +// Struct where an initialized field is after a non-initialized field. struct StructWithDefaultValues1 { field_uninitialized int field_initialized int = 5 } -// Struct where an inizialized field is before a non-initilized field. +// Struct where an initialized field is before a non-initialized field. struct StructWithDefaultValues2 { field_initialized int = 3 field_uninitialized int } -// Struct where an inizialized field is before several non-initilized fields. +// Struct where an initialized field is before several non-initialized fields. struct StructWithDefaultValues3 { field_initialized int = 2 field_uninitialized int diff --git a/vlib/v/tests/sumtype_equality_test.v b/vlib/v/tests/sumtype_equality_test.v index 27f37b59f..5f5e51250 100644 --- a/vlib/v/tests/sumtype_equality_test.v +++ b/vlib/v/tests/sumtype_equality_test.v @@ -21,7 +21,7 @@ fn test_sumtype_equality() { assert u1 != u2 assert u1 != s1 - // Same value, defferent type + // Same value, different type foo := FooBar(Foo{ v: 0 }) diff --git a/vlib/v/tests/var_option_struct_test.v b/vlib/v/tests/var_option_struct_test.v index 67477bb57..93cd7da74 100644 --- a/vlib/v/tests/var_option_struct_test.v +++ b/vlib/v/tests/var_option_struct_test.v @@ -45,5 +45,5 @@ fn test_main() { fn test_opt_call() { mut t := ?Test{} fn_a(none) // returns none - fn_b(t) // returs none + fn_b(t) // returns none } diff --git a/vlib/v/token/keywords_matcher_trie.v b/vlib/v/token/keywords_matcher_trie.v index bd89788a4..02fd18d36 100644 --- a/vlib/v/token/keywords_matcher_trie.v +++ b/vlib/v/token/keywords_matcher_trie.v @@ -1,6 +1,6 @@ module token -// KeywordsMatcherTrie provides a faster way of determinining whether a given name +// KeywordsMatcherTrie provides a faster way of determining whether a given name // is a reserved word (belongs to a given set of previously known words `R`). // See the module description for more details. [heap] diff --git a/vlib/v/token/pos.v b/vlib/v/token/pos.v index 424283c36..c2fff4740 100644 --- a/vlib/v/token/pos.v +++ b/vlib/v/token/pos.v @@ -6,9 +6,9 @@ module token pub struct Pos { pub: len int // length of the literal in the source - line_nr int // the line number in the source where the token occured + line_nr int // the line number in the source where the token occurred pos int // the position of the token in scanner text - col int // the column in the source where the token occured + col int // the column in the source where the token occurred pub mut: last_line int // the line number where the ast object ends (used by vfmt) } diff --git a/vlib/v/transformer/index_state.v b/vlib/v/transformer/index_state.v index adb30334f..4a7277dc2 100644 --- a/vlib/v/transformer/index_state.v +++ b/vlib/v/transformer/index_state.v @@ -70,7 +70,7 @@ fn (mut i IndexState) safe_access(key string, new int) bool { return true } -// safe_offset returns for a previvous array what was the highest +// safe_offset returns for a previous array what was the highest // offset we ever accessed for that identifier fn (mut i IndexState) safe_offset(key string) int { $if no_bounds_checking { diff --git a/vlib/v/transformer/transformer.v b/vlib/v/transformer/transformer.v index e9be41ceb..4d28fa289 100644 --- a/vlib/v/transformer/transformer.v +++ b/vlib/v/transformer/transformer.v @@ -494,7 +494,7 @@ pub fn (mut t Transformer) for_stmt(mut node ast.ForStmt) ast.Stmt { node.cond = t.expr(mut node.cond) match node.cond { ast.BoolLiteral { - if !(node.cond as ast.BoolLiteral).val { // for false { ... } should be eleminated + if !(node.cond as ast.BoolLiteral).val { // for false { ... } should be eliminated return ast.empty_stmt } } diff --git a/vlib/v/util/suggestions.v b/vlib/v/util/suggestions.v index 5784170e8..9ccd281cb 100644 --- a/vlib/v/util/suggestions.v +++ b/vlib/v/util/suggestions.v @@ -111,7 +111,7 @@ pub fn short_module_name(name string) string { } // highlight_suggestion returns a colorfull/highlighted version of `message`, -// but only if the standart error output allows for color messages, otherwise +// but only if the standard error output allows for color messages, otherwise // the plain message will be returned. pub fn highlight_suggestion(message string) string { return term.ecolorize(term.bright_blue, message) diff --git a/vlib/v/util/util.v b/vlib/v/util/util.v index f2275b857..934458027 100644 --- a/vlib/v/util/util.v +++ b/vlib/v/util/util.v @@ -493,7 +493,7 @@ pub fn recompile_file(vexe string, file string) { } // get_vtmp_folder returns the path to a folder, that is writable to V programs, -// and specific to the user. It can be overriden by setting the env variable `VTMP`. +// and specific to the user. It can be overridden by setting the env variable `VTMP`. pub fn get_vtmp_folder() string { return os.vtmp_dir() } diff --git a/vlib/vweb/README.md b/vlib/vweb/README.md index dcb2cfd43..e4e43e5e0 100644 --- a/vlib/vweb/README.md +++ b/vlib/vweb/README.md @@ -441,7 +441,7 @@ struct User { } fn get_session(mut ctx vweb.Context) bool { - // impelement your own logic to get the user + // implement your own logic to get the user user := User{ session_id: '123456' name: 'Vweb' diff --git a/vlib/vweb/vweb.v b/vlib/vweb/vweb.v index a06b08e78..824e986c1 100644 --- a/vlib/vweb/vweb.v +++ b/vlib/vweb/vweb.v @@ -893,7 +893,7 @@ fn route_matches(url_words []string, route_words []string) ?[]string { if url_words.len == route_words.len { for i in 0 .. url_words.len { if route_words[i].starts_with(':') { - // We found a path paramater + // We found a path parameter params << url_words[i] } else if route_words[i] != url_words[i] { // This url does not match the route @@ -910,7 +910,7 @@ fn route_matches(url_words []string, route_words []string) ?[]string { for i in 0 .. route_words.len - 1 { if route_words[i].starts_with(':') { - // We found a path paramater + // We found a path parameter params << url_words[i] } else if route_words[i] != url_words[i] { // This url does not match the route @@ -992,7 +992,7 @@ pub fn (mut ctx Context) host_handle_static(host string, directory_path string, dir_path := directory_path.trim_space().trim_right('/') mut mount_path := '' if dir_path != '.' && os.is_dir(dir_path) && !root { - // Mount point hygene, "./assets" => "/assets". + // Mount point hygiene, "./assets" => "/assets". mount_path = '/' + dir_path.trim_left('.').trim('/') } ctx.scan_static_directory(dir_path, mount_path, host) diff --git a/vlib/x/json2/scanner.v b/vlib/x/json2/scanner.v index 9a071547f..6dd1dc29e 100644 --- a/vlib/x/json2/scanner.v +++ b/vlib/x/json2/scanner.v @@ -33,8 +33,8 @@ enum TokenKind { pub struct Token { lit []u8 // literal representation of the token kind TokenKind // the token number/enum; for quick comparisons - line int // the line in the source where the token occured - col int // the column in the source where the token occured + line int // the line in the source where the token occurred + col int // the column in the source where the token occurred } // full_col returns the full column information which includes the length diff --git a/vlib/x/ttf/README.md b/vlib/x/ttf/README.md index 1ec534329..67d4bc88d 100644 --- a/vlib/x/ttf/README.md +++ b/vlib/x/ttf/README.md @@ -1,6 +1,9 @@ # TTF font utility + ## introduction + This module is designed to perform two main task + - Load the font file - Render text using a TTF font @@ -8,10 +11,12 @@ The render system can be single or multiple, for example it is possible to have render and a HW accelerated render. ## TTF loader + This part of the module do a simple task, load a TTF file and preprocess all the loaded data in order to simplify the rendering phase. Let's start with a simple snippet of code that load a font from the disk: + ```v ignore mut ttf_font := ttf.TTF_File{} ttf_font.buf = os.read_bytes("arial.ttf") or { panic(err) } @@ -28,7 +33,9 @@ We can get some quick info on the font as string using the `get_info_string` fun ```v oksyntax println(ttf_font.get_info_string()) ``` + produces an output like this: + ``` ----- Font Info ----- font_family : Arial @@ -52,10 +59,12 @@ At high level no more action are required to use the loaded font. Multiple fonts can be loaded without problems at the same time. ## TTF Bitmap render + In this module it is possible to have different renders running at the same time. At the present time all the rendering are made on the CPU, sokol is used only to draw the rendered text to the screen. Let's start with a simple snippet of code: + ```v oksyntax import os import x.ttf @@ -68,11 +77,14 @@ fn main() { println(ttf_font.get_info_string()) } ``` + This simple code load a TTF font and display its basic information. ### draw_text + The draw text function draw simple strings without indentation or other imagination tasks. At this point we can render a simple text: + ```v oksyntax import os import x.ttf @@ -85,10 +97,10 @@ fn main() { println(ttf_font.get_info_string()) bmp_width := 200 - bmp_heigth := 64 + bmp_height := 64 bmp_layers := 4 // number of planes for an RGBA buffer // memory size of the buffer - bmp_size := bmp_width * bmp_heigth * bmp_layers + bmp_size := bmp_width * bmp_height * bmp_layers font_size := 32 // font size in points device_dpi := 72 // default screen DPI @@ -104,7 +116,7 @@ fn main() { buf: malloc(bmp_size) buf_size: bmp_size width: bmp_width - height: bmp_heigth + height: bmp_height bp: bmp_layers color: 0x000000_FF // RGBA black scale: scale @@ -116,6 +128,7 @@ fn main() { bmp.save_as_ppm('test.ppm') } ``` + This is the low level render that draw the text on a bitmap and save the bitmap on a disk as `.ppm` file. @@ -126,6 +139,7 @@ Using the low level rendering you need to manage all the amenities like allocate memory and other tasks like calc the character dimensions. You can specify the style for the text rendering in the `BitMap` struct:: + ```v enum Style { outline @@ -134,10 +148,13 @@ enum Style { raw } ``` + Use this level only if you want achieve particular result on text rendering. ### draw_text_block + Draw text block draw a justified and indented block of multiline text in the bitmap. + ```v oksyntax import os import x.ttf @@ -150,10 +167,10 @@ fn main() { println(ttf_font.get_info_string()) bmp_width := 200 - bmp_heigth := 200 + bmp_height := 200 bmp_layers := 4 // number of planes for an RGBA buffer // memory size of the buffer - bmp_size := bmp_width * bmp_heigth * bmp_layers + bmp_size := bmp_width * bmp_height * bmp_layers font_size := 32 // font size in points device_dpi := 72 // default screen DPI @@ -174,7 +191,7 @@ But Vwill prevail for sure, V is the way!! buf: malloc(bmp_size) buf_size: bmp_size width: bmp_width - height: bmp_heigth + height: bmp_height bp: bmp_layers color: 0x000000_FF // RGBA black scale: scale @@ -183,12 +200,14 @@ But Vwill prevail for sure, V is the way!! bmp.clear() bmp.justify = true bmp.align = .left - bmp.draw_text_block(text, x: 0, y: 0, w: bmp_width - 20, h: bmp_heigth) + bmp.draw_text_block(text, x: 0, y: 0, w: bmp_width - 20, h: bmp_height) bmp.save_as_ppm('test.ppm') } ``` + This is the low level render that draw text block on the bitmap. A text block is defined from a `Text_block` struct: + ```v struct Text_block { x int // x position of the left high corner @@ -198,7 +217,9 @@ struct Text_block { cut_lines bool = true // force to cut the line if the length is over the text block width } ``` + and use the following bitmap fields: + ```v ignore style Style = .filled // default style align Text_align = .left // default text align @@ -210,11 +231,13 @@ and use the following bitmap fields: It is possible to modify these parameters to obtain the desired effect on the text rendering. ## TTF Sokol render -The sokol render use the bitmap render to create the text and the `gg` functions to render + +The sokol render use the bitmap render to create the text and the `gg` functions to render the text to the screen. It is simpler to use in a `gg app` than the raw bitmap render. Each single text rendered need its own reder to be declared, after you can modify it. Here a simple example of the usage: + ```v oksyntax import gg import gx diff --git a/vlib/x/ttf/common.v b/vlib/x/ttf/common.v index 307d6f066..a024ecaf0 100644 --- a/vlib/x/ttf/common.v +++ b/vlib/x/ttf/common.v @@ -61,7 +61,7 @@ fn (mut bmp BitMap) format_texture() { b_b := u8((bmp.bg_color >> 8) & 0xFF) b_a := u8(bmp.bg_color & 0xFF) - // trasform buffer in a texture + // transform buffer in a texture x := bmp.buf unsafe { mut i := 0 diff --git a/vlib/x/ttf/render_bmp.v b/vlib/x/ttf/render_bmp.v index cbf0d4fc9..e85551de3 100644 --- a/vlib/x/ttf/render_bmp.v +++ b/vlib/x/ttf/render_bmp.v @@ -32,11 +32,11 @@ pub mut: angle f32 = 0.0 // angle of rotation of the bitmap // spaces space_cw f32 = 1.0 // width of the space glyph internal usage!! - space_mult f32 = f32(0.0) // 1.0/16.0 // space between letter, is a multiplier for a standrd space ax + space_mult f32 = f32(0.0) // 1.0/16.0 // space between letter, is a multiplier for a standard space ax // used only by internal text rendering!! tr_matrix []f32 = [f32(1), 0, 0, 0, 1, 0, 0, 0, 0] // transformation matrix ch_matrix []f32 = [f32(1), 0, 0, 0, 1, 0, 0, 0, 0] // character matrix - style Style = .filled // default syle + style Style = .filled // default style align Text_align = .left // default text align justify bool // justify text flag, default deactivated justify_fill_ratio f32 = 0.5 // justify fill ratio, if the ratio of the filled row is >= of this then justify the text @@ -70,7 +70,7 @@ pub fn (bmp &BitMap) trf_ch(p &Point) (int, int) { p.x * bmp.ch_matrix[1] + p.y * bmp.ch_matrix[4] + bmp.ch_matrix[7]) } -// set draw postion in the buffer +// set draw position in the buffer pub fn (mut bmp BitMap) set_pos(x f32, y f32) { bmp.tr_matrix[6] = x bmp.tr_matrix[7] = y @@ -340,7 +340,7 @@ pub fn (mut bmp BitMap) line(in_x0 int, in_y0 int, in_x1 int, in_y1 int, c u32) dy := -math.abs(y1 - y0) sy := if y0 < y1 { 1 } else { -1 } - // verical line + // vertical line if dx == 0 { if y0 < y1 { for yt in y0 .. y1 + 1 { diff --git a/vlib/x/ttf/render_sokol_cpu.v b/vlib/x/ttf/render_sokol_cpu.v index 7d206ac49..0d540f8ae 100644 --- a/vlib/x/ttf/render_sokol_cpu.v +++ b/vlib/x/ttf/render_sokol_cpu.v @@ -42,7 +42,7 @@ pub fn (mut tf_skl TTF_render_Sokol) create_text(in_txt string, in_font_size f32 font_size := in_font_size //* scale_reduct // Formula: (font_size * device dpi) / (72dpi * em_unit) - // scale := ((1.0 * devide_dpi )/ f32(72 * tf_skl.bmp.tf.units_per_em))* font_size + // scale := ((1.0 * device_dpi )/ f32(72 * tf_skl.bmp.tf.units_per_em))* font_size scale := f32(font_size * device_dpi) / f32(72 * int(tf_skl.bmp.tf.units_per_em)) // dprintln("Scale: $scale") @@ -77,7 +77,7 @@ pub fn (mut tf_skl TTF_render_Sokol) create_text_block(in_txt string, in_w int, device_dpi := tf_skl.device_dpi font_size := in_font_size //* scale_reduct // Formula: (font_size * device dpi) / (72dpi * em_unit) - // scale := ((1.0 * devide_dpi )/ f32(72 * tf_skl.bmp.tf.units_per_em))* font_size + // scale := ((1.0 * device_dpi )/ f32(72 * tf_skl.bmp.tf.units_per_em))* font_size scale := f32(font_size * device_dpi) / f32(72 * int(tf_skl.bmp.tf.units_per_em)) // dprintln("Scale: $scale") diff --git a/vlib/x/ttf/text_block.v b/vlib/x/ttf/text_block.v index 4a9ed3a47..8ae7abecf 100644 --- a/vlib/x/ttf/text_block.v +++ b/vlib/x/ttf/text_block.v @@ -13,10 +13,10 @@ module ttf * TODO: **********************************************************************/ pub struct Text_block { - x int // x postion of the left high corner - y int // y postion of the left high corner + x int // x position of the left high corner + y int // y position of the left high corner w int // width of the text block - h int // heigth of the text block + h int // height of the text block cut_lines bool = true // force to cut the line if the length is over the text block width } diff --git a/vlib/x/ttf/ttf.v b/vlib/x/ttf/ttf.v index f7019efd7..f2cdc00e4 100644 --- a/vlib/x/ttf/ttf.v +++ b/vlib/x/ttf/ttf.v @@ -366,7 +366,7 @@ fn (mut tf TTF_File) read_simple_glyph(mut in_glyph Glyph) { in_glyph.contour_ends << tf.get_u16() } - // skip over intructions + // skip over instructions tf.pos = tf.get_u16() + tf.pos mut num_points := 0 @@ -1106,7 +1106,7 @@ fn (mut tf TTF_File) read_panose_table() { // dprintln('READING! PANOSE offset:${tf.tables['OS/2']}') version := tf.get_u16() dprintln('Panose version: ${version:04x}') - tf.pos += 2 * 14 // move to Panose class + 10 byte array + tf.pos += 2 * 14 // move to Panose class + 10 byte array mut count := 0 // get family -- 2.39.5