Skip to content

Commit

Permalink
Merge pull request #1 from GunioRobot/clean
Browse files Browse the repository at this point in the history
GunioRobot apparently goes around cleaning up whitespace in people's code. How about that.
  • Loading branch information
Carl Mäsak committed Jan 3, 2012
2 parents 517255c + 67b372d commit 5229d56
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
14 changes: 7 additions & 7 deletions LICENSE
Expand Up @@ -17,7 +17,7 @@ You are always permitted to make arrangements wholly outside of this
license directly with the Copyright Holder of a given Package. If the
terms of this license do not permit the full use that you propose to
make of the Package, you should contact the Copyright Holder and seek
a different licensing arrangement.
a different licensing arrangement.

Definitions

Expand Down Expand Up @@ -50,7 +50,7 @@ Definitions

"Modified Version" means the Package, if it has been changed, and
such changes were not explicitly requested by the Copyright
Holder.
Holder.

"Original License" means this Artistic License as Distributed with
the Standard Version of the Package, in its current version or as
Expand Down Expand Up @@ -86,7 +86,7 @@ Package will still be considered the Standard Version, and as such
will be subject to the Original License.


Distribution of Modified Versions of the Package as Source
Distribution of Modified Versions of the Package as Source

(4) You may Distribute your Modified Version as Source (either gratis
or for a Distributor Fee, and with or without a Compiled form of the
Expand All @@ -108,7 +108,7 @@ you do at least ONE of the following:
(c) allow anyone who receives a copy of the Modified Version to
make the Source form of the Modified Version available to others
under

(i) the Original License or

(ii) a license that permits the licensee to freely copy,
Expand All @@ -120,7 +120,7 @@ you do at least ONE of the following:
Fees are allowed.


Distribution of Compiled Forms of the Standard Version
Distribution of Compiled Forms of the Standard Version
or Modified Versions without the Source

(5) You may Distribute Compiled forms of the Standard Version without
Expand All @@ -138,7 +138,7 @@ the Source, provided that you comply with Section 4 with respect to
the Source of the Modified Version.


Aggregating or Linking the Package
Aggregating or Linking the Package

(7) You may aggregate the Package (either the Standard Version or
Modified Version) with other packages and Distribute the resulting
Expand All @@ -155,7 +155,7 @@ include the Package, and Distribute the result without restriction,
provided the result does not expose a direct interface to the Package.


Items That are Not Considered Part of a Modified Version
Items That are Not Considered Part of a Modified Version

(9) Works (including, but not limited to, modules and scripts) that
merely extend or make use of the Package, do not, by themselves, cause
Expand Down
2 changes: 1 addition & 1 deletion README
Expand Up @@ -15,7 +15,7 @@ This is how a typical board might look:
+ /-----/ /| v v | +
2 | +-----+-----+-----+
| +-----/| h h h h h h |
+ /| v v || h h h h h h |
+ /| v v || h h h h h h |
1 | || v v |+-----+-----+-----+
| |+-----/-----/-----/-----/
+-----/-----/-----/-----/-----/
Expand Down
34 changes: 17 additions & 17 deletions lib/Druid/View/Text.pm
Expand Up @@ -27,7 +27,7 @@ my $h-piece = '
';

my $cover-right = '
#
#
';
Expand All @@ -42,29 +42,29 @@ my $cover-top-right = '

#=[Returns a string containing an ASCII picture of an empty Druid board of
the given size.]
sub make-empty-board($size) {
sub make-empty-board($size) {
# The 'join $sep, gather { ... }' pattern allows us to put a long
# string together, without having to refer to the same variable over
# and over.
return join "\n", gather {
take '';
take my $heading
= [~] ' ', map {" $_ "}, map {chr($_+ord('A'))}, ^$size;
take my $line = [~] ' ', '+-----' x $size, '+';
return join "\n", gather {
take '';
take my $heading
= [~] ' ', map {" $_ "}, map {chr($_+ord('A'))}, ^$size;
take my $line = [~] ' ', '+-----' x $size, '+';
for (1..$size).reverse -> $r {
take [~] (sprintf '%2d |', $r),
' ' x ($size) - 1,
" | $r";
take [~] ' |', ' ' x ($size) - 1, ' |';
if $r > 1 {
take [~] ' +', ' +' x $size;
}
}
take $line;
take $heading;
take '';
};
}
take [~] ' |', ' ' x ($size) - 1, ' |';
if $r > 1 {
take [~] ' +', ' +' x $size;
}
}
take $line;
take $heading;
take '';
};
}

submethod BUILD() {
$!cached-board = make-empty-board($!game.size);
Expand Down
2 changes: 1 addition & 1 deletion lib/Druid/Webapp.pm
Expand Up @@ -3,7 +3,7 @@ use v6;
use Web::Request;
use Web::Response;

use Druid::Game;
use Druid::Game;
use Druid::View::Text;

class Druid::Webapp does Callable {
Expand Down

0 comments on commit 5229d56

Please sign in to comment.