Skip to content

Commit 64442a0

Browse files
mbovelmbovel
authored
Print infix operations in infix form (scala#22854)
2 parents 258dff1 + 66094a1 commit 64442a0

File tree

15 files changed

+124
-30
lines changed

15 files changed

+124
-30
lines changed

‎community-build/community-projects/utest‎

‎compiler/src/dotty/tools/dotc/core/NameOps.scala‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import java.nio.CharBuffer
77
import scala.io.Codec
88
import Int.MaxValue
99
import Names.*, StdNames.*, Contexts.*, Symbols.*, Flags.*, NameKinds.*, Types.*
10-
import util.Chars.{isOperatorPart, digit2int}
10+
import util.Chars.{isOperatorPart, isIdentifierPart, digit2int}
1111
import Decorators.*
1212
import Definitions.*
1313
import nme.*
@@ -78,9 +78,22 @@ object NameOps {
7878
def isUnapplyName: Boolean = name == nme.unapply || name == nme.unapplySeq
7979
def isRightAssocOperatorName: Boolean = name.lastPart.last == ':'
8080

81-
def isOperatorName: Boolean = name match
82-
case name: SimpleName => name.exists(isOperatorPart)
83-
case _ => false
81+
/** Does this name match `[{letter | digit} '_'] op`?
82+
*
83+
* See examples in [[NameOpsTest]].
84+
*/
85+
def isOperatorName: Boolean =
86+
name match
87+
case name: SimpleName =>
88+
var i = name.length - 1
89+
// Ends with operator characters
90+
while i >= 0 && isOperatorPart(name(i)) do i -= 1
91+
if i == -1 then return true
92+
// Optionnally prefixed with alpha-numeric characters followed by `_`
93+
if name(i) != '_' then return false
94+
while i >= 0 && isIdentifierPart(name(i)) do i -= 1
95+
i == -1
96+
case _ => false
8497

8598
/** Is name of a variable pattern? */
8699
def isVarPattern: Boolean =

‎compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import dotty.tools.dotc.util.SourcePosition
3232
import dotty.tools.dotc.ast.untpd.{MemberDef, Modifiers, PackageDef, RefTree, Template, TypeDef, ValOrDefDef}
3333
import cc.*
3434
import dotty.tools.dotc.parsing.JavaParsers
35+
import dotty.tools.dotc.transform.TreeExtractors.BinaryOp
3536

3637
class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
3738

@@ -387,6 +388,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
387388

388389
def optDotPrefix(tree: This) = optText(tree.qual)(_ ~ ".") provided !isLocalThis(tree)
389390

391+
/** Should a binary operation with this operator be printed infix? */
392+
def isInfix(op: Symbol) =
393+
op.exists && (op.isDeclaredInfix || op.name.isOperatorName)
394+
390395
def caseBlockText(tree: Tree): Text = tree match {
391396
case Block(stats, expr) => toText(stats :+ expr, "\n")
392397
case expr => toText(expr)
@@ -478,6 +483,13 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
478483
optDotPrefix(tree) ~ keywordStr("this") ~ idText(tree)
479484
case Super(qual: This, mix) =>
480485
optDotPrefix(qual) ~ keywordStr("super") ~ optText(mix)("[" ~ _ ~ "]")
486+
case BinaryOp(l, op, r) if isInfix(op) =>
487+
val isRightAssoc = op.name.endsWith(":")
488+
val opPrec = parsing.precedence(op.name)
489+
val leftPrec = if isRightAssoc then opPrec + 1 else opPrec
490+
val rightPrec = if !isRightAssoc then opPrec + 1 else opPrec
491+
changePrec(opPrec):
492+
atPrec(leftPrec)(toText(l)) ~ " " ~ toText(op.name) ~ " " ~ atPrec(rightPrec)(toText(r))
481493
case app @ Apply(fun, args) =>
482494
if (fun.hasType && fun.symbol == defn.throwMethod)
483495
changePrec (GlobalPrec) {
@@ -504,7 +516,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
504516
}
505517
}
506518
case Typed(expr, tpt) =>
507-
changePrec(InfixPrec) {
519+
changePrec(DotPrec) {
508520
if isWildcardStarArg(tree) then
509521
expr match
510522
case Ident(nme.WILDCARD_STAR) =>

‎compiler/test-resources/repl/i13181‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
scala> scala.compiletime.codeOf(1+2)
2-
val res0: String = 1.+(2)
2+
val res0: String = 1 + 2

‎compiler/test/dotty/tools/dotc/core/NameOpsTest.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package dotty.tools.dotc.core
2+
3+
import dotty.tools.dotc.core.NameOps.isOperatorName
4+
import dotty.tools.dotc.core.Names.{termName, SimpleName}
5+
6+
import org.junit.Test
7+
8+
class NameOpsTest:
9+
@Test def isOperatorNamePos: Unit =
10+
for name <- List("+", "::", "frozen_=:=", "$_+", "a2_+", "a_b_+") do
11+
assert(isOperatorName(termName(name)))
12+
13+
@Test def isOperatorNameNeg: Unit =
14+
for name <- List("foo", "*_*", "<init>", "$reserved", "a*", "2*") do
15+
assert(!isOperatorName(termName(name)))

‎tests/printing/export-param-flags.check‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package <empty> {
33
final lazy module val A: A = new A()
44
final module class A() extends Object() { this: A.type =>
5-
inline def inlinedParam(inline x: Int): Int = x.+(x):Int
5+
inline def inlinedParam(inline x: Int): Int = (x + x):Int
66
}
77
final lazy module val Exported: Exported = new Exported()
88
final module class Exported() extends Object() { this: Exported.type =>

‎tests/printing/infix-operations.check‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[[syntax trees at end of typer]] // tests/printing/infix-operations.scala
2+
package <empty> {
3+
class C(a: Int) extends Object() {
4+
private[this] val a: Int
5+
def foo(b: Int): C = this
6+
def +(b: Int): C = this
7+
}
8+
final lazy module val infix-operations$package: infix-operations$package =
9+
new infix-operations$package()
10+
final module class infix-operations$package() extends Object() {
11+
this: infix-operations$package.type =>
12+
@main def main: Unit =
13+
{
14+
val v1: Int = 1 + 2 + 3
15+
val v2: Int = 1 + (2 + 3)
16+
val v3: Int = 1 + 2 * 3
17+
val v4: Int = (1 + 2) * 3
18+
val v5: Int = (1 + 2):Int
19+
val v6: Int = (1 + 2):Int
20+
val v7: Boolean = (1 < 2):Boolean
21+
val v8: Boolean = (1 < 2):Boolean
22+
val c: C = new C(2)
23+
val v9: C = c.foo(3)
24+
val v10: C = c + 3
25+
()
26+
}
27+
}
28+
final class main() extends Object() {
29+
<static> def main(args: Array[String]): Unit =
30+
try main catch
31+
{
32+
case error @ _:scala.util.CommandLineParser.ParseError =>
33+
scala.util.CommandLineParser.showError(error)
34+
}
35+
}
36+
}
37+

‎tests/printing/infix-operations.scala‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
class C(a: Int):
2+
def foo(b: Int): C = this
3+
def +(b: Int): C = this
4+
5+
@main def main =
6+
val v1 = 1 + 2 + 3
7+
val v2 = 1 + (2 + 3)
8+
val v3 = 1 + 2 * 3
9+
val v4 = (1 + 2) * 3
10+
val v5 = (1 + 2):Int
11+
val v6 = 1 + 2:Int // same as above
12+
val v7 = (1 < 2):Boolean
13+
val v8 = 1 < 2:Boolean // same as above
14+
15+
val c = new C(2) // must not be printed in infix form
16+
val v9 = c.foo(3) // must not be printed in infix form
17+
val v10 = c + 3

‎tests/printing/lambdas.check‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
package <empty> {
33
final lazy module val Main: Main = new Main()
44
final module class Main() extends Object() { this: Main.type =>
5-
val f1: Int => Int = (x: Int) => x.+(1)
6-
val f2: (Int, Int) => Int = (x: Int, y: Int) => x.+(y)
7-
val f3: Int => Int => Int = (x: Int) => (y: Int) => x.+(y)
8-
val f4: [T] => (x: Int) => Int = [T >: Nothing <: Any] => (x: Int) => x.+(1)
5+
val f1: Int => Int = (x: Int) => x + 1
6+
val f2: (Int, Int) => Int = (x: Int, y: Int) => x + y
7+
val f3: Int => Int => Int = (x: Int) => (y: Int) => x + y
8+
val f4: [T] => (x: Int) => Int = [T >: Nothing <: Any] => (x: Int) => x + 1
99
val f5: [T] => (x: Int) => Int => Int = [T >: Nothing <: Any] => (x: Int)
10-
=> (y: Int) => x.+(y)
10+
=> (y: Int) => x + y
1111
val f6: Int => Int = (x: Int) =>
1212
{
13-
val x2: Int = x.+(1)
14-
x2.+(1)
13+
val x2: Int = x + 1
14+
x2 + 1
1515
}
16-
def f7(x: Int): Int = x.+(1)
16+
def f7(x: Int): Int = x + 1
1717
val f8: Int => Int = (x: Int) => Main.f7(x)
1818
val l: List[Int] = List.apply[Int]([1,2,3 : Int]*)
19-
Main.l.map[Int]((_$1: Int) => _$1.+(1))
20-
Main.l.map[Int]((x: Int) => x.+(1))
19+
Main.l.map[Int]((_$1: Int) => _$1 + 1)
20+
Main.l.map[Int]((x: Int) => x + 1)
2121
Main.l.map[Int]((x: Int) =>
2222
{
23-
val x2: Int = x.+(1)
24-
x2.+(1)
23+
val x2: Int = x + 1
24+
x2 + 1
2525
}
2626
)
2727
Main.l.map[Int]((x: Int) => Main.f7(x))

‎tests/printing/posttyper/i22533.check‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package <empty> {
1010
override def equals(x$0: Any): Boolean =
1111
x$0 match
1212
{
13-
case x$0 @ _:Foo @unchecked => this.u.==(x$0.u)
13+
case x$0 @ _:Foo @unchecked => this.u == x$0.u
1414
case _ => false
1515
}
1616
private[this] val u: Int

0 commit comments

Comments
 (0)