Skip to content
This repository has been archived by the owner on Feb 3, 2021. It is now read-only.

Commit

Permalink
Remove trailing spaces from a lot of files, to make Parrot happier.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmichaud committed Nov 12, 2009
1 parent 7b4f3e7 commit 0b3c754
Show file tree
Hide file tree
Showing 27 changed files with 205 additions and 205 deletions.
8 changes: 4 additions & 4 deletions Configure.pl
Expand Up @@ -57,8 +57,8 @@
my %config = read_parrot_config(@parrot_config_exe);

my $parrot_errors = '';
if (!%config) {
$parrot_errors .= "Unable to locate parrot_config\n";
if (!%config) {
$parrot_errors .= "Unable to locate parrot_config\n";
}
elsif ($reqsvn > $config{'revision'} &&
($reqpar eq '' || version_int($reqpar) > version_int($config{'VERSION'}))) {
Expand Down Expand Up @@ -87,9 +87,9 @@ END
{
no warnings;
print "Cleaning up ...\n";
if (open my $CLEAN, '-|', "$make clean") {
if (open my $CLEAN, '-|', "$make clean") {
my @slurp = <$CLEAN>;
close $CLEAN;
close $CLEAN;
}
}

Expand Down
12 changes: 6 additions & 6 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 Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions README
Expand Up @@ -36,7 +36,7 @@ Once you have a copy of NQP, build it as follows:
$ perl Configure.pl --gen-parrot
$ make

This will create a "nqp" or "nqp.exe" executable in the
This will create a "nqp" or "nqp.exe" executable in the
current (nqp-rx) directory. Programs can then be run from
the build directory using a command like:

Expand All @@ -46,9 +46,9 @@ The C<--gen-parrot> option above tells Configure.pl to automatically
download and build the most appropriate version of Parrot into a
local "parrot/" subdirectory, install that Parrot into the
"parrot_install/" subdirectory, and use that for building NQP.
It's okay to use the C<--gen-parrot> option on later invocations
of Configure.pl; the configure system will re-build Parrot only
if a newer version is needed for whatever version of Rakudo you're
It's okay to use the C<--gen-parrot> option on later invocations
of Configure.pl; the configure system will re-build Parrot only
if a newer version is needed for whatever version of Rakudo you're
working with.

You can use C<--parrot-config=/path/to/parrot_config> instead
Expand Down
2 changes: 1 addition & 1 deletion STATUS
@@ -1,4 +1,4 @@
2009-10-09:
2009-10-09:

At the moment, nqp-rx is configured to build an executable called
"p6regex", which is a Perl 6 regular expression compiler for Parrot.
Expand Down
8 changes: 4 additions & 4 deletions build/gen_bootstrap.pl
Expand Up @@ -16,16 +16,16 @@ sub make_bootstrap {
open my $fh, '<', $filename or die "Unable to read $filename\n";

while (<$fh>) {
if (m{^\.include '(src/[^']*)'}) {
if (m{^\.include '(src/[^']*)'}) {
print "### $_";
make_bootstrap($1);
make_bootstrap($1);
}
elsif (m{^\.include '(gen/[^']*)'}) {
print "### $_";
make_bootstrap("src/stage2/$1");
make_bootstrap("src/stage2/$1");
}
else { print; }
}
}


2 changes: 1 addition & 1 deletion build/gen_parrot.pl
Expand Up @@ -83,4 +83,4 @@ sub read_parrot_config {
}
%config;
}

12 changes: 6 additions & 6 deletions src/HLL/Actions.pm
Expand Up @@ -69,7 +69,7 @@ our sub isaPAST($x) {
method EXPR($/, $key?) {
unless $key { return 0; }
my $past := $/.peek_ast // $<OPER>.peek_ast;
unless $past {
unless $past {
$past := PAST::Op.new( :node($/) );
if $<OPER><O><pasttype> { $past.pasttype( ~$<OPER><O><pasttype> ); }
elsif $<OPER><O><pirop> { $past.pirop( ~$<OPER><O><pirop> ); }
Expand Down Expand Up @@ -98,11 +98,11 @@ method termish($/) {
method term:sym<circumfix>($/) { make $<circumfix>.ast }

method integer($/) {
make $<decint>
make $<decint>
?? string_to_int( $<decint>, 10)
!! ( $<hexint>
!! ( $<hexint>
?? $<hexint>.ast
!! ( $<octint>
!! ( $<octint>
?? $<octint>.ast
!! string_to_int( $<binint>, 2)
)
Expand All @@ -122,7 +122,7 @@ method octint($/) {
method quote_EXPR($/) {
my $past := $<quote_delimited>.ast;
if HLL::Grammar::quotemod_check($/, 'w') {
if isaPAST($past) {
if isaPAST($past) {
$/.CURSOR.panic("Can't form :w list from non-constant strings (yet)");
}
else {
Expand Down Expand Up @@ -170,7 +170,7 @@ method quote_atom($/) {

method quote_escape:sym<backslash>($/) { make "\\"; }
method quote_escape:sym<stopper>($/) { make ~$<stopper> }

method quote_escape:sym<bs>($/) { make "\b"; }
method quote_escape:sym<nl>($/) { make "\n"; }
method quote_escape:sym<cr>($/) { make "\r"; }
Expand Down
18 changes: 9 additions & 9 deletions src/HLL/Grammar.pm
Expand Up @@ -21,8 +21,8 @@ grammar HLL::Grammar;

token infixish { <OPER=infix=infix> }
token prefixish { <OPER=prefix=prefix> <.ws> }
token postfixish {
| <OPER=postfix=postfix>
token postfixish {
| <OPER=postfix=postfix>
| <OPER=postcircumfix=postcircumfix>
}

Expand Down Expand Up @@ -72,19 +72,19 @@ grammar HLL::Grammar;
token quote_escape:sym<nl> { \\ n <?quotemod_check('b')> }
token quote_escape:sym<cr> { \\ r <?quotemod_check('b')> }
token quote_escape:sym<tab> { \\ t <?quotemod_check('b')> }
token quote_escape:sym<hex> {
\\ x <?quotemod_check('b')>
[ <hexint> | '[' <hexints> ']' ]
token quote_escape:sym<hex> {
\\ x <?quotemod_check('b')>
[ <hexint> | '[' <hexints> ']' ]
}
token quote_escape:sym<oct> {
\\ o <?quotemod_check('b')>
[ <octint> | '[' <octints> ']' ]
token quote_escape:sym<oct> {
\\ o <?quotemod_check('b')>
[ <octint> | '[' <octints> ']' ]
}
token quote_escape:sym<chr> { \\ c <?quotemod_check('b')> <charspec> }

token charname {
|| <integer>
|| <[a..z A..Z]> <-[ \] , # ]>*? <[a..z A..Z ) ]>
|| <[a..z A..Z]> <-[ \] , # ]>*? <[a..z A..Z ) ]>
<?before \s* <[ \] , # ]> >
}
token charnames { [<.ws><charname><.ws>] ** ',' }
Expand Down

0 comments on commit 0b3c754

Please sign in to comment.