Author: bernhard
Date: Tue Oct 11 14:12:02 2005
New Revision: 9460
Added:
trunk/examples/pir/sudoku.pir
- copied, changed from r9459, trunk/examples/assembly/sudoku.pir
Removed:
trunk/examples/assembly/sudoku.pir
Modified:
trunk/MANIFEST
trunk/t/examples/pir.t
Log:
Move sudoku.pir from examples/assembly to examles/pir
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Tue Oct 11 14:12:02 2005
@@ -473,7 +473,6 @@ examples/assembly/slurp.pasm
examples/assembly/small.xml [main]doc
examples/assembly/stack.pasm [main]doc
examples/assembly/substr.pasm [main]doc
-examples/assembly/sudoku.pir [main]doc
examples/assembly/thr-primes.imc [main]doc
examples/assembly/trace.pasm [main]doc
examples/assembly/uniq.pasm [main]doc
@@ -602,6 +601,7 @@ examples/mops/mops.rb
examples/mops/mops.scheme [main]doc
examples/pasm/fact.pasm [main]doc
examples/pir/mandel.pir [main]doc
+examples/pir/sudoku.pir [main]doc
examples/pni/PQt.C [main]doc
examples/pni/QtHelloWorld.pasm [main]doc
examples/pni/sdl_blue_rectangle.imc [main]doc
Copied: trunk/examples/pir/sudoku.pir (from r9459,
trunk/examples/assembly/sudoku.pir)
==============================================================================
--- trunk/examples/assembly/sudoku.pir (original)
+++ trunk/examples/pir/sudoku.pir Tue Oct 11 14:12:02 2005
@@ -1,3 +1,5 @@
+# $Id$
+
=pod
=head1 TITLE
@@ -213,7 +215,7 @@ nok:
err:
printerr "inconsistent start\n"
self."end_display"()
- die 1
+ die 3, 100
.end
# read game from file
@@ -253,7 +255,7 @@ err:
printerr "read '"
printerr file_name
printerr "' failed\n"
- die 1
+ die 3, 100
.end
# get commandline options
@@ -337,7 +339,7 @@ sel_name:
printerr "no such builtin: '"
printerr name
printerr "'\n"
- die 1
+ die 3, 100
ok:
$S0 = b[name]
.return ($S0)
@@ -482,11 +484,11 @@ err:
$S0 = raw[i]
printerr $S0
printerr "\n"
- die 1
+ die 3, 100
len_err:
printerr "length != 81\n"
- die
+ die 3, 100
.end
#
@@ -684,7 +686,7 @@ not_deb:
.return()
intern_err:
printerr "diff between ar and try\n"
- die
+ die 3, 100
.end
# print invalid for given row and number(s)
@@ -1228,7 +1230,7 @@ lpx:
printerr " x="
printerr x
printerr "\n"
- die 1
+ die 3, 100
ok:
inc x
if x < 9 goto lpx
Modified: trunk/t/examples/pir.t
==============================================================================
--- trunk/t/examples/pir.t (original)
+++ trunk/t/examples/pir.t Tue Oct 11 14:12:02 2005
@@ -27,7 +27,7 @@ F<t/examples/pasm.t>
=cut
use strict;
-use Parrot::Test tests => 1;
+use Parrot::Test tests => 2;
use Test::More;
# Set up expected output for examples
@@ -64,6 +64,37 @@ my %expected = (
........::::::::::::::::::::::::::::::::::,,,,,,,:::::::::::::::::::.......
...........::::::::::::::::::::::::::::::::::::::::::::::::::::::..........
END_EXPECTED
+
+ 'sudoku.pir' => << 'END_EXPECTED',
++---------+---------+---------+
+| 1 . . | . . . | . . . |
+| . . 2 | 7 4 . | . . . |
+| . . . | 5 . . | . . 4 |
++---------+---------+---------+
+| . 3 . | . . . | . . . |
+| 7 5 . | . . . | . . . |
+| . . . | . . 9 | 6 . . |
++---------+---------+---------+
+| . 4 . | . . 6 | . . . |
+| . . . | . . . | . 7 1 |
+| . . . | . . 1 | . 3 . |
++---------+---------+---------+
+init ok
++---------+---------+---------+
+| 1 8 4 | 9 6 3 | 7 2 5 |
+| 5 6 2 | 7 4 8 | 3 1 9 |
+| 3 9 7 | 5 1 2 | 8 6 4 |
++---------+---------+---------+
+| 2 3 9 | 6 5 7 | 1 4 8 |
+| 7 5 6 | 1 8 4 | 2 9 3 |
+| 4 1 8 | 2 3 9 | 6 5 7 |
++---------+---------+---------+
+| 9 4 1 | 3 7 6 | 5 8 2 |
+| 6 2 3 | 8 9 5 | 4 7 1 |
+| 8 7 5 | 4 2 1 | 9 3 6 |
++---------+---------+---------+
+solved
+END_EXPECTED
);
# Do the testing
@@ -71,8 +102,7 @@ my %test_func = ( pasm => \&pasm_output_
pir => \&pir_output_is,
imc => \&pir_output_is );
-while ( my ( $example, $expected ) = each %expected )
-{
+while ( my ( $example, $expected ) = each %expected ) {
my $code_fn = "examples/pir/$example";
my $code = Parrot::Test::slurp_file($code_fn);
