Skip to content

Commit

Permalink
Work in progress on compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@propensive
propensive committed Apr 22, 2024
1 parent 0a3919f commit bb144e9
Show file tree
Hide file tree
Showing 2 changed files with 144 additions and 104 deletions.
221 changes: 123 additions & 98 deletions src/engine/build.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,6 @@ class Builder():

attempt[AggregateError[BuildError]]:
validate[BuildError]:
// given (BuildError fixes PathError) = BuildError(_)
// given (BuildError fixes ZipError) = BuildError(_)
// given (BuildError fixes IoError) = BuildError(_)
// given (BuildError fixes StreamError) = BuildError(_)
// given (BuildError fixes ConcurrencyError) = BuildError(_)

antecedents.each: (hash, name) =>
runTask(name, hash)
Expand Down Expand Up @@ -452,11 +447,6 @@ class Builder():

attempt[AggregateError[BuildError]]:
validate[BuildError]:
// given (BuildError fixes HttpError) = BuildError(_)
// given (BuildError fixes IoError) = BuildError(_)
// given (BuildError fixes StreamError) = BuildError(_)
// given (BuildError fixes OfflineError) = BuildError(_)
// given (BuildError fixes NumberError) = BuildError(_)

tend(output.as[Directory]).remedy:
case error: IoError => abort(BuildError(error))
Expand Down Expand Up @@ -539,12 +529,6 @@ class Builder():

attempt[AggregateError[BuildError]]:
validate[BuildError]:
given (BuildError fixes IoError) = BuildError(_)
given (BuildError fixes PathError) = BuildError(_)
given (BuildError fixes StreamError) = BuildError(_)
given (BuildError fixes SystemPropertyError) = BuildError(_)
given (BuildError fixes ExecError) = BuildError(_)
given (BuildError fixes ConcurrencyError) = BuildError(_)

val inputs =
antecedents.to(List).map: (hash, name) =>
Expand Down Expand Up @@ -632,23 +616,23 @@ class Builder():

attempt[AggregateError[BuildError]]:
validate[BuildError]:
given (BuildError fixes PathError) = BuildError(_)
given (BuildError fixes IoError) = BuildError(_)
given (BuildError fixes CompileError) = BuildError(_)
given (BuildError fixes ConcurrencyError) = BuildError(_)

Log.info(t"Starting to build")

val inputs =
antecedents.to(List).map: (hash, name) =>
runTask(name, hash)
.map(_.await())
tend:
antecedents.to(List).map: (hash, name) =>
runTask(name, hash)
.map(_.await())
.remedy:
case error: ConcurrencyError => abort(BuildError(error))

if !summon[FrontEnd].continue then abort(BuildError(AbortError(2)))

if output.exists() then
summon[FrontEnd](target) = -1.0
output.as[Directory].tap(_.touch())
tend(output.as[Directory].tap(_.touch())).remedy:
case error: IoError => abort(BuildError(error))
else
inputs.filter(_.failure).each: input =>
input.acknowledge:
Expand All @@ -662,7 +646,10 @@ class Builder():
Log.info(t"One of the inputs did not complete")
abort(BuildError(AbortError(3)))
else
val work = (installation.work / PathName(Uuid().show)).as[Directory]
val work = tend((installation.work / PathName(Uuid().show)).as[Directory]).remedy:
case error: IoError => abort(BuildError(error))
case error: PathError => abort(BuildError(error))

val basis = unsafely(Basis.Tools().await().path.show)
val baseClasspath = LocalClasspath(List(ClasspathEntry.Jarfile(basis)))
val syntax: scc.TrieMap[Text, Task[IArray[Seq[Token]]]] = scc.TrieMap()
Expand All @@ -673,45 +660,60 @@ class Builder():
val allBinaries =
classpath.flatMap(phases(_).binaries).map(outputDirectory(_) / p"library.jar")

(classpath.map(outputDirectory(_)) ++ allBinaries).foldLeft(baseClasspath)(_ + _).pipe: classpath =>
if sourceMap.isEmpty then output.as[Directory] else
val classpathEntries =
tend:
(classpath.map(outputDirectory(_)) ++ allBinaries).foldLeft(baseClasspath)(_ + _)
.remedy:
case error: PathError => abort(BuildError(error))
case error: IoError => abort(BuildError(error))

classpathEntries.pipe: classpath =>
if sourceMap.isEmpty
then tend(output.as[Directory]).remedy:
case error: IoError => abort(BuildError(error))
else
val process: CompileProcess =
Log.envelop(target):
compiler match
case Compiler.Java =>
Javac(Nil)(classpath)(sourceMap, work.path)
tend(Javac(Nil)(classpath)(sourceMap, work.path)).remedy:
case error: CompileError => abort(BuildError(error))

