enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-11-27 05:23:48 +03:00
Code Issues Projects Releases Wiki Activity

Replacing usage of Source by (Location => String) (#8437)

Browse Source
This commit is contained in:
Jaroslav Tulach 2023-12-01 08:41:24 +01:00 committed by GitHub
parent 81f06456bf
commit 65daaf6f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 129 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sbt
View File

@ -1517,7 +1517,6 @@ lazy val `runtime-parser` =
(project in file("engine/runtime-parser"))
.settings(
frgaalJavaCompilerSetting,
instrumentationSettings,
commands += WithDebugCommand.withDebug,
fork := true,
Test / javaOptions ++= Seq(

25
engine/runtime-compiler/src/main/scala/org/enso/compiler/Compiler.scala
View File

@ -689,7 +689,7 @@ class Compiler(
): Unit = {
val module = Option(context.findTopScopeModule(qualifiedName))
.getOrElse {
val locStr = fileLocationFromSection(loc, source)
val locStr = fileLocationFromSectionOption(loc, source)
throw new CompilerError(
s"Attempted to import the unresolved module $qualifiedName " +
s"during code generation. Defined at $locStr."
@ -1012,6 +1012,16 @@ class Compiler(
case _: Warning => (fansi.Color.Yellow ++ fansi.Bold.On, "warning: ")
case _ => throw new IllegalStateException("Unexpected diagnostic type")
}
def fileLocationFromSection(loc: IdentifiedLocation) = {
val section =
source.createSection(loc.location().start(), loc.location().length());
val locStr = "" + section.getStartLine() + ":" + section
.getStartColumn() + "-" + section.getEndLine() + ":" + section
.getEndColumn()
source.getName() + "[" + locStr + "]";
}
private val sourceSection: Option[SourceSection] =
diagnostic.location match {
case Some(location) =>
@ -1045,7 +1055,7 @@ class Compiler(
.Str(srcPath + ":" + lineNumber + ":" + startColumn + ": ")
.overlay(fansi.Bold.On)
str ++= fansi.Str(subject).overlay(textAttrs)
str ++= diagnostic.formattedMessage(source)
str ++= diagnostic.formattedMessage(fileLocationFromSection)
str ++= "\n"
str ++= oneLineFromSourceColored(lineNumber, startColumn, endColumn)
str ++= "\n"
@ -1063,7 +1073,7 @@ class Compiler(
)
.overlay(fansi.Bold.On)
str ++= fansi.Str(subject).overlay(textAttrs)
str ++= diagnostic.formattedMessage(source)
str ++= diagnostic.formattedMessage(fileLocationFromSection)
str ++= "\n"
val printAllSourceLines =
section.getEndLine - section.getStartLine <= maxSourceLinesToPrint
@ -1090,15 +1100,16 @@ class Compiler(
// There is no source section associated with the diagnostics
var str = fansi.Str()
val fileLocation = diagnostic.location match {
case Some(_) => fileLocationFromSection(diagnostic.location, source)
case None => source.getPath
case Some(_) =>
fileLocationFromSectionOption(diagnostic.location, source)
case None => source.getPath
}
str ++= fansi
.Str(fileLocation)
.overlay(fansi.Bold.On)
str ++= ": "
str ++= fansi.Str(subject).overlay(textAttrs)
str ++= diagnostic.formattedMessage(source)
str ++= diagnostic.formattedMessage(fileLocationFromSection)
if (outSupportsAnsiColors) {
str.render.stripLineEnd
} else {
@ -1169,7 +1180,7 @@ class Compiler(
}
}
private def fileLocationFromSection(
private def fileLocationFromSectionOption(
loc: Option[IdentifiedLocation],
source: Source
): String = {

13
engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala
View File

@ -6,7 +6,7 @@ import org.enso.compiler.CompilerResult
import org.enso.compiler.context._
import org.enso.compiler.core.Implicits.AsMetadata
import org.enso.compiler.core.CompilerError
import org.enso.compiler.core.ir.{Diagnostic, Warning}
import org.enso.compiler.core.ir.{Diagnostic, IdentifiedLocation, Warning}
import org.enso.compiler.core.ir.expression.Error
import org.enso.compiler.pass.analyse.{
CachePreferenceAnalysis,
@ -218,9 +218,18 @@ final class EnsureCompiledJob(
diagnostic: Diagnostic
): Api.ExecutionResult.Diagnostic = {
val source = module.getSource
def fileLocationFromSection(loc: IdentifiedLocation) = {
val section =
source.createSection(loc.location().start(), loc.location().length());
val locStr = "" + section.getStartLine() + ":" + section
.getStartColumn() + "-" + section.getEndLine() + ":" + section
.getEndColumn()
source.getName() + "[" + locStr + "]";
}
Api.ExecutionResult.Diagnostic(
kind,
Option(diagnostic.formattedMessage(source)),
Option(diagnostic.formattedMessage(fileLocationFromSection)),
Option(module.getPath).map(new File(_)),
diagnostic.location
.map(loc =>

15
engine/runtime-parser/src/main/java/org/enso/compiler/core/IR.java
View File

@ -1,6 +1,5 @@
package org.enso.compiler.core;
import com.oracle.truffle.api.source.Source;
import java.io.Serializable;
import java.util.UUID;
import java.util.function.Function;
@ -163,18 +162,4 @@ public interface IR extends Serializable {
/** The size of a single indentation level. */
int indentLevel = 4;
static String fileLocationFromSection(IdentifiedLocation loc, Source source) {
var section = source.createSection(loc.location().start(), loc.location().length());
var locStr =
""
+ section.getStartLine()
+ ":"
+ section.getStartColumn()
+ "-"
+ section.getEndLine()
+ ":"
+ section.getEndColumn();
return source.getName() + "[" + locStr + "]";
}
}

7
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Diagnostic.scala
View File

@ -1,19 +1,18 @@
package org.enso.compiler.core.ir
import com.oracle.truffle.api.source.Source
/** A representation of various kinds of diagnostic in the IR. */
trait Diagnostic extends Serializable {
/** @param source Location of the diagnostic.
* @return a human-readable description of this error condition.
*/
def message(source: Source): String
def message(source: (IdentifiedLocation => String)): String
/** @param source Location of the diagnostic.
* @return a human-readable description of this error condition, formatted for immediate reporting.
*/
def formattedMessage(source: Source): String = message(source)
def formattedMessage(source: (IdentifiedLocation => String)): String =
message(source)
/** The location at which the diagnostic occurs. */
val location: Option[IdentifiedLocation]

3
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Empty.scala
View File

@ -1,6 +1,5 @@
package org.enso.compiler.core.ir
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.Implicits.{ShowPassData, ToStringHelper}
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.randomId
@ -82,7 +81,7 @@ sealed case class Empty(
override def children: List[IR] = List()
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
"Empty IR: Please report this as a compiler bug."
/** @inheritdoc */

16
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Warning.scala
View File

@ -1,7 +1,5 @@
package org.enso.compiler.core.ir
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.IR.fileLocationFromSection
import org.enso.compiler.core.{ir, IR}
/** A trait for all warnings in Enso's IR. */
@ -14,11 +12,11 @@ object Warning {
originalImport: ir.module.scope.Import,
symbolName: String
) extends Warning {
override def message(source: Source): String = {
override def message(source: (IdentifiedLocation => String)): String = {
val originalImportRepr =
originalImport.location match {
case Some(location) =>
s"'${originalImport.showCode()}' in ${fileLocationFromSection(location, source)}"
s"'${originalImport.showCode()}' in ${source(location)}"
case None => originalImport.showCode()
}
s"Duplicated import of $symbolName. The original import is ${originalImportRepr}."
@ -34,7 +32,7 @@ object Warning {
*/
case class WrongTco(override val location: Option[IdentifiedLocation])
extends Warning {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
"A @Tail_Call annotation was placed in a non-tail-call position."
override def diagnosticKeys(): Array[Any] = Array()
@ -48,7 +46,7 @@ object Warning {
case class WrongBuiltinMethod(
override val location: Option[IdentifiedLocation]
) extends Warning {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
"A @Builtin_Method annotation allows only the name of the builtin node in the body."
override def diagnosticKeys(): Array[Any] = Array()
@ -67,7 +65,7 @@ object Warning {
) extends Warning {
override val location: Option[IdentifiedLocation] = ir.location
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"${funName.name}: Self parameter should be declared as the first parameter. Instead its position is: ${paramPosition + 1}."
override def diagnosticKeys(): Array[Any] =
@ -86,7 +84,7 @@ object Warning {
) extends Warning {
override val location: Option[IdentifiedLocation] = ir.location
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The expression ${ir.showCode()} could not be parallelised: $reason."
override def diagnosticKeys(): Array[Any] = Array(ir.showCode(), reason)
@ -97,7 +95,7 @@ object Warning {
/** @return a human-readable description of this error condition.
*/
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"A non-unit type ${ir.name} is used on value level (in ${context})." +
" This is probably an error."

3
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/Error.scala
View File

@ -1,7 +1,6 @@
package org.enso.compiler.core.ir
package expression
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.Implicits.{ShowPassData, ToStringHelper}
import org.enso.compiler.core.IR.randomId
import org.enso.compiler.core.ir.Expression
@ -116,7 +115,7 @@ object Error {
override def children: List[IR] = List(ir)
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
"InvalidIR: Please report this as a compiler bug."
override def diagnosticKeys(): Array[Any] = Array()

4
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/errors/Conversion.scala
View File

@ -2,7 +2,6 @@ package org.enso.compiler.core.ir
package expression
package errors
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.randomId
@ -91,7 +90,8 @@ sealed case class Conversion(
s"(Error: ${storedIr.showCode(indent)})"
/** @inheritdoc */
override def message(source: Source): String = reason.explain
override def message(source: (IdentifiedLocation => String)): String =
reason.explain
override def diagnosticKeys(): Array[Any] = Array(reason.explain)

35
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/errors/ImportExport.scala
View File

@ -2,10 +2,9 @@ package org.enso.compiler.core.ir
package expression
package errors
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.Implicits.{ShowPassData, ToStringHelper}
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.{fileLocationFromSection, randomId}
import org.enso.compiler.core.IR.randomId
import java.util.UUID
import scala.annotation.unused
@ -97,7 +96,8 @@ sealed case class ImportExport(
override def children: List[IR] = List(ir)
/** @inheritdoc */
override def message(source: Source): String = reason.message(source)
override def message(source: (IdentifiedLocation => String)): String =
reason.message(source)
override def diagnosticKeys(): Array[Any] = Array(reason)
@ -114,7 +114,7 @@ object ImportExport {
/** @param source Location of the original import/export IR.
* @return A human-readable description of the error.
*/
def message(source: Source): String
def message(source: (IdentifiedLocation => String)): String
}
/** Used when the `project` keyword is used in an impossible position.
@ -124,7 +124,7 @@ object ImportExport {
*/
case class ProjectKeywordUsedButNotInProject(statementType: String)
extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The `project` keyword was used in an $statementType statement," +
" but the module does not belong to a project."
}
@ -136,7 +136,7 @@ object ImportExport {
*/
case class PackageCouldNotBeLoaded(name: String, reason: String)
extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Package containing the module $name" +
s" could not be loaded: $reason"
}
@ -146,7 +146,7 @@ object ImportExport {
* @param name the module name.
*/
case class ModuleDoesNotExist(name: String) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The module $name does not exist."
}
@ -154,7 +154,7 @@ object ImportExport {
typeName: String,
moduleName: String
) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The type $typeName does not exist in module $moduleName"
}
@ -162,7 +162,7 @@ object ImportExport {
symbolName: String,
moduleOrTypeName: String
) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The symbol $symbolName (module, type, or constructor) does not exist in $moduleOrTypeName."
}
@ -170,28 +170,28 @@ object ImportExport {
typeName: String,
constructorName: String
) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"No such constructor ${constructorName} in type $typeName"
}
case class ExportSymbolsFromPrivateModule(
moduleName: String
) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Cannot export any symbol from module '$moduleName': The module is private"
}
case class ExportPrivateModule(
moduleName: String
) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Cannot export private module '$moduleName'"
}
case class ImportPrivateModule(
moduleName: String
) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Cannot import private module '$moduleName'"
}
@ -201,7 +201,7 @@ object ImportExport {
moduleVisibility: String,
submoduleVisibility: String
) extends Reason {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Cannot export submodule '$submoduleName' of module '$moduleName': " +
s"the submodule is $submoduleVisibility, but the module is $moduleVisibility"
}
@ -220,12 +220,11 @@ object ImportExport {
symbolName: String,
symbolPath: String
) extends Reason {
override def message(source: Source): String = {
override def message(source: (IdentifiedLocation => String)): String = {
val originalImportRepr =
originalImport.location match {
case Some(location) =>
fileLocationFromSection(location, source)
case None => originalImport.showCode()
case Some(location) => source(location)
case None => originalImport.showCode()
}
s"Symbol '$symbolName' resolved ambiguously to '$symbolPath' in the import Statement. " +
s"The symbol was first resolved to '$originalSymbolPath' in the import statement '$originalImportRepr'."

4
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/errors/Pattern.scala
View File

@ -2,7 +2,6 @@ package org.enso.compiler.core.ir
package expression
package errors
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.randomId
@ -75,7 +74,8 @@ sealed case class Pattern(
id = if (keepIdentifiers) id else randomId
)
override def message(source: Source): String = reason.explain
override def message(source: (IdentifiedLocation => String)): String =
reason.explain
override def diagnosticKeys(): Array[Any] = Array(reason)

13
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/errors/Redefined.scala
View File

@ -2,7 +2,6 @@ package org.enso.compiler.core.ir
package expression
package errors
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.Implicits.ShowPassData
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.randomId
@ -96,7 +95,7 @@ object Redefined {
this
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
"Methods must have only one definition of the `this` argument, and " +
"it must be the first."
@ -196,7 +195,7 @@ object Redefined {
copy(location = location)
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Ambiguous conversion: ${targetType.map(_.name + ".").getOrElse("")}from " +
s"${sourceType.showCode()} is defined multiple times in this module."
@ -318,7 +317,7 @@ object Redefined {
copy(location = location)
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Method overloads are not supported: ${atomName.map(_.name + ".").getOrElse("")}" +
s"${methodName.name} is defined multiple times in this module."
@ -447,7 +446,7 @@ object Redefined {
copy(location = location)
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Method definitions with the same name as atoms are not supported. " +
s"Method ${methodName.name} clashes with the atom ${atomName.name} in this module."
@ -551,7 +550,7 @@ object Redefined {
copy(location = location)
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Redefining atoms is not supported: ${typeName.name} is " +
s"defined multiple times in this module."
@ -672,7 +671,7 @@ object Redefined {
override def children: List[IR] = List(invalidBinding)
/** @inheritdoc */
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Variable ${invalidBinding.name.name} is being redefined."
override def diagnosticKeys(): Array[Any] = Array(

8
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/errors/Resolution.scala
View File

@ -2,7 +2,6 @@ package org.enso.compiler.core.ir
package expression
package errors
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.randomId
@ -89,10 +88,13 @@ sealed case class Resolution(
override def showCode(indent: Int): String = originalName.showCode(indent)
/** @inheritdoc */
override def message(source: Source): String = reason.explain(originalName)
override def message(source: (IdentifiedLocation => String)): String =
reason.explain(originalName)
/** @inheritdoc */
override def formattedMessage(source: Source): String = s"${message(source)}."
override def formattedMessage(
source: (IdentifiedLocation => String)
): String = s"${message(source)}."
override def diagnosticKeys(): Array[Any] = Array(reason)

8
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/errors/Syntax.scala
View File

@ -2,7 +2,6 @@ package org.enso.compiler.core.ir
package expression
package errors
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.Implicits.{ShowPassData, ToStringHelper}
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.randomId
@ -95,10 +94,13 @@ sealed case class Syntax(
override def children: List[IR] = List()
/** @inheritdoc */
override def message(source: Source): String = reason.explanation
override def message(source: (IdentifiedLocation => String)): String =
reason.explanation
/** @inheritdoc */
override def formattedMessage(source: Source): String = s"${message(source)}."
override def formattedMessage(
source: (IdentifiedLocation => String)
): String = s"${message(source)}."
override def diagnosticKeys(): Array[Any] = Array(reason)

4
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/errors/Unexpected.scala
View File

@ -2,7 +2,6 @@ package org.enso.compiler.core.ir
package expression
package errors
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.{IR, Identifier}
import org.enso.compiler.core.IR.randomId
@ -20,7 +19,8 @@ sealed trait Unexpected extends Error {
override val location: Option[IdentifiedLocation] = ir.location
/** @inheritdoc */
override def message(source: Source): String = s"Unexpected $entity."
override def message(source: (IdentifiedLocation => String)): String =
s"Unexpected $entity."
/** @inheritdoc */
override def diagnosticKeys(): Array[Any] = Array(entity)

9
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/warnings/Shadowed.scala
View File

@ -2,7 +2,6 @@ package org.enso.compiler.core.ir
package expression
package warnings
import com.oracle.truffle.api.source.Source
import org.enso.compiler.core.IR
/** Warnings about shadowing names. */
@ -26,7 +25,7 @@ object Shadowed {
override val shadower: IR,
override val location: Option[IdentifiedLocation]
) extends Shadowed {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The argument '$shadowedName' is shadowed by another one with the same name."
override def diagnosticKeys(): Array[Any] =
@ -45,7 +44,7 @@ object Shadowed {
override val shadower: IR,
override val location: Option[IdentifiedLocation]
) extends Shadowed {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The pattern field '$shadowedName' is shadowed by another one with the same name."
override def diagnosticKeys(): Array[Any] =
@ -66,7 +65,7 @@ object Shadowed {
override val shadower: IR,
override val location: Option[IdentifiedLocation]
) extends Shadowed {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"""Declaration of type $typeName shadows module ${moduleName.name} making it inaccessible via a qualified name."""
override def diagnosticKeys(): Array[Any] =
@ -89,7 +88,7 @@ object Shadowed {
override val shadower: IR,
override val location: Option[IdentifiedLocation]
) extends Shadowed {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"The exported type `$tpeName` in `$name` module will cause name conflict " +
s"when attempting to use a fully qualified name of the `$firstConflict` module."

4
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/warnings/Unreachable.scala
View File

@ -2,8 +2,6 @@ package org.enso.compiler.core.ir
package expression
package warnings
import com.oracle.truffle.api.source.Source
/** Warnings for unreachable code. */
sealed trait Unreachable extends Warning {
val location: Option[IdentifiedLocation]
@ -25,7 +23,7 @@ object Unreachable {
""
}
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Unreachable case branches$atLocation."
override def diagnosticKeys(): Array[Any] = Array(atLocation)

8
engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/expression/warnings/Unused.scala
View File

@ -2,8 +2,6 @@ package org.enso.compiler.core.ir
package expression
package warnings
import com.oracle.truffle.api.source.Source
/** Warnings about unused language entities. */
sealed trait Unused extends Warning {
val name: Name
@ -16,7 +14,7 @@ object Unused {
* @param name the name that is unused
*/
sealed case class FunctionArgument(override val name: Name) extends Unused {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Unused function argument ${name.name}."
override def diagnosticKeys(): Array[Any] = Array(name.name)
@ -27,7 +25,7 @@ object Unused {
}
sealed case class PatternBinding(override val name: Name) extends Unused {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Unused pattern binding ${name.name}."
override def diagnosticKeys(): Array[Any] = Array(name.name)
@ -42,7 +40,7 @@ object Unused {
* @param name the name that is unused
*/
sealed case class Binding(override val name: Name) extends Unused {
override def message(source: Source): String =
override def message(source: (IdentifiedLocation => String)): String =
s"Unused variable ${name.name}."
override def diagnosticKeys(): Array[Any] = Array(name.name)

6
engine/runtime-parser/src/test/java/org/enso/compiler/core/EnsoParserTest.java
View File

@ -1,18 +1,17 @@
package org.enso.compiler.core;
import com.oracle.truffle.api.source.Source;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.List;
import java.util.function.Function;
import org.enso.compiler.core.ir.Module;
import org.junit.AfterClass;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.BeforeClass;
import org.junit.Test;
@ -1304,8 +1303,7 @@ public class EnsoParserTest {
}
public static Module compile(EnsoParser c, String code) {
var src = Source.newBuilder("enso", code, "test-" + Integer.toHexString(code.hashCode()) + ".enso").build();
var ir = c.compile(src.getCharacters());
var ir = c.compile(code);
assertNotNull("IR was generated", ir);
return ir;
}

20
engine/runtime-parser/src/test/java/org/enso/compiler/core/ParserDependenciesTest.java
View File

@ -17,4 +17,24 @@ public class ParserDependenciesTest {
// correct
}
}
@Test
public void avoidTruffleDependency() {
try {
var clazz = Class.forName("com.oracle.truffle.api.source.Source");
assertNull("No Truffle classes shall be available in the parser project", clazz);
} catch (ClassNotFoundException ex) {
// correct
}
}
@Test
public void avoidPolyglotDependency() {
try {
var clazz = Class.forName("org.graalvm.polyglot.Source");
assertNull("No GraalVM polyglot classes shall be available in the parser project", clazz);
} catch (ClassNotFoundException ex) {
// correct
}
}
}

29
engine/runtime/src/main/scala/org/enso/interpreter/runtime/IrToTruffle.scala
View File

@ -1796,6 +1796,15 @@ class IrToTruffle(
setLocation(LiteralNode.build(text), location)
}
private def fileLocationFromSection(loc: IdentifiedLocation) = {
val section =
source.createSection(loc.location().start(), loc.location().length());
val locStr = "" + section.getStartLine() + ":" + section
.getStartColumn() + "-" + section.getEndLine() + ":" + section
.getEndColumn()
source.getName() + "[" + locStr + "]";
}
/** Generates a runtime implementation for compile error nodes.
*
* @param error the IR representing a compile error.
@ -1808,43 +1817,43 @@ class IrToTruffle(
case err: errors.Syntax =>
context.getBuiltins
.error()
.makeSyntaxError(Text.create(err.message(source)))
.makeSyntaxError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Redefined.Binding =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Redefined.Method =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Redefined.MethodClashWithAtom =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Redefined.Conversion =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Redefined.Type =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Redefined.SelfArg =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Unexpected.TypeSignature =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Resolution =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case err: errors.Conversion =>
context.getBuiltins
.error()
.makeCompileError(Text.create(err.message(source)))
.makeCompileError(Text.create(err.message(fileLocationFromSection)))
case _: errors.Pattern =>
throw new CompilerError(
"Impossible here, should be handled in the pattern match."