diff options
| author | skytrias <skytrias@protonmail.com> | 2022-12-21 21:36:50 +0100 |
|---|---|---|
| committer | skytrias <skytrias@protonmail.com> | 2022-12-21 21:36:50 +0100 |
| commit | e5d0417a6cfb4c140daca76be8ddd298c72cfd90 (patch) | |
| tree | 8af748a0fedb3aa2168be608cd805fe620c03801 | |
| parent | 1bea0f37720db3af0eeb19b72f3ae9aa05c0b0fa (diff) | |
folder name changed
| -rw-r--r-- | core/text/match/strlib.odin (renamed from core/text/lua/strlib.odin) | 0 | ||||
| -rw-r--r-- | tests/core/Makefile | 8 | ||||
| -rw-r--r-- | tests/core/text/match/test_core_text_match.odin (renamed from tests/core/text/lua/test_core_text_lua.odin) | 50 |
3 files changed, 29 insertions, 29 deletions
diff --git a/core/text/lua/strlib.odin b/core/text/match/strlib.odin index 12bb45aae..12bb45aae 100644 --- a/core/text/lua/strlib.odin +++ b/core/text/match/strlib.odin diff --git a/tests/core/Makefile b/tests/core/Makefile index 8a36f7ea3..478d6ae2c 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -2,7 +2,7 @@ ODIN=../../odin PYTHON=$(shell which python3) all: download_test_assets image_test compress_test strings_test hash_test crypto_test noise_test encoding_test \ - math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test i18n_test lua_strlib_test c_libc_test + math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test i18n_test match_test c_libc_test download_test_assets: $(PYTHON) download_assets.py @@ -49,8 +49,8 @@ os_exit_test: i18n_test: $(ODIN) run text/i18n -out:test_core_i18n -lua_strlib_test: - $(ODIN) run text/lua -out:test_core_lua_strlib +match_test: + $(ODIN) run text/match -out:test_core_match c_libc_test: - $(ODIN) run c/libc -out:test_core_libc
\ No newline at end of file + $(ODIN) run c/libc -out:test_core_libc diff --git a/tests/core/text/lua/test_core_text_lua.odin b/tests/core/text/match/test_core_text_match.odin index f6b6e78a8..79defb849 100644 --- a/tests/core/text/lua/test_core_text_lua.odin +++ b/tests/core/text/match/test_core_text_match.odin @@ -1,6 +1,6 @@ package test_strlib -import lua "core:text/lua" +import "core:text/match" import "core:testing" import "core:fmt" import "core:os" @@ -62,8 +62,8 @@ test_find :: proc(t: ^testing.T) { } for entry, i in ENTRIES { - matcher := lua.matcher_init(entry.s, entry.p, entry.offset) - start, end, ok := lua.matcher_find(&matcher) + matcher := match.matcher_init(entry.s, entry.p, entry.offset) + start, end, ok := match.matcher_find(&matcher) success := entry.match.ok == ok && start == entry.match.start && end == entry.match.end if failed(t, success) { @@ -179,8 +179,8 @@ test_match :: proc(t: ^testing.T) { } for entry, i in ENTRIES { - matcher := lua.matcher_init(entry.s, entry.p) - result, ok := lua.matcher_match(&matcher) + matcher := match.matcher_init(entry.s, entry.p) + result, ok := match.matcher_match(&matcher) success := entry.ok == ok && result == entry.result if failed(t, success) { @@ -196,12 +196,12 @@ test_match :: proc(t: ^testing.T) { test_captures :: proc(t: ^testing.T) { Temp :: struct { pattern: string, - captures: [lua.MAX_CAPTURES]lua.Match, + captures: [match.MAX_CAPTURES]match.Match, } // match all captures compare_captures :: proc(t: ^testing.T, test: ^Temp, haystack: string, comp: []string, loc := #caller_location) { - length, err := lua.find_aux(haystack, test.pattern, 0, false, &test.captures) + length, err := match.find_aux(haystack, test.pattern, 0, false, &test.captures) if failed(t, len(comp) == length) { logf(t, "Captures Compare Failed -> Lengths %d != %d\n", len(comp), length) } @@ -218,7 +218,7 @@ test_captures :: proc(t: ^testing.T) { // match to expected results matches :: proc(t: ^testing.T, test: ^Temp, haystack: string, ok: bool, loc := #caller_location) { - length, err := lua.find_aux(haystack, test.pattern, 0, false, &test.captures) + length, err := match.find_aux(haystack, test.pattern, 0, false, &test.captures) result := length > 0 && err == .OK if failed(t, result == ok) { @@ -244,8 +244,8 @@ test_captures :: proc(t: ^testing.T) { { haystack := " 233 hello dolly" pattern := "%s*(%d+)%s+(%S+)" - captures: [lua.MAX_CAPTURES]lua.Match - lua.find_aux(haystack, pattern, 0, false, &captures) + captures: [match.MAX_CAPTURES]match.Match + match.find_aux(haystack, pattern, 0, false, &captures) cap1 := captures[1] cap2 := captures[2] text1 := haystack[cap1.byte_start:cap1.byte_end] @@ -265,28 +265,28 @@ gmatch_check :: proc(t: ^testing.T, index: int, a: []string, b: string) { @test test_gmatch :: proc(t: ^testing.T) { { - matcher := lua.matcher_init("testing this out 123", "%w+") + matcher := match.matcher_init("testing this out 123", "%w+") output := [?]string { "testing", "this", "out", "123" } - for match, index in lua.matcher_gmatch(&matcher) { + for match, index in match.matcher_gmatch(&matcher) { gmatch_check(t, index, output[:], match) } } { - matcher := lua.matcher_init("#afdde6", "%x%x") + matcher := match.matcher_init("#afdde6", "%x%x") output := [?]string { "af", "dd", "e6" } - for match, index in lua.matcher_gmatch(&matcher) { + for match, index in match.matcher_gmatch(&matcher) { gmatch_check(t, index, output[:], match) } } { - matcher := lua.matcher_init("testing outz captures yo outz outtz", "(out)z") + matcher := match.matcher_init("testing outz captures yo outz outtz", "(out)z") output := [?]string { "out", "out" } - for match, index in lua.matcher_gmatch(&matcher) { + for match, index in match.matcher_gmatch(&matcher) { gmatch_check(t, index, output[:], match) } } @@ -294,9 +294,9 @@ test_gmatch :: proc(t: ^testing.T) { @test test_gsub :: proc(t: ^testing.T) { - result := lua.gsub("testing123testing", "%d+", " sup ", context.temp_allocator) + result := match.gsub("testing123testing", "%d+", " sup ", context.temp_allocator) expect(t, result == "testing sup testing", "GSUB 0: failed") - result = lua.gsub("testing123testing", "%a+", "345", context.temp_allocator) + result = match.gsub("testing123testing", "%a+", "345", context.temp_allocator) expect(t, result == "345123345", "GSUB 1: failed") } @@ -304,12 +304,12 @@ test_gsub :: proc(t: ^testing.T) { test_gfind :: proc(t: ^testing.T) { haystack := "test1 123 test2 123 test3" pattern := "%w+" - captures: [lua.MAX_CAPTURES]lua.Match + captures: [match.MAX_CAPTURES]match.Match s := &haystack output := [?]string { "test1", "123", "test2", "123", "test3" } index: int - for word in lua.gfind(s, pattern, &captures) { + for word in match.gfind(s, pattern, &captures) { if failed(t, output[index] == word) { logf(t, "GFIND %d failed!\n", index) logf(t, "\t%s != %s\n", output[index], word) @@ -326,7 +326,7 @@ test_frontier :: proc(t: ^testing.T) { output: [3]string, } - call :: proc(data: rawptr, word: string, haystack: string, captures: []lua.Match) { + call :: proc(data: rawptr, word: string, haystack: string, captures: []match.Match) { temp := cast(^Temp) data if failed(temp.t, word == temp.output[temp.index]) { @@ -347,15 +347,15 @@ test_frontier :: proc(t: ^testing.T) { } // https://lua-users.org/wiki/FrontierPattern example taken from here - lua.gsub_with("THE (QUICK) brOWN FOx JUMPS", "%f[%a]%u+%f[%A]", &temp, call) + match.gsub_with("THE (QUICK) brOWN FOx JUMPS", "%f[%a]%u+%f[%A]", &temp, call) } @test test_utf8 :: proc(t: ^testing.T) { - matcher := lua.matcher_init("恥ず べき恥 フク恥ロ", "%w+") + matcher := match.matcher_init("恥ず べき恥 フク恥ロ", "%w+") output := [?]string { "恥ず", "べき恥", "フク恥ロ" } - for match, index in lua.matcher_gmatch(&matcher) { + for match, index in match.matcher_gmatch(&matcher) { gmatch_check(t, index, output[:], match) } } @@ -363,7 +363,7 @@ test_utf8 :: proc(t: ^testing.T) { @test test_case_insensitive :: proc(t: ^testing.T) { { - pattern := lua.pattern_case_insensitive("test", 256, context.temp_allocator) + pattern := match.pattern_case_insensitive("test", 256, context.temp_allocator) goal := "[tT][eE][sS][tT]" if failed(t, pattern == goal) { |