Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove Rakudo patch

It isn't needed anymore, as it was already patched to Rakudo.
  • Loading branch information...
commit 5c838936e2da128da4a97a993826fd31af06eb11 1 parent 7db7f72
@xfix xfix authored
Showing with 0 additions and 60 deletions.
  1. +0 −1  README.md
  2. +0 −59 rakudo.patch
View
1  README.md
@@ -31,7 +31,6 @@ INSTALLATION
```bash
git clone git://github.com/rakudo-p5/v5.git
cd rakudo # I assume you already have rakudo installed
-patch -i ../v5/rakudo.patch # this is needed atm and will hopefully go away pretty soon
make install # install the patched rakudo
cd ../v5
perl6 Configure.p6
View
59 rakudo.patch
@@ -1,59 +0,0 @@
-diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
-index 7972f38..92b0512 100644
---- a/src/Perl6/Grammar.nqp
-+++ b/src/Perl6/Grammar.nqp
-@@ -922,6 +922,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
-
- # Quasis and unquotes
- :my $*IN_QUASI := 0; # whether we're currently in a quasi block
-+ :my $*MAIN := 'MAIN';
-
- # performance improvement stuff
- :my $*FAKE_INFIX_FOUND := 0;
-@@ -993,6 +994,9 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
- %*LANG{$_.key} := $_.value;
- }
- }
-+ if $have_outer && $*UNIT_OUTER.symbol('$*MAIN') {
-+ $*MAIN := $*UNIT_OUTER.symbol('$*MAIN')<value>;
-+ }
-
- # Install unless we've no setting, in which case we've likely no
- # static lexpad class yet either. Also, UNIT needs a code object.
-@@ -1015,7 +1019,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
-
- <.finishpad>
- <.bom>?
-- <statementlist(1)>
-+ <statementlist=.LANG($*MAIN, 'statementlist', 1)>
-
- <.install_doc_phaser>
-
-@@ -1353,10 +1357,18 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
- :my $*IN_DECL := 'use';
- :my $*HAS_SELF := '';
- :my $*SCOPE := 'use';
-+ :my $OLD_MAIN := ~$*MAIN;
- $<doc>=[ 'DOC' \h+ ]**0..1
- <sym> <.ws>
- [
-- | <version>
-+ | <version> [ <?{ ~$<version><vnum>[0] eq '5' }> {
-+ my $module := $*W.load_module($/, 'Perl5', {}, $*GLOBALish);
-+ do_import($/, $module, 'Perl5');
-+ $/.CURSOR.import_EXPORTHOW($module);
-+ } ]?
-+ [ <?{ ~$<version><vnum>[0] eq '6' }> {
-+ $*MAIN := 'MAIN';
-+ } ]?
- | <module_name>
- {
- $longname := $<module_name><longname>;
-@@ -1407,6 +1419,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
- }
- ]
- ]
-+ [ <?{ $*MAIN ne $OLD_MAIN }> <statementlist=.LANG($*MAIN, 'statementlist', 1)> || <?> ]
- <.ws>
- }
-
Please sign in to comment.
Something went wrong with that request. Please try again.