case Compiler.Kotlin =>
abort(BuildError(AbortError(4)))

case Compiler.Scala =>
import scalacOptions.*
Scalac[3.4]
(List
(language.experimental.fewerBraces,
language.experimental.genericNumberLiterals,
language.experimental.clauseInterleaving,
language.experimental.into,
language.experimental.erasedDefinitions,
language.experimental.saferExceptions,
language.experimental.namedTypeArguments,
advanced.maxInlines(64),
internal.requireTargetName,
internal.explicitNulls,
internal.checkPatterns,
internal.safeInit,
internal.ccNew,
experimental,
sourceFuture,
newSyntax,
warnings.lint.privateShadow,
warnings.lint.typeParameterShadow,
warnings.deprecation,
warnings.feature,
warnings.unused(Unused.All),
warnings.implausiblePatterns))
(classpath)
(sourceMap, work.path)

tend:
Scalac[3.4]
(List
(language.experimental.fewerBraces,
language.experimental.genericNumberLiterals,
language.experimental.clauseInterleaving,
language.experimental.into,
language.experimental.erasedDefinitions,
language.experimental.saferExceptions,
language.experimental.namedTypeArguments,
advanced.maxInlines(64),
internal.requireTargetName,
internal.explicitNulls,
internal.checkPatterns,
internal.safeInit,
internal.ccNew,
experimental,
sourceFuture,
newSyntax,
warnings.lint.privateShadow,
warnings.lint.typeParameterShadow,
warnings.deprecation,
warnings.feature,
warnings.unused(Unused.All),
warnings.implausiblePatterns))
(classpath)
(sourceMap, work.path)
.remedy:
case error: CompileError => abort(BuildError(error))

val cancellation = daemon:
summon[FrontEnd].attend()
Expand Down Expand Up @@ -740,14 +742,18 @@ class Builder():
info(e"$Italic(${notice.message})")
info(t"")

process.complete()
tend(process.complete()).remedy:
case error: ConcurrencyError => abort(BuildError(error))

progressDaemon.attend()
cancellation.cancel()

val errorCount = process.notices.count(_.importance == Importance.Error)
val warnCount = process.notices.count(_.importance == Importance.Warning)

if errorCount == 0 then work.moveTo(output).as[Directory]
if errorCount == 0
then tend(work.moveTo(output).as[Directory]).remedy:
case error: IoError => abort(BuildError(error))
else abort(BuildError(AbortError(5)))

given expandable: Expandable[Phase] = _.antecedents.keys.map(phases(_)).to(List)
Expand All @@ -771,46 +777,58 @@ class Builder():
Log.info(t"Building target $target")
task(t"$target.digest"):
Log.info(t"Starting new async for $target")
given (BuildError fixes GitError) = BuildError(_)
given (BuildError fixes ExecError) = BuildError(_)
given (BuildError fixes PathError) = BuildError(_)
given (BuildError fixes IoError) = BuildError(_)
given (BuildError fixes RefError) = BuildError(_)
given (BuildError fixes WorkspaceError) = BuildError(_)
given (BuildError fixes StreamError) = BuildError(_)
given (BuildError fixes ConcurrencyError) = BuildError(_)

val workspace = universe(target.projectId).source match
case workspace: Workspace => workspace
val workspace =
tend:
universe(target.projectId).source match
case workspace: Workspace => workspace

case vault: Vault =>
Workspace(Cache(vault.index.releases(target.projectId).repo).await().path)
case vault: Vault =>
Workspace(Cache(vault.index.releases(target.projectId).repo).await().path)

.remedy:
case error: RefError => abort(BuildError(error))
case error: IoError => abort(BuildError(error))
case error: ExecError => abort(BuildError(error))
case error: ConcurrencyError => abort(BuildError(error))
case error: PathError => abort(BuildError(error))
case error: WorkspaceError => abort(BuildError(error))
case error: GitError => abort(BuildError(error))

Log.info(t"Calculated workspace for $target")

val goal = workspace(target.projectId)(target.goalId).or:
abort(RefError(target.goalId))
abort(BuildError(RefError(target.goalId)))

val digest: Hash = goal match
case module: Module =>
val phase = module.phase(workspace, target)
phases(phase.digest) = phase
phase.digest
val digest: Hash =
tend:
goal match
case module: Module =>
val phase = module.phase(workspace, target)
phases(phase.digest) = phase
phase.digest

