Change syntax of splices and quotes #5918

odersky · 2019-02-14T09:15:46Z

Quote:

'{ ... }
'[...]

Splice:

${...}
$id

odersky · 2019-02-14T09:40:57Z

There are some tests that I could not fix. @nicolasstucki, can you have a look at these?

compiler/src/dotty/tools/dotc/ast/Desugar.scala

nicolasstucki · 2019-02-18T19:08:16Z

Rebased

odersky · 2019-02-18T20:26:25Z

I accidentally pushed the wrong scalatest submodule in one of my commits. The last commit fixes that.

odersky · 2019-02-19T15:11:32Z

@nicolasstucki Why did you need to revert the scalatest community build? That does not work, as it now fails with an illegal comparison.

nicolasstucki · 2019-02-19T15:20:11Z

I will re-revert it. I now noticed that my issue was due to a dirty build.

odersky · 2019-02-19T15:21:33Z

I'll do it as part of another push.

odersky · 2019-02-19T15:23:23Z

So we now have quoted idents as well: 'x works as a replacement for '{x}, but only inside spliced code. Outside, it is still rejected as a symbol literal.

nicolasstucki · 2019-02-19T20:20:00Z

Finally, tests pass again

nicolasstucki · 2019-02-20T06:56:29Z

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

+            Quote(t)
+          }
+          else {
+            migrationWarningOrError(em"""symbol literal '${in.name} is no longer supported,


We currently only support 'x, 'true, 'false and 'null within a '{ ... } or ${ ... }. Is there any reason not to support them outside when isScala2Mode == false?

We could also consider reintroducing the syntax '() for quoted unit. It look more natural than '{}

nicolasstucki · 2019-02-20T07:43:08Z

Looks good, but needs an extra reviewer as I added lots of commits. @biboudis will also review it.

nicolasstucki · 2019-02-20T10:54:45Z

Rebased

- '$' is no longer a keyword. - 'x is treated as a quote instead of a symbol literal inside splices - 'x and $x are single tokens (of kind QUOTEID and IDENTIFIER) This reverts part of commit 8cfa1fb.

Correctly handle 'this, 'true, 'false, 'null.

Adapt splice syntax and modify tests to no cancel quotes and splices before the checks

nicolasstucki · 2019-02-21T13:51:32Z

Rebased

library/src/scala/quoted/Type.scala

odersky

Looks all good, except for the question what to name splice. But we can still change that later.

odersky · 2019-02-21T15:29:31Z

I already approved once, so it seems the system does not let me approve once more. But I do.

biboudis · 2019-02-22T09:49:13Z

compiler/src/dotty/tools/dotc/ast/untpd.scala

+    override def isType: Boolean = op.isType
  }

  /** A typed subtree of an untyped tree needs to be wrapped in a TypedSplice


Super nitpick 🙈, TypSplice.

No, this is actually a TypeSplice which is a completely different concept 🙉. That one wraps a tree that is typed inside an untyped tree.

biboudis · 2019-02-22T10:15:20Z

docs/docs/reference/other-new-features/principled-meta-programming.md


 To avoid clutter, the Scala implementation tries to convert any phase-incorrect
-reference to a type `T` to a type-splice, by rewriting `T` to `~implicitly[Type[T]]`.
+reference to a type `T` to a type-splice, by rewriting `T` to `${ the[Type[T]] }`.


BTW ${ the[Type[T]] } is surprisingly pleasant to read

odersky assigned nicolasstucki Feb 14, 2019

nicolasstucki reviewed Feb 14, 2019

View reviewed changes

compiler/src/dotty/tools/dotc/ast/Desugar.scala Outdated Show resolved Hide resolved

odersky force-pushed the change-splice-dollar branch from 7fed7c9 to 0caecac Compare February 14, 2019 13:27

nicolasstucki self-requested a review February 18, 2019 10:55

nicolasstucki force-pushed the change-splice-dollar branch 2 times, most recently from 5421c2a to 4b722bc Compare February 18, 2019 19:07

nicolasstucki force-pushed the change-splice-dollar branch 3 times, most recently from accb9ed to 2ca5297 Compare February 19, 2019 11:01

biboudis self-requested a review February 19, 2019 13:53

nicolasstucki force-pushed the change-splice-dollar branch from 5536a54 to 63471fe Compare February 19, 2019 14:22

nicolasstucki mentioned this pull request Feb 19, 2019

Use new splice syntax dotty-staging/sourcecode#2

Merged

odersky force-pushed the change-splice-dollar branch from e4ff734 to e21dce5 Compare February 19, 2019 15:21

nicolasstucki force-pushed the change-splice-dollar branch from 21c62df to 0a418b0 Compare February 19, 2019 17:41

nicolasstucki added the stat:needs review label Feb 20, 2019

nicolasstucki assigned biboudis Feb 20, 2019

nicolasstucki reviewed Feb 20, 2019

View reviewed changes

nicolasstucki force-pushed the change-splice-dollar branch from f543d04 to f940d00 Compare February 20, 2019 07:03

nicolasstucki approved these changes Feb 20, 2019

View reviewed changes

nicolasstucki force-pushed the change-splice-dollar branch from f940d00 to 33a53a7 Compare February 20, 2019 10:54

nicolasstucki and others added 17 commits February 21, 2019 14:44

Add regression tests

26ca221

Adapt more tests

d749bd9

Change id syntax

5bc50de

Drop Block(...) around quoted and spliced expressions where possible

c6cc337

Fix '{}

7a71580

Readapt tests

6bcd70c

Fix and adapt tests

8b0ba22

Rename $MaxSpecialized to MaxSpecialized

bc5e068

Revert changes in tests/pos/t4579.scala

cc279c8

Update printer

7d39a1e

Avoid accidental conversion from ${ x } to x.unary_~ and back

e23bf3c

Change use of $ for splices in syntax and parsing

94e3a03

- '$' is no longer a keyword. - 'x is treated as a quote instead of a symbol literal inside splices - 'x and $x are single tokens (of kind QUOTEID and IDENTIFIER) This reverts part of commit 8cfa1fb.

Update docs to new syntax

bd17841

Fix quote parsing

b32a4a8

Correctly handle 'this, 'true, 'false, 'null.

Fix test

3846e49

Revert stdLib213 change after rebase

ad3f519

Adapt i5954 tests

b560392

Adapt splice syntax and modify tests to no cancel quotes and splices before the checks

nicolasstucki force-pushed the change-splice-dollar branch from 305e3bf to b560392 Compare February 21, 2019 13:51

odersky commented Feb 21, 2019

View reviewed changes

library/src/scala/quoted/Type.scala Outdated Show resolved Hide resolved

odersky commented Feb 21, 2019

View reviewed changes

Change splice member to $splice

2ad3310

biboudis approved these changes Feb 22, 2019

View reviewed changes

Adapt splice to $splice in test

4b0c234

nicolasstucki merged commit ac84182 into scala:master Feb 22, 2019

ghost removed the stat:needs review label Feb 22, 2019

allanrenucci deleted the change-splice-dollar branch February 24, 2019 11:38

biboudis mentioned this pull request Mar 4, 2019

Unexpected level-correctness interaction with type alias #6008

Closed

biboudis added this to the 0.14 Tech Preview milestone Apr 5, 2019

Change syntax of splices and quotes #5918

Change syntax of splices and quotes #5918

Uh oh!

Conversation

odersky commented Feb 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

odersky commented Feb 14, 2019

Uh oh!

Uh oh!

nicolasstucki commented Feb 18, 2019

Uh oh!

odersky commented Feb 18, 2019

Uh oh!

odersky commented Feb 19, 2019

Uh oh!

nicolasstucki commented Feb 19, 2019

Uh oh!

odersky commented Feb 19, 2019

Uh oh!

odersky commented Feb 19, 2019

Uh oh!

nicolasstucki commented Feb 19, 2019

Uh oh!

nicolasstucki Feb 20, 2019

Choose a reason for hiding this comment

Uh oh!

nicolasstucki Feb 20, 2019

Choose a reason for hiding this comment

Uh oh!

nicolasstucki commented Feb 20, 2019

Uh oh!

nicolasstucki commented Feb 20, 2019

Uh oh!

nicolasstucki commented Feb 21, 2019

Uh oh!

Uh oh!

odersky left a comment

Choose a reason for hiding this comment

Uh oh!

odersky commented Feb 21, 2019

Uh oh!

biboudis Feb 22, 2019

Choose a reason for hiding this comment

Uh oh!

nicolasstucki Feb 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

biboudis Feb 22, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

odersky commented Feb 14, 2019 •

edited

Loading

nicolasstucki Feb 22, 2019 •

edited

Loading