From 5a9de6ba0acc846609a345d0f000aa3b62c249cb Mon Sep 17 00:00:00 2001
From: Kampfkarren <boynedmaster@gmail.com>
Date: Tue, 26 Jul 2022 18:57:09 -0700
Subject: [PATCH] Fix string tests (VS Code was breaking it somehow? Not
 StyLua)

---
 tests/Conformance.test.cpp    |   3 +-
 tests/conformance/strings.lua | 198 ++++++++++++++++------------------
 2 files changed, 95 insertions(+), 106 deletions(-)

diff --git a/tests/Conformance.test.cpp b/tests/Conformance.test.cpp
index 916f61f0..42a670e8 100644
--- a/tests/Conformance.test.cpp
+++ b/tests/Conformance.test.cpp
@@ -291,8 +291,7 @@ TEST_CASE("Clear")
 
 TEST_CASE("Strings")
 {
-    // INTERP TODO: Bring this back
-    // runConformance("strings.lua");
+    runConformance("strings.lua");
 }
 
 TEST_CASE("StringInterp")
diff --git a/tests/conformance/strings.lua b/tests/conformance/strings.lua
index bb4b8fc6..30732e85 100644
--- a/tests/conformance/strings.lua
+++ b/tests/conformance/strings.lua
@@ -1,43 +1,43 @@
 -- This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
 -- This file is based on Lua 5.x tests -- https://github.com/lua/lua/tree/master/testes
-print("testing strings and string library")
+print('testing strings and string library')
 
-assert("alo" < "alo1")
-assert("" < "a")
-assert("alo\0alo" < "alo\0b")
-assert("alo\0alo\0\0" > "alo\0alo\0")
-assert("alo" < "alo\0")
-assert("alo\0" > "alo")
-assert("\0" < "\1")
-assert("\0\0" < "\0\1")
-assert("\1\0a\0a" <= "\1\0a\0a")
-assert(not ("\1\0a\0b" <= "\1\0a\0a"))
-assert("\0\0\0" < "\0\0\0\0")
-assert(not ("\0\0\0\0" < "\0\0\0"))
-assert("\0\0\0" <= "\0\0\0\0")
-assert(not ("\0\0\0\0" <= "\0\0\0"))
-assert("\0\0\0" <= "\0\0\0")
-assert("\0\0\0" >= "\0\0\0")
-assert(not ("\0\0b" < "\0\0a\0"))
-print("+")
+assert('alo' < 'alo1')
+assert('' < 'a')
+assert('alo\0alo' < 'alo\0b')
+assert('alo\0alo\0\0' > 'alo\0alo\0')
+assert('alo' < 'alo\0')
+assert('alo\0' > 'alo')
+assert('\0' < '\1')
+assert('\0\0' < '\0\1')
+assert('\1\0a\0a' <= '\1\0a\0a')
+assert(not ('\1\0a\0b' <= '\1\0a\0a'))
+assert('\0\0\0' < '\0\0\0\0')
+assert(not('\0\0\0\0' < '\0\0\0'))
+assert('\0\0\0' <= '\0\0\0\0')
+assert(not('\0\0\0\0' <= '\0\0\0'))
+assert('\0\0\0' <= '\0\0\0')
+assert('\0\0\0' >= '\0\0\0')
+assert(not ('\0\0b' < '\0\0a\0'))
+print('+')
 
