aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2023-08-17 10:42:56 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2023-08-17 10:42:56 -0300
commitf4211a5ea4e235ccfa8b8dfa46031c23e9e839e2 (patch)
tree3b8e1055f91a369de67e6b3b690a2c349c9541a1
parent1b3f507f620d996ffb69da7476a19251acfb89ca (diff)
downloadlua-f4211a5ea4e235ccfa8b8dfa46031c23e9e839e2.tar.gz
lua-f4211a5ea4e235ccfa8b8dfa46031c23e9e839e2.tar.bz2
lua-f4211a5ea4e235ccfa8b8dfa46031c23e9e839e2.zip
More control over encoding of test files
The few UTF-8 test files are commented as such, and there is only one non UTF-8 test file (to test non UTF-8 sources).
-rw-r--r--testes/db.lua6
-rw-r--r--testes/files.lua8
-rw-r--r--testes/pm.lua56
-rw-r--r--testes/sort.lua2
-rw-r--r--testes/strings.lua3
-rw-r--r--testes/utf8.lua2
6 files changed, 49 insertions, 28 deletions
diff --git a/testes/db.lua b/testes/db.lua
index 67b58934..d3758c41 100644
--- a/testes/db.lua
+++ b/testes/db.lua
@@ -345,7 +345,7 @@ function f(a,b)
345 local _, y = debug.getlocal(1, 2) 345 local _, y = debug.getlocal(1, 2)
346 assert(x == a and y == b) 346 assert(x == a and y == b)
347 assert(debug.setlocal(2, 3, "pera") == "AA".."AA") 347 assert(debug.setlocal(2, 3, "pera") == "AA".."AA")
348 assert(debug.setlocal(2, 4, "maçã") == "B") 348 assert(debug.setlocal(2, 4, "manga") == "B")
349 x = debug.getinfo(2) 349 x = debug.getinfo(2)
350 assert(x.func == g and x.what == "Lua" and x.name == 'g' and 350 assert(x.func == g and x.what == "Lua" and x.name == 'g' and
351 x.nups == 2 and string.find(x.source, "^@.*db%.lua$")) 351 x.nups == 2 and string.find(x.source, "^@.*db%.lua$"))
@@ -373,9 +373,9 @@ function g (...)
373 local arg = {...} 373 local arg = {...}
374 do local a,b,c; a=math.sin(40); end 374 do local a,b,c; a=math.sin(40); end
375 local feijao 375 local feijao
376 local AAAA,B = "xuxu", "mamão" 376 local AAAA,B = "xuxu", "abacate"
377 f(AAAA,B) 377 f(AAAA,B)
378 assert(AAAA == "pera" and B == "maçã") 378 assert(AAAA == "pera" and B == "manga")
379 do 379 do
380 local B = 13 380 local B = 13
381 local x,y = debug.getlocal(1,5) 381 local x,y = debug.getlocal(1,5)
diff --git a/testes/files.lua b/testes/files.lua
index be00bf3f..1476006e 100644
--- a/testes/files.lua
+++ b/testes/files.lua
@@ -92,8 +92,8 @@ assert(io.output():seek("end") == string.len("alo joao"))
92 92
93assert(io.output():seek("set") == 0) 93assert(io.output():seek("set") == 0)
94 94
95assert(io.write('"álo"', "{a}\n", "second line\n", "third line \n")) 95assert(io.write('"alo"', "{a}\n", "second line\n", "third line \n"))
96assert(io.write('çfourth_line')) 96assert(io.write('Xfourth_line'))
97io.output(io.stdout) 97io.output(io.stdout)
98collectgarbage() -- file should be closed by GC 98collectgarbage() -- file should be closed by GC
99assert(io.input() == io.stdin and rawequal(io.output(), io.stdout)) 99assert(io.input() == io.stdin and rawequal(io.output(), io.stdout))
@@ -300,14 +300,14 @@ do -- test error returns
300end 300end
301checkerr("invalid format", io.read, "x") 301checkerr("invalid format", io.read, "x")
302assert(io.read(0) == "") -- not eof 302assert(io.read(0) == "") -- not eof
303assert(io.read(5, 'l') == '"álo"') 303assert(io.read(5, 'l') == '"alo"')
304assert(io.read(0) == "") 304assert(io.read(0) == "")
305assert(io.read() == "second line") 305assert(io.read() == "second line")
306local x = io.input():seek() 306local x = io.input():seek()
307assert(io.read() == "third line ") 307assert(io.read() == "third line ")
308assert(io.input():seek("set", x)) 308assert(io.input():seek("set", x))
309assert(io.read('L') == "third line \n") 309assert(io.read('L') == "third line \n")
310assert(io.read(1) == "ç") 310assert(io.read(1) == "X")
311assert(io.read(string.len"fourth_line") == "fourth_line") 311assert(io.read(string.len"fourth_line") == "fourth_line")
312assert(io.input():seek("cur", -string.len"fourth_line")) 312assert(io.input():seek("cur", -string.len"fourth_line"))
313assert(io.read() == "fourth_line") 313assert(io.read() == "fourth_line")
diff --git a/testes/pm.lua b/testes/pm.lua
index 795596d4..44454dff 100644
--- a/testes/pm.lua
+++ b/testes/pm.lua
@@ -1,6 +1,9 @@
1-- $Id: testes/pm.lua $ 1-- $Id: testes/pm.lua $
2-- See Copyright Notice in file all.lua 2-- See Copyright Notice in file all.lua
3 3
4-- UTF-8 file
5
6
4print('testing pattern matching') 7print('testing pattern matching')
5 8
6local function checkerror (msg, f, ...) 9local function checkerror (msg, f, ...)
@@ -50,6 +53,19 @@ assert(f('aLo_ALO', '%a*') == 'aLo')
50 53
51assert(f(" \n\r*&\n\r xuxu \n\n", "%g%g%g+") == "xuxu") 54assert(f(" \n\r*&\n\r xuxu \n\n", "%g%g%g+") == "xuxu")
52 55
56
57-- Adapt a pattern to UTF-8
58local function PU (p)
59 -- break '?' into each individual byte of a character
60 p = string.gsub(p, "(" .. utf8.charpattern .. ")%?", function (c)
61 return string.gsub(c, ".", "%0?")
62 end)
63 -- change '.' to utf-8 character patterns
64 p = string.gsub(p, "%.", utf8.charpattern)
65 return p
66end
67
68
53assert(f('aaab', 'a*') == 'aaa'); 69assert(f('aaab', 'a*') == 'aaa');
54assert(f('aaa', '^.*$') == 'aaa'); 70assert(f('aaa', '^.*$') == 'aaa');
55assert(f('aaa', 'b*') == ''); 71assert(f('aaa', 'b*') == '');
@@ -73,16 +89,16 @@ assert(f('aaa', '^.-$') == 'aaa')
73assert(f('aabaaabaaabaaaba', 'b.*b') == 'baaabaaabaaab') 89assert(f('aabaaabaaabaaaba', 'b.*b') == 'baaabaaabaaab')
74assert(f('aabaaabaaabaaaba', 'b.-b') == 'baaab') 90assert(f('aabaaabaaabaaaba', 'b.-b') == 'baaab')
75assert(f('alo xo', '.o$') == 'xo') 91assert(f('alo xo', '.o$') == 'xo')
76assert(f(' \n isto é assim', '%S%S*') == 'isto') 92assert(f(' \n isto é assim', '%S%S*') == 'isto')
77assert(f(' \n isto é assim', '%S*$') == 'assim') 93assert(f(' \n isto é assim', '%S*$') == 'assim')
78assert(f(' \n isto é assim', '[a-z]*$') == 'assim') 94assert(f(' \n isto é assim', '[a-z]*$') == 'assim')
79assert(f('um caracter ? extra', '[^%sa-z]') == '?') 95assert(f('um caracter ? extra', '[^%sa-z]') == '?')
80assert(f('', 'a?') == '') 96assert(f('', 'a?') == '')
81assert(f('á', 'á?') == 'á') 97assert(f('á', PU'á?') == 'á')
82assert(f('ábl', 'á?b?l?') == 'ábl') 98assert(f('ábl', PU'á?b?l?') == 'ábl')
83assert(f(' ábl', 'á?b?l?') == '') 99assert(f(' ábl', PU'á?b?l?') == '')
84assert(f('aa', '^aa?a?a') == 'aa') 100assert(f('aa', '^aa?a?a') == 'aa')
85assert(f(']]]áb', '[^]]') == 'á') 101assert(f(']]]áb', '[^]]+') == 'áb')
86assert(f("0alo alo", "%x*") == "0a") 102assert(f("0alo alo", "%x*") == "0a")
87assert(f("alo alo", "%C+") == "alo alo") 103assert(f("alo alo", "%C+") == "alo alo")
88print('+') 104print('+')
@@ -136,28 +152,28 @@ assert(string.match("alo xyzK", "(%w+)K") == "xyz")
136assert(string.match("254 K", "(%d*)K") == "") 152assert(string.match("254 K", "(%d*)K") == "")
137assert(string.match("alo ", "(%w*)$") == "") 153assert(string.match("alo ", "(%w*)$") == "")
138assert(not string.match("alo ", "(%w+)$")) 154assert(not string.match("alo ", "(%w+)$"))
139assert(string.find("(álo)", "%(á") == 1) 155assert(string.find("(álo)", "%(á") == 1)
140local a, b, c, d, e = string.match("âlo alo", "^(((.).).* (%w*))$") 156local a, b, c, d, e = string.match("âlo alo", PU"^(((.).). (%w*))$")
141assert(a == 'âlo alo' and b == 'âl' and c == 'â' and d == 'alo' and e == nil) 157assert(a == 'âlo alo' and b == 'âl' and c == 'â' and d == 'alo' and e == nil)
142a, b, c, d = string.match('0123456789', '(.+(.?)())') 158a, b, c, d = string.match('0123456789', '(.+(.?)())')
143assert(a == '0123456789' and b == '' and c == 11 and d == nil) 159assert(a == '0123456789' and b == '' and c == 11 and d == nil)
144print('+') 160print('+')
145 161
146assert(string.gsub('ülo ülo', 'ü', 'x') == 'xlo xlo') 162assert(string.gsub('ülo ülo', 'ü', 'x') == 'xlo xlo')
147assert(string.gsub('alo úlo ', ' +$', '') == 'alo úlo') -- trim 163assert(string.gsub('alo úlo ', ' +$', '') == 'alo úlo') -- trim
148assert(string.gsub(' alo alo ', '^%s*(.-)%s*$', '%1') == 'alo alo') -- double trim 164assert(string.gsub(' alo alo ', '^%s*(.-)%s*$', '%1') == 'alo alo') -- double trim
149assert(string.gsub('alo alo \n 123\n ', '%s+', ' ') == 'alo alo 123 ') 165assert(string.gsub('alo alo \n 123\n ', '%s+', ' ') == 'alo alo 123 ')
150local t = "abç d" 166local t = "abç d"
151a, b = string.gsub(t, '(.)', '%1@') 167a, b = string.gsub(t, PU'(.)', '%1@')
152assert('@'..a == string.gsub(t, '', '@') and b == 5) 168assert(a == "a@b@ç@ @d@" and b == 5)
153a, b = string.gsub('abçd', '(.)', '%0@', 2) 169a, b = string.gsub('abçd', PU'(.)', '%0@', 2)
154assert(a == 'a@b@çd' and b == 2) 170assert(a == 'a@b@çd' and b == 2)
155assert(string.gsub('alo alo', '()[al]', '%1') == '12o 56o') 171assert(string.gsub('alo alo', '()[al]', '%1') == '12o 56o')
156assert(string.gsub("abc=xyz", "(%w*)(%p)(%w+)", "%3%2%1-%0") == 172assert(string.gsub("abc=xyz", "(%w*)(%p)(%w+)", "%3%2%1-%0") ==
157 "xyz=abc-abc=xyz") 173 "xyz=abc-abc=xyz")
158assert(string.gsub("abc", "%w", "%1%0") == "aabbcc") 174assert(string.gsub("abc", "%w", "%1%0") == "aabbcc")
159assert(string.gsub("abc", "%w+", "%0%1") == "abcabc") 175assert(string.gsub("abc", "%w+", "%0%1") == "abcabc")
160assert(string.gsub('áéí', '$', '\0óú') == 'áéí\0óú') 176assert(string.gsub('áéí', '$', '\0óú') == 'áéí\0óú')
161assert(string.gsub('', '^', 'r') == 'r') 177assert(string.gsub('', '^', 'r') == 'r')
162assert(string.gsub('', '$', 'r') == 'r') 178assert(string.gsub('', '$', 'r') == 'r')
163print('+') 179print('+')
@@ -188,8 +204,8 @@ do
188end 204end
189 205
190function f(a,b) return string.gsub(a,'.',b) end 206function f(a,b) return string.gsub(a,'.',b) end
191assert(string.gsub("trocar tudo em |teste|b| é |beleza|al|", "|([^|]*)|([^|]*)|", f) == 207assert(string.gsub("trocar tudo em |teste|b| é |beleza|al|", "|([^|]*)|([^|]*)|", f) ==
192 "trocar tudo em bbbbb é alalalalalal") 208 "trocar tudo em bbbbb é alalalalalal")
193 209
194local function dostring (s) return load(s, "")() or "" end 210local function dostring (s) return load(s, "")() or "" end
195assert(string.gsub("alo $a='x'$ novamente $return a$", 211assert(string.gsub("alo $a='x'$ novamente $return a$",
diff --git a/testes/sort.lua b/testes/sort.lua
index 52919b8c..40bb2d8a 100644
--- a/testes/sort.lua
+++ b/testes/sort.lua
@@ -289,7 +289,7 @@ timesort(a, limit, function(x,y) return nil end, "equal")
289 289
290for i,v in pairs(a) do assert(v == false) end 290for i,v in pairs(a) do assert(v == false) end
291 291
292AA = {"álo", "\0first :-)", "alo", "then this one", "45", "and a new"} 292AA = {"\xE1lo", "\0first :-)", "alo", "then this one", "45", "and a new"}
293table.sort(AA) 293table.sort(AA)
294check(AA) 294check(AA)
295 295
diff --git a/testes/strings.lua b/testes/strings.lua
index b033c6ab..90983edd 100644
--- a/testes/strings.lua
+++ b/testes/strings.lua
@@ -1,6 +1,9 @@
1-- $Id: testes/strings.lua $ 1-- $Id: testes/strings.lua $
2-- See Copyright Notice in file all.lua 2-- See Copyright Notice in file all.lua
3 3
4-- ISO Latin encoding
5
6
4print('testing strings and string library') 7print('testing strings and string library')
5 8
6local maxi <const> = math.maxinteger 9local maxi <const> = math.maxinteger
diff --git a/testes/utf8.lua b/testes/utf8.lua
index c5a9dd3f..efadbd5c 100644
--- a/testes/utf8.lua
+++ b/testes/utf8.lua
@@ -1,6 +1,8 @@
1-- $Id: testes/utf8.lua $ 1-- $Id: testes/utf8.lua $
2-- See Copyright Notice in file all.lua 2-- See Copyright Notice in file all.lua
3 3
4-- UTF-8 file
5
4print "testing UTF-8 library" 6print "testing UTF-8 library"
5 7
6local utf8 = require'utf8' 8local utf8 = require'utf8'