case artifact: Artifact =>
val phase = artifact.phase(workspace, target)
phases(phase.digest) = phase
phase.digest

case artifact: Artifact =>
val phase = artifact.phase(workspace, target)
phases(phase.digest) = phase
phase.digest
case library: Library =>
val phase = library.phase(workspace, target)
phases(phase.digest) = phase
phase.digest

case library: Library =>
val phase = library.phase(workspace, target)
phases(phase.digest) = phase
phase.digest
case exec: Exec =>
val phase = exec.phase(workspace, target)
phases(phase.digest) = phase
phase.digest

case exec: Exec =>
val phase = exec.phase(workspace, target)
phases(phase.digest) = phase
phase.digest
.remedy:
case error: ConcurrencyError => abort(BuildError(error))
case error: IoError => abort(BuildError(error))
case error: GitError => abort(BuildError(error))
case error: ExecError => abort(BuildError(error))
case error: PathError => abort(BuildError(error))
case error: StreamError => abort(BuildError(error))

Log.info(t"Calculated digest for $target")

Expand Down Expand Up @@ -936,21 +954,22 @@ extension (basis: Basis)
: Task[File] raises BuildError =
task(t"basis"):
basis.synchronized:
given (BuildError fixes StreamError) = BuildError(_)
given (BuildError fixes ZipError) = BuildError(_)
given (BuildError fixes IoError) = BuildError(_)

if !path.exists() then
val target = unsafely(Target(ProjectId(t"system"), GoalId(basis.encode)))
summon[FrontEnd].start(target)
inclusions.pipe: inclusions =>
exclusions.pipe: exclusions =>
val entries: LazyList[ZipEntry] =
ZipFile(service.script.as[File])
.entries()
.filter: entry =>
val name = entry.ref.show
inclusions.exists(name.starts(_)) && !exclusions.exists(name.starts(_))
tend:
ZipFile(service.script.as[File])
.entries()
.filter: entry =>
val name = entry.ref.show
inclusions.exists(name.starts(_)) && !exclusions.exists(name.starts(_))
.remedy:
case error: IoError => abort(BuildError(error))
case error: StreamError => abort(BuildError(error))

val total: Double = entries.length/100.0
var done: Int = 0
Expand All @@ -962,13 +981,19 @@ extension (basis: Basis)

entry

ZipFile.create(path.as[File].path).tap: zipFile =>
zipFile.append(trackedEntries, Epoch)
tend:
ZipFile.create(path.as[File].path).tap: zipFile =>
zipFile.append(trackedEntries, Epoch)
.remedy:
case error: ZipError => abort(BuildError(error))
case error: StreamError => abort(BuildError(error))
case error: IoError => abort(BuildError(error))

.also:
summon[FrontEnd].stop(target)

path.as[File]
tend(path.as[File]).remedy:
case error: IoError => abort(BuildError(error))

val errorRibbon = Ribbon(rgb"#990033", rgb"#CC0033")
val warningRibbon = Ribbon(rgb"#FF9900", rgb"#FFCC66")
Expand Down
27 changes: 21 additions & 6 deletions src/engine/cache.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,27 @@ object Cache:
val dataDir = tend((destination / p"data").as[Directory]).remedy:
case IoError(_) => abort(VaultError())

val current = tend(dataDir.descendants.filter(_.is[File])).remedy:
case IoError(_) => abort(VaultError())
.to(List).map: path =>
safely(Codl.read[Release](path.as[File])).or(abort(VaultError()))
.filter: release =>
release.date + release.lifetime.days > today()
val current =
given projectIdDecoder: Decoder[ProjectId] = tend(summon[Decoder[ProjectId]]).remedy:
case _: InvalidRefError => abort(VaultError())

given streamIdDecoder: Decoder[StreamId] = tend(summon[Decoder[StreamId]]).remedy:
case _: InvalidRefError => abort(VaultError())

tend:
dataDir.descendants.filter(_.is[File]).to(List).map: path =>
???.asInstanceOf[Release] //Codl.read[Release](path.as[File])
.filter: release =>
release.date + release.lifetime.days > today()
.remedy:
case _: AggregateError[?] => abort(VaultError())
case _: IoError => abort(VaultError())
case _: CodlReadError => abort(VaultError())
case _: RefError => abort(VaultError())
case _: MarkdownError => abort(VaultError())
case _: UrlError => abort(VaultError())
case _: InvalidRefError => abort(VaultError())
case _: StreamError => abort(VaultError())

Vault(t"vent", 1, current)

Expand Down

0 comments on commit bb144e9

Please sign in to comment.