-assert(string.sub("123456789", 2, 4) == "234")
-assert(string.sub("123456789", 7) == "789")
-assert(string.sub("123456789", 7, 6) == "")
-assert(string.sub("123456789", 7, 7) == "7")
-assert(string.sub("123456789", 0, 0) == "")
-assert(string.sub("123456789", -10, 10) == "123456789")
-assert(string.sub("123456789", 1, 9) == "123456789")
-assert(string.sub("123456789", -10, -20) == "")
-assert(string.sub("123456789", -1) == "9")
-assert(string.sub("123456789", -4) == "6789")
-assert(string.sub("123456789", -6, -4) == "456")
-assert(string.sub("\000123456789", 3, 5) == "234")
+assert(string.sub("123456789",2,4) == "234")
+assert(string.sub("123456789",7) == "789")
+assert(string.sub("123456789",7,6) == "")
+assert(string.sub("123456789",7,7) == "7")
+assert(string.sub("123456789",0,0) == "")
+assert(string.sub("123456789",-10,10) == "123456789")
+assert(string.sub("123456789",1,9) == "123456789")
+assert(string.sub("123456789",-10,-20) == "")
+assert(string.sub("123456789",-1) == "9")
+assert(string.sub("123456789",-4) == "6789")
+assert(string.sub("123456789",-6, -4) == "456")
+assert(string.sub("\000123456789",3,5) == "234")
 assert(("\000123456789"):sub(8) == "789")
-print("+")
+print('+')
 
 assert(string.find("123456789", "345") == 3)
-a, b = string.find("123456789", "345")
+a,b = string.find("123456789", "345")
 assert(string.sub("123456789", a, b) == "345")
 assert(string.find("1234567890123456789", "345", 3) == 3)
 assert(string.find("1234567890123456789", "345", 4) == 13)
@@ -45,10 +45,10 @@ assert(string.find("1234567890123456789", "346", 4) == nil)
 assert(string.find("1234567890123456789", ".45", -9) == 13)
 assert(string.find("abcdefg", "\0", 5, 1) == nil)
 assert(string.find("", "") == 1)
-assert(string.find("", "aaa", 1) == nil)
-assert(("alo(.)alo"):find("(.)", 1, 1) == 4)
-assert(string.find("", "1", 2) == nil)
-print("+")
+assert(string.find('', 'aaa', 1) == nil)
+assert(('alo(.)alo'):find('(.)', 1, 1) == 4)
+assert(string.find('', '1', 2) == nil)
+print('+')
 
 assert(string.len("") == 0)
 assert(string.len("\0\0\0") == 3)
