Author: fperrad
Date: Sun Sep 30 23:57:26 2007
New Revision: 21714
Modified:
trunk/languages/lua/t/alarm.t
trunk/languages/lua/t/os.t
trunk/languages/lua/t/pmc/closure.t
trunk/languages/lua/t/pmc/function.t
trunk/languages/lua/t/pmc/table.t
trunk/languages/lua/t/pmc/thread.t
trunk/languages/lua/t/pmc/userdata.t
trunk/languages/lua/t/standalone.t
trunk/languages/lua/t/test-from-lua.t
Log:
[Lua]
- refactor some regex (with x modifier)
Modified: trunk/languages/lua/t/alarm.t
==============================================================================
--- trunk/languages/lua/t/alarm.t (original)
+++ trunk/languages/lua/t/alarm.t Sun Sep 30 23:57:26 2007
@@ -85,7 +85,12 @@
print(a)
print"bye"
CODE
-/^hello\n(in alarm!\t\d\d:\d\d:\d\d\t\d+\t\d+%\n)+100000\nbye/gm
+/^
+hello\n
+(in\salarm!\t\d\d:\d\d:\d\d\t\d+\t\d+%\n)+
+100000\n
+bye
+/gmx
OUTPUT
language_output_like( 'lua', << 'CODE', << 'OUTPUT', 'function alarm (bad
delay)' );
Modified: trunk/languages/lua/t/os.t
==============================================================================
--- trunk/languages/lua/t/os.t (original)
+++ trunk/languages/lua/t/os.t Sun Sep 30 23:57:26 2007
@@ -204,7 +204,10 @@
isdst = 0,
}))
CODE
-/^946\d+\nnil\n$/
+/^
+946\d+\n
+nil\n
+$/x
OUTPUT
language_output_like( 'lua', << 'CODE', << 'OUTPUT', 'function os.time
(missing field)' );
Modified: trunk/languages/lua/t/pmc/closure.t
==============================================================================
--- trunk/languages/lua/t/pmc/closure.t (original)
+++ trunk/languages/lua/t/pmc/closure.t Sun Sep 30 23:57:26 2007
@@ -216,7 +216,11 @@
print "\n"
.end
CODE
-/^function: [0-9A-Fa-f]{8}\nfunction: [0-9A-Fa-f]{8}\nstring/
+/^
+function:\s[0-9A-Fa-f]{8}\n
+function:\s[0-9A-Fa-f]{8}\n
+string\n
+/x
OUTPUT
pir_output_is( << 'CODE', << 'OUTPUT', 'check tonumber' );
@@ -275,7 +279,7 @@
tmp_1(tmp_1)
.end
CODE
-/function: [0-9A-Fa-f]{8}/
+/^function: [0-9A-Fa-f]{8}/
OUTPUT
}
@@ -295,7 +299,7 @@
.include 'languages/lua/lib/luaaux.pir'
.include 'languages/lua/lib/luabasic.pir'
CODE
-/function: [0-9A-Fa-f]{8}/
+/^function: [0-9A-Fa-f]{8}/
OUTPUT
pir_output_like( << 'CODE', << 'OUTPUT', 'from compilation' );
@@ -328,7 +332,11 @@
$P2()
.end
CODE
-/^function: [0-9A-Fa-f]{8}\ntable: [0-9A-Fa-f]{8}\nf1/
+/^
+function:\s[0-9A-Fa-f]{8}\n
+table:\s[0-9A-Fa-f]{8}\n
+f1\n
+/x
OUTPUT
open my $X, '>', '../foo.pir';
@@ -362,7 +370,11 @@
$P2()
.end
CODE
-/^function: [0-9A-Fa-f]{8}\ntable: [0-9A-Fa-f]{8}\nf1/
+/^
+function:\s[0-9A-Fa-f]{8}\n
+table:\s[0-9A-Fa-f]{8}\n
+f1\n
+/x
OUTPUT
system("parrot -o ../foo.pbc ../foo.pir");
@@ -381,7 +393,11 @@
$P2()
.end
CODE
-/^function: [0-9A-Fa-f]{8}\ntable: [0-9A-Fa-f]{8}\nf1/
+/^
+function:\s[0-9A-Fa-f]{8}\n
+table:\s[0-9A-Fa-f]{8}\n
+f1\n
+/x
OUTPUT
unlink '../foo.pir';
@@ -409,7 +425,10 @@
$P2()
.end
CODE
-/^function: [0-9A-Fa-f]{8}\nf1/
+/^
+function:\s[0-9A-Fa-f]{8}\n
+f1\n
+/x
OUTPUT
# Local Variables:
Modified: trunk/languages/lua/t/pmc/function.t
==============================================================================
--- trunk/languages/lua/t/pmc/function.t (original)
+++ trunk/languages/lua/t/pmc/function.t Sun Sep 30 23:57:26 2007
@@ -216,7 +216,11 @@
print "\n"
.end
CODE
-/^function: [0-9A-Fa-f]{8}\nfunction: [0-9A-Fa-f]{8}\nstring/
+/^
+function:\s[0-9A-Fa-f]{8}\n
+function:\s[0-9A-Fa-f]{8}\n
+string\n
+/x
OUTPUT
pir_output_is( << 'CODE', << 'OUTPUT', 'check tonumber' );
Modified: trunk/languages/lua/t/pmc/table.t
==============================================================================
--- trunk/languages/lua/t/pmc/table.t (original)
+++ trunk/languages/lua/t/pmc/table.t Sun Sep 30 23:57:26 2007
@@ -364,7 +364,11 @@
print "\n"
.end
CODE
-/^table: [0-9A-Fa-f]{8}\ntable: [0-9A-Fa-f]{8}\nstring/
+/^
+table:\s[0-9A-Fa-f]{8}\n
+table:\s[0-9A-Fa-f]{8}\n
+string\n
+/x
OUTPUT
pir_output_is( << 'CODE', << 'OUTPUT', 'check tonumber' );
Modified: trunk/languages/lua/t/pmc/thread.t
==============================================================================
--- trunk/languages/lua/t/pmc/thread.t (original)
+++ trunk/languages/lua/t/pmc/thread.t Sun Sep 30 23:57:26 2007
@@ -215,7 +215,11 @@
end
.end
CODE
-/^thread: [0-9A-Fa-f]{8}\nthread: [0-9A-Fa-f]{8}\nstring/
+/^
+thread:\s[0-9A-Fa-f]{8}\n
+thread:\s[0-9A-Fa-f]{8}\n
+string\n
+/x
OUTPUT
pir_output_is( << 'CODE', << 'OUTPUT', 'check tonumber' );
Modified: trunk/languages/lua/t/pmc/userdata.t
==============================================================================
--- trunk/languages/lua/t/pmc/userdata.t (original)
+++ trunk/languages/lua/t/pmc/userdata.t Sun Sep 30 23:57:26 2007
@@ -184,7 +184,11 @@
print "\n"
.end
CODE
-/^userdata: [0-9A-Fa-f]{8}\nuserdata: [0-9A-Fa-f]{8}\nstring/
+/^
+userdata:\s[0-9A-Fa-f]{8}\n
+userdata:\s[0-9A-Fa-f]{8}\n
+string\n
+/x
OUTPUT
pir_output_is( << 'CODE', << 'OUTPUT', 'check tonumber' );
Modified: trunk/languages/lua/t/standalone.t
==============================================================================
--- trunk/languages/lua/t/standalone.t (original)
+++ trunk/languages/lua/t/standalone.t Sun Sep 30 23:57:26 2007
@@ -151,7 +151,10 @@
language_output_like( 'lua', <<'CODE', <<'OUT', '-v & script' );
print(arg[-1])
CODE
-/^Lua 5.1.*\n-v$/
+/^
+Lua\s5.1.*\n
+-v
+$/x
OUT
$ENV{TEST_PROG_ARGS} = '--';
Modified: trunk/languages/lua/t/test-from-lua.t
==============================================================================
--- trunk/languages/lua/t/test-from-lua.t (original)
+++ trunk/languages/lua/t/test-from-lua.t Sun Sep 30 23:57:26 2007
@@ -85,7 +85,11 @@
$code = Parrot::Test::slurp_file(File::Spec->catfile( @dir, 'echo.lua' ));
language_output_like( 'lua', $code, << 'OUTPUT', 'echo', params => 'arg1 arg2'
);
-/^0\tlanguages.lua.t.test-from-lua_3\.lua\n1\targ1\n2\targ2\n/
+/^
+0\tlanguages.lua.t.test-from-lua_3\.lua\n
+1\targ1\n
+2\targ2\n
+/x
OUTPUT
#
@@ -104,7 +108,11 @@
$code = Parrot::Test::slurp_file(File::Spec->catfile( @dir, 'fib.lua' ));
language_output_like( 'lua', $code, << 'OUTPUT', 'fib' );
-/^\tn\tvalue\ttime\tevals\nplain\t24\t46368\t\d+(\.\d+)?\t150049\ncached\t24\t46368\t\d+(\.\d+)?\t25\n/
+/^
+\tn\tvalue\ttime\tevals\n
+plain\t24\t46368\t\d+(\.\d+)?\t150049\n
+cached\t24\t46368\t\d+(\.\d+)?\t25\n
+/x
OUTPUT
#
