Skip to content

Commit 0c10980

Browse files
committed
Introduce ToIndentParser and ToIndentScanner
Remove ScriptParsers
1 parent a0d28a3 commit 0c10980

File tree

9 files changed

+307
-452
lines changed

9 files changed

+307
-452
lines changed

compiler/src/dotty/tools/dotc/core/Comments.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import util.{SourceFile, ReadOnlyMap}
1010
import util.Spans._
1111
import util.CommentParsing._
1212
import util.Property.Key
13-
import parsing.Parsers.Parser
13+
import parsing.Parsers
1414
import reporting.ProperDefinitionNotFound
1515

1616
object Comments {
@@ -125,7 +125,7 @@ object Comments {
125125
object UseCase {
126126
def apply(code: String, codePos: Span)(using Context): UseCase = {
127127
val tree = {
128-
val tree = new Parser(SourceFile.virtual("<usecase>", code)).localDef(codePos.start)
128+
val tree = Parsers.parser(SourceFile.virtual("<usecase>", code)).localDef(codePos.start)
129129
tree match {
130130
case tree: untpd.DefDef =>
131131
val newName = ctx.compilationUnit.freshNames.newName(tree.name, NameKinds.DocArtifactName)

compiler/src/dotty/tools/dotc/inlines/Inlines.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import SymDenotations.SymDenotation
1212
import config.Printers.inlining
1313
import ErrorReporting.errorTree
1414
import dotty.tools.dotc.util.{SourceFile, SourcePosition, SrcPos}
15-
import parsing.Parsers.Parser
15+
import parsing.Parsers
1616
import transform.{PostTyper, Inlining, CrossVersionChecks}
1717
import staging.StagingLevel
1818

@@ -332,7 +332,7 @@ object Inlines:
332332
case ConstantType(Constant(code: String)) =>
333333
val source2 = SourceFile.virtual("tasty-reflect", code)
334334
inContext(ctx.fresh.setNewTyperState().setTyper(new Typer(ctx.nestingLevel + 1)).setSource(source2)) {
335-
val tree2 = new Parser(source2).block()
335+
val tree2 = Parsers.parser(source2).block()
336336
if ctx.reporter.allErrors.nonEmpty then
337337
ctx.reporter.allErrors.map((ErrorKind.Parser, _))
338338
else

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Parser extends Phase {
2727
unit.untpdTree =
2828
if (unit.isJava) new JavaParsers.JavaParser(unit.source).parse()
2929
else {
30-
val p = new Parsers.Parser(unit.source)
30+
val p = Parsers.parser(unit.source)
3131
// p.in.debugTokenStream = true
3232
val tree = p.parse()
3333
if (p.firstXmlPos.exists && !firstXmlPos.exists)

0 commit comments

Comments
 (0)