@@ -60,11 +60,11 @@ assert(#"\0\0\0" == 3)
 assert(#"1234567890" == 10)
 
 assert(string.byte("a") == 97)
-assert(string.byte("�") > 127)
+assert(string.byte("á") > 127)
 assert(string.byte(string.char(255)) == 255)
 assert(string.byte(string.char(0)) == 0)
 assert(string.byte("\0") == 0)
-assert(string.byte("\0\0alo\0x", -1) == string.byte("x"))
+assert(string.byte("\0\0alo\0x", -1) == string.byte('x'))
 assert(string.byte("ba", 2) == 97)
 assert(string.byte("\n\n", 2, -1) == 10)
 assert(string.byte("\n\n", 2, 2) == 10)
@@ -75,69 +75,60 @@ assert(string.byte("hi", 9, 10) == nil)
 assert(string.byte("hi", 2, 1) == nil)
 assert(string.char() == "")
 assert(string.char(0, 255, 0) == "\0\255\0")
--- INTERP CODE REVIEW: This test started failing! I don't know why.
--- It isn't related to my lstrlib changes.
-assert(string.char(0, string.byte("�"), 0) == "\0�\0")
-assert(string.char(string.byte("�l\0�u", 1, -1)) == "�l\0�u")
-assert(string.char(string.byte("�l\0�u", 1, 0)) == "")
-assert(string.char(string.byte("�l\0�u", -10, 100)) == "�l\0�u")
-assert(pcall(function()
-	return string.char(256)
-end) == false)
-assert(pcall(function()
-	return string.char(-1)
-end) == false)
-print("+")
+assert(string.char(0, string.byte("á"), 0) == "\0á\0")
+assert(string.char(string.byte("ál\0óu", 1, -1)) == "ál\0óu")
+assert(string.char(string.byte("ál\0óu", 1, 0)) == "")
+assert(string.char(string.byte("ál\0óu", -10, 100)) == "ál\0óu")
+assert(pcall(function() return string.char(256) end) == false)
+assert(pcall(function() return string.char(-1) end) == false)
+print('+')
 
 assert(string.upper("ab\0c") == "AB\0C")
 assert(string.lower("\0ABCc%$") == "\0abcc%$")
-assert(string.rep("teste", 0) == "")
-assert(string.rep("t�s\00t�", 2) == "t�s\0t�t�s\000t�")
-assert(string.rep("", 10) == "")
+assert(string.rep('teste', 0) == '')
+assert(string.rep('tés\00tê', 2) == 'tés\0têtés\000tê')
+assert(string.rep('', 10) == '')
 
-assert(string.reverse("") == "")
-assert(string.reverse("\0\1\2\3") == "\3\2\1\0")
-assert(string.reverse("\0001234") == "4321\0")
+assert(string.reverse"" == "")
+assert(string.reverse"\0\1\2\3" == "\3\2\1\0")
+assert(string.reverse"\0001234" == "4321\0")
 
-for i = 0, 30 do
-	assert(string.len(string.rep("a", i)) == i)
-end
+for i=0,30 do assert(string.len(string.rep('a', i)) == i) end
 
-assert(type(tostring(nil)) == "string")
-assert(type(tostring(12)) == "string")
-assert("" .. 12 == "12" and type(12 .. "") == "string")
-assert(string.find(tostring({}), "table:"))
-assert(string.find(tostring(print), "function:"))
-assert(tostring(1234567890123) == "1234567890123")
-assert(#tostring("\0") == 1)
+assert(type(tostring(nil)) == 'string')
+assert(type(tostring(12)) == 'string')
+assert(''..12 == '12' and type(12 .. '') == 'string')
+assert(string.find(tostring{}, 'table:'))
+assert(string.find(tostring(print), 'function:'))
+assert(tostring(1234567890123) == '1234567890123')
+assert(#tostring('\0') == 1)
 assert(tostring(true) == "true")
 assert(tostring(false) == "false")
-print("+")
+print('+')
 
-x = '"�lo"\n\\'
-assert(string.format("%q%s", x, x) == '"\\"�lo\\"\\\n\\\\""�lo"\n\\')
-assert(string.format("%q", "\0") == [["\000"]])
-assert(string.format("%q", "\r") == [["\r"]])
-assert(string.format("\0%c\0%c%x\0", string.byte("�"), string.byte("b"), 140) == "\0�\0b8c\0")
-assert(string.format("") == "")
-assert(
-	string.format("%c", 34) .. string.format("%c", 48) .. string.format("%c", 90) .. string.format("%c", 100)
-		== string.format("%c%c%c%c", 34, 48, 90, 100)
-)
-assert(string.format("%s\0 is not \0%s", "not be", "be") == "not be\0 is not \0be")
+x = '"ílo"\n\\'
+assert(string.format('%q%s', x, x) == '"\\"ílo\\"\\\n\\\\""ílo"\n\\')
+assert(string.format('%q', "\0") == [["\000"]])
+assert(string.format('%q', "\r") == [["\r"]])
+assert(string.format("\0%c\0%c%x\0", string.byte("á"), string.byte("b"), 140) ==
+              "\0á\0b8c\0")
+assert(string.format('') == "")
+assert(string.format("%c",34)..string.format("%c",48)..string.format("%c",90)..string.format("%c",100) ==
+       string.format("%c%c%c%c", 34, 48, 90, 100))
+assert(string.format("%s\0 is not \0%s", 'not be', 'be') == 'not be\0 is not \0be')
 assert(string.format("%%%d %010d", 10, 23) == "%10 0000000023")
 assert(tonumber(string.format("%f", 10.3)) == 10.3)
-x = string.format('"%-50s"', "a")
+x = string.format('"%-50s"', 'a')
 assert(#x == 52)
 assert(string.sub(x, 1, 4) == '"a  ')
 
-assert(string.format("-%.20s.20s", string.rep("%", 2000)) == "-" .. string.rep("%", 20) .. ".20s")
-assert(
-	string.format('"-%20s.20s"', string.rep("%", 2000)) == string.format("%q", "-" .. string.rep("%", 2000) .. ".20s")
-)
+assert(string.format("-%.20s.20s", string.rep("%", 2000)) == "-"..string.rep("%", 20)..".20s")
+assert(string.format('"-%20s.20s"', string.rep("%", 2000)) ==
+       string.format("%q", "-"..string.rep("%", 2000)..".20s"))
+
 
 -- longest number that can be formated
-assert(string.len(string.format("%99.99f", -1e308)) >= 100)
+assert(string.len(string.format('%99.99f', -1e308)) >= 100)
 
 local function return_one_thing()
 	return "hi"
@@ -152,22 +143,20 @@ assert(pcall(function()
 	string.format("%* %* %*", return_two_nils())
 end) == false)
 
-assert(loadstring("return 1\n--coment�rio sem EOL no final")() == 1)
+assert(loadstring("return 1\n--comentário sem EOL no final")() == 1)
 
-assert(table.concat({}) == "")
-assert(table.concat({}, "x") == "")
-assert(table.concat({ "\0", "\0\1", "\0\1\2" }, ".\0.") == "\0.\0.\0\1.\0.\0\1\2")
-local a = {}
-for i = 1, 3000 do
-	a[i] = "xuxu"
-end
-assert(table.concat(a, "123") .. "123" == string.rep("xuxu123", 3000))
+
+assert(table.concat{} == "")
+assert(table.concat({}, 'x') == "")
+assert(table.concat({'\0', '\0\1', '\0\1\2'}, '.\0.') == "\0.\0.\0\1.\0.\0\1\2")
+local a = {}; for i=1,3000 do a[i] = "xuxu" end
+assert(table.concat(a, "123").."123" == string.rep("xuxu123", 3000))
 assert(table.concat(a, "b", 20, 20) == "xuxu")
 assert(table.concat(a, "", 20, 21) == "xuxuxuxu")
 assert(table.concat(a, "", 22, 21) == "")
 assert(table.concat(a, "3", 2999) == "xuxu3xuxu")
 
-a = { "a", "b", "c" }
+a = {"a","b","c"}
 assert(table.concat(a, ",", 1, 0) == "")
 assert(table.concat(a, ",", 1, 1) == "a")
 assert(table.concat(a, ",", 1, 2) == "a,b")
@@ -187,22 +176,23 @@ end
 if not trylocale("collate")  then
   print("locale not supported")
 else
-  assert("alo" < "�lo" and "�lo" < "amo")
+  assert("alo" < "álo" and "álo" < "amo")
 end
 
 if not trylocale("ctype") then
   print("locale not supported")
 else
-  assert(string.gsub("�����", "%a", "x") == "xxxxx")
-  assert(string.gsub("����", "%l", "x") == "x�x�")
-  assert(string.gsub("����", "%u", "x") == "�x�x")
-  assert(string.upper"���{xuxu}��o" == "���{XUXU}��O")
+  assert(string.gsub("áéíóú", "%a", "x") == "xxxxx")
+  assert(string.gsub("áÁéÉ", "%l", "x") == "xÁxÉ")
+  assert(string.gsub("áÁéÉ", "%u", "x") == "áxéx")
+  assert(string.upper"áÁé{xuxu}ção" == "ÁÁÉ{XUXU}ÇÃO")
 end
 
 os.setlocale("C")
 assert(os.setlocale() == 'C')
 assert(os.setlocale(nil, "numeric") == 'C')
-]]
---
+]]--
+
+return('OK')
+
 
-return "OK"