Skip to content

Commit fc5994d

Browse files
authored
Merge pull request #2436 from biboudis/update-docs
Fix broken link in the navigation of docs and add minor adjustments
2 parents f73483e + 7841d42 commit fc5994d

File tree

7 files changed

+23
-20
lines changed

7 files changed

+23
-20
lines changed

docs/docs/contributing/backend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: Working with the Backend
66
The compiler backend is based on a fork of the Scala 2.11 `GenBCode` backend and
77
lives at
88

9-
> https://github.com/lampepfl/scala/tree/sharing-backend.
9+
> https://github.com/lampepfl/scala/tree/sharing-backend
1010
1111
The dotty source tree contains a git submodule in the directory
1212
[scala-backend](https://github.com/lampepfl/dotty/tree/master/scala-backend)

docs/docs/contributing/debug-tests.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ $ dotc tests/debug/while.scala
2121
Second, run the compiled class with debugging enabled (suppose the main class is `Test`):
2222

2323
```shell
24-
dotr -d Test
24+
$ dotr -d Test
2525
```
2626

2727
Third, start JDB:
2828

2929
```
30-
jdb -attach 5005 -sourcepath tests/debug/
30+
$ jdb -attach 5005 -sourcepath tests/debug/
3131
```
3232

3333
You can run `help` for commands that supported by JDB.
@@ -83,13 +83,13 @@ compiler/test/debug/Gen tests/debug/while.scala > robot
8383
First, compile the file `tests/debug/while.scala`:
8484

8585
```
86-
bin/dotc tests/debug/while.scala
86+
$ dotc tests/debug/while.scala
8787
```
8888

8989
Second, run the compiled class with debugging enabled:
9090

9191
```
92-
bin/dotr -d Test
92+
$ dotr -d Test
9393
```
9494

9595
Finally, run the expect script:

docs/docs/contributing/eclipse.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: Building Dotty with Eclipse
66
Setup
77
-----------
88

9-
You can setup Eclipse by using _[Scala IDE for Eclipse](http://scala-ide.org/)_ directly to run Dotty. Alternatively you can download
9+
You can setup Eclipse by using [Scala IDE for Eclipse](http://scala-ide.org/) to run Dotty. Alternatively you can download
1010
your Eclipse distribution of choice and enable the Scala IDE from the Eclipse Marketplace, separately.
1111

1212
1. Clone Dotty's repository from Github (and run `sbt managedSources` as described in
@@ -57,4 +57,5 @@ Additionally you need to specify the scala-asm library as an external jar depend
5757

5858
![](../../images/eclipse/eclipse-runconfiguration.png "Import Dotty Projects")
5959

60-
The compiler can be run and debugged using the same configuration. To contribute to dotty please follow the [Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md).
60+
The compiler can be run and debugged using the same configuration.
61+

docs/docs/contributing/getting-started.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ layout: doc-page
33
title: Getting Started
44
---
55

6+
7+
68
Requirements
79
------------
810
Make sure that you are using Java 8 or later. The output of `java -version`
@@ -62,3 +64,7 @@ or via bash:
6264
```bash
6365
$ dotr
6466
```
67+
68+
Before contributing to Dotty, we invite you to consult the
69+
[Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md).
70+

docs/docs/contributing/intellij-idea.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ For the first option you can fire up sbt from the `Terminal` window of IDEA or y
3535
For example, to run a test you can write with or without flags:
3636

3737
```shell
38-
dotc tests/pos/Arrays.scala
38+
$ dotc tests/pos/Arrays.scala
3939
```
4040

4141
If you are interested in debugging the compiler you can enable the necessary agent on the JVM.
@@ -57,5 +57,3 @@ Now every time you run `dotc` you can set your breakpoints and hit the `Debug do
5757
the sample configuration above). The default data on the configuration match the enabled agent on the VM so, probably,
5858
you will not need to change anything else.
5959

60-
To contribute to dotty please follow the [Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md).
61-

docs/docs/contributing/workflow.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ $ sbt
1919
or from terminal:
2020

2121
```bash
22-
$ ./bin/dotc <OPTIONS> <FILE>
22+
$ dotc <OPTIONS> <FILE>
2323
```
2424

2525
Here are some useful debugging `<OPTIONS>`:
2626

2727
* `-Xprint:PHASE1,PHASE2,...` or `-Xprint:all`: prints the `AST` after each
28-
specified phase. Phase names can be found by searching
29-
`compiler/src/dotty/tools/dotc/transform/` for `phaseName`.
28+
specified phase. Phase names can be found by examining the
29+
`dotty.tools.dotc.transform.*` classes for their `phaseName` field e.g., `-Xprint:erasure`.
30+
You can discover all phases in the `dotty.tools.dotc.Compiler` class
3031
* `-Ylog:PHASE1,PHASE2,...` or `-Ylog:all`: enables `ctx.log("")` logging for
3132
the specified phase.
3233
* `-Ycheck:all` verifies the consistency of `AST` nodes between phases, in
3334
particular checks that types do not change. Some phases currently can't be
3435
`Ycheck`ed, therefore in the tests we run:
3536
`-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef`.
36-
37-
More powerful logging capabilities can be enabled by changing some `noPrinter` to
38-
`new Printer` in `compiler/src/dotty/tools/dotc/config/Printers.scala`. This enables the
39-
`subtyping.println("")` and `ctx.traceIndented("", subtyping)` style logging.
37+
* the last frontier of debugging (before actual debugging) is the range of logging capabilities that
38+
can be enabled through the `dotty.tools.dotc.config.Printers` object. Change any of the desired printer from `noPrinter` to
39+
`default` and this will give you the full logging capability of the compiler.
4040

4141
## Inspecting Trees with Type Stealer ##
4242

@@ -64,5 +64,3 @@ u: dotty.tools.dotc.core.Types.Type = TypeBounds(TypeRef(ThisType(TypeRef(NoPref
6464
Many objects in the dotc compiler implement a `Showable` trait (e.g. `Tree`,
6565
`Symbol`, `Type`). These objects may be prettyprinted using the `.show`
6666
method
67-
68-
To contribute to dotty please follow the [Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md).

docs/sidebar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sidebar:
2626
- title: Testing
2727
url: docs/contributing/testing.html
2828
- title: Working with the Backend
29-
url: docs/contributing/backend.md
29+
url: docs/contributing/backend.html
3030
- title: Internals
3131
subsection:
3232
- title: Backend

0 commit comments

Comments
 (0)