Skip to content

Commit d634fb1

Browse files
committed
Perl6 to Raku
+ fix link of nqp in github + Perl means Perl 5, no ambiguity now, so change perl5 to perl only
1 parent 889df02 commit d634fb1

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ nqp-configure
44

55
# DESCRIPTION
66

7-
Provide support modules for [NQP](https://github.com/perl6/nqp) and [Rakudo](https://github.com/rakudo/rakudo)
7+
Provide support modules for [NQP](https://github.com/Raku/nqp) and [Rakudo](https://github.com/rakudo/rakudo)
88
`Configure.pl` scripts.
99

1010
## Modules Provided
@@ -14,8 +14,8 @@ Provide support modules for [NQP](https://github.com/perl6/nqp) and [Rakudo](htt
1414

1515
# SEE ALSO
1616

17-
* [NQP::Config module](https://github.com/perl6/nqp-configure/blob/master/doc/NQP-Config.md)
18-
* [Macro expansion documentation](https://github.com/perl6/nqp-configure/blob/master/doc/Macros.md)
17+
* [NQP::Config module](https://github.com/Raku/nqp-configure/blob/master/doc/NQP-Config.md)
18+
* [Macro expansion documentation](https://github.com/Raku/nqp-configure/blob/master/doc/Macros.md)
1919

2020
# LICENSE
2121

doc/Macros.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ macro is:
55

66
* enclosed in symbols `@` or `@@` (unless escaped with `\`)
77
* has a name which a combination of word chars (`\w` in regexp terms) and colons
8-
`:`
8+
`:`
99
* can be either a configuration variable or a macro function
1010

1111
In this document we will call macro functions just _macro_s in this document
@@ -83,7 +83,7 @@ nested macros, functions are generally separated into two groups:
8383
- One group takes the input text as-is. It is then up to the macro itself at
8484
which point it would do the expansion.
8585
- For another group (named _preexpanded macros_ for convenience) the text first
86-
gets expanded by the macros subsystem and then passed in as the parameter.
86+
gets expanded by the macros subsystem and then passed in as the parameter.
8787

8888
For example:
8989

@@ -125,7 +125,7 @@ is considered to be the most reliable way to get the job done.
125125
## Contexts
126126

127127
Contexts are a concept of `NQP::Config` module which is heavily utilized by
128-
`NQP::Macros`.
128+
`NQP::Macros`.
129129

130130
A context is a state structure which keeps configuration properties and
131131
variables. While properties are not generally available for the expansion
@@ -152,7 +152,7 @@ For simplicity, macros in this section are not enclosed with `@`.
152152

153153
_Pre-expand_
154154

155-
See Perl 5 `chomp` function.
155+
See Perl's `chomp` function.
156156

157157
### expand(text)
158158

@@ -184,7 +184,7 @@ _Pre-expanded_
184184

185185
The macro name stands for Normalize File Path. Converts Unix-style paths with
186186
`/` directory separator into what is suitable for the current OS. Most typical
187-
example is Windows where slashes are replaced with backslashes.
187+
example is Windows where slashes are replaced with backslashes.
188188

189189
If a path contains whitespaces it will be quoted following the quoting rules of
190190
the current platform. For example:
@@ -231,7 +231,7 @@ like `src/Perl6/Actions.nqp src/Perl6/PodActions.nqp`.
231231
_Pre-expanded_
232232

233233
Quotes path by using rules valid for the shell of the current
234-
platform.
234+
platform.
235235

236236
```
237237
target: $(DEPS)
@@ -310,7 +310,7 @@ the template file in templates directory defined by `templates_dir`
310310
confgiguration variable (`@base_dir@/tools/templates` normally). If current
311311
context defines `ctx_subdir` variable then this subdirectory within the
312312
templates directory is checked first. Then if no file is found the macro falls
313-
back to the default `@templates_dir@`.
313+
back to the default `@templates_dir@`.
314314

315315
It is a good practice to have template's filename to end with `.in` extension.
316316
But the actual order of filenames tried check for this extension last. First the
@@ -460,8 +460,8 @@ Condition can be of one of the following very simple forms:
460460
- `config_variable` – checks if a configuration variable is defined
461461
- `!config_variable` – variable is not defined
462462
- `config_variable==value`, `config_variable!=value` – if variable value `eq` or
463-
`ne` to the _value_, respectively.
464-
463+
`ne` to the _value_, respectively.
464+
465465
_Note_ that the value is used as is, no spaces allowed and no quoting/escaping
466466
supported for it.
467467

@@ -514,7 +514,7 @@ _Pre-expanded_
514514

515515
Produce `echo` command for Makefile. Takes into consideration current platform
516516
and quotes text properly.
517-
517+
518518
### nop(text)
519519

520520
Does nothing, returns the parameter text as is. Can be used as an escape macro
@@ -541,7 +541,7 @@ Would result in:
541541

542542
The following variables are set by the `NQP::Config` as defaults:
543543

544-
- `perl` Perl 5 executable.
544+
- `perl` Perl executable.
545545
- `slash` Directory separator, used by the current OS
546546
- `shell` Default shell
547547
- `base_dir` Where `Configure.pl` is located. In other words, the directory
@@ -558,4 +558,3 @@ The following variables are set by the `NQP::Config` as defaults:
558558
- `cpsep` Separator of pathlists for the current OS. `;` for Windows, `:`
559559
otherwise.
560560
- `runner_suffix` Set from `bat` variable for now.
561-

doc/NQP-Config.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ $cfg->expand_template;
2626

2727
# DESCRIPTION
2828

29-
This is a helper module for build a language from NQP/Perl6 family. It provides basic utility methods,
29+
This is a helper module for build a language from NQP/Raku family. It provides basic utility methods,
3030
`configure_`-family methods for presetting environment-dependent values, and methods to manipulate this data.
3131

3232
`NQP::Config` is a base (_abstract_) class which has to be inherited and completed by a language-specific class. See
33-
[`NQP::Config::NQP`](https://github.com/perl6/nqp/blob/master/tools/lib/NQP/Config/NQP.pm) and
33+
[`NQP::Config::NQP`](https://github.com/Raku/nqp/blob/master/tools/lib/NQP/Config/NQP.pm) and
3434
[`NQP::Config::Rakudo`](https://github.com/rakudo/rakudo/blob/master/tools/lib/NQP/Config/Rakudo.pm) classes from `nqp`
3535
and `rakudo` implementations.
3636

@@ -57,7 +57,7 @@ object itself are the bottom-level properties, similar to `config` key been the
5757

5858
Note that configuration keys is using plural form of its name `configs`. This is because it is a list too, a list of
5959
configuration hashes in this case. Though it seems somewhat overcomplicated but there is a good explanation for this:
60-
sometimes a context config chunk is being assembled from several pieces; while merging of hashrefs in Perl5 is
60+
sometimes a context config chunk is being assembled from several pieces; while merging of hashrefs in Perl is
6161
terrible...
6262

6363
Another tricky part is that chunks in the context list are searched for a variable in start-to-end order. This is
@@ -93,7 +93,7 @@ a context when code is leaving a scope.
9393

9494
# ATTRIBUTES
9595

96-
Because `NQP::Class` is build using barebones Perl5 OO implementation, there're no attributes as such. We're listing
96+
Because `NQP::Class` is build using barebones Perl OO implementation, there're no attributes as such. We're listing
9797
here keys on a `NQP::Class` instance.
9898

9999
_Some irrelevant and internally used keys would miss a description. They're only listed here to avoid being accidentally
@@ -286,7 +286,7 @@ Returns a list or arrayref (context dependant) of stored errors for a `$backend`
286286
Expands the default template (see [attribute](#ATTRIBUTES) `template`). The result of expansion goes into file specified
287287
by `out` attribute. If `out_header` attribute is defined it's prepended to the expanded text.
288288

289-
See more details in [macro expansion docs](https://github.com/perl6/nqp-configure/blob/master/doc/Macros.md).
289+
See more details in [macro expansion docs](https://github.com/Raku/nqp-configure/blob/master/doc/Macros.md).
290290

291291
### `save_config_status`
292292

@@ -566,4 +566,4 @@ parses and combines the result into a configuration hash which is then returned.
566566
# SEE ALSO
567567

568568
- [Building Rakudo](https://github.com/rakudo/rakudo/blob/master/docs/Building-Rakudo.md)
569-
- [Macro Expansion](https://github.com/perl6/nqp-configure/blob/master/doc/Macros.md)
569+
- [Macro Expansion](https://github.com/Raku/nqp-configure/blob/master/doc/Macros.md)

lib/NQP/Config.pm

+4-4
Original file line numberDiff line numberDiff line change
@@ -588,15 +588,15 @@ sub configure_misc {
588588
if ( $self->cfg('silent_build') eq 'on' ) {
589589
$config->{NOECHO_declaration} = <<NOECHO_DECL;
590590
NOECHO = @
591-
${make_pp_pfx}ifdef VERBOSE_BUILD
592-
NOECHO =
591+
${make_pp_pfx}ifdef VERBOSE_BUILD
592+
NOECHO =
593593
${make_pp_pfx}endif
594594
NOECHO_DECL
595595
}
596596
else {
597597
$config->{NOECHO_declaration} = <<NOECHO_DECL;
598-
NOECHO =
599-
${make_pp_pfx}ifdef SILENT_BUILD
598+
NOECHO =
599+
${make_pp_pfx}ifdef SILENT_BUILD
600600
NOECHO = @
601601
${make_pp_pfx}endif
602602
NOECHO_DECL

0 commit comments

Comments
 (0)