Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving PackageRepository.Default into its own EnsoPackageRepository #7395

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Moving PackageRepository.Default into its own EnsoPackageRepository #7395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d956233
Moving PackageRepository.Default into its own EnsoPackageRepository
JaroslavTulach Jul 25, 2023
cb0bf6e
Merge branch 'develop' into wip/jtulach/EnsoPackageRepository
mergify[bot] Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions engine/runtime/src/main/java/org/enso/compiler/ImportExportCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
package org.enso.compiler;

import buildinfo.Info;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.oracle.truffle.api.TruffleFile;
import com.oracle.truffle.api.TruffleLogger;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.List;
import java.util.Optional;
import java.util.logging.Level;

import org.apache.commons.lang3.StringUtils;
import org.enso.compiler.data.BindingsMap;
import org.enso.editions.LibraryName;
import org.enso.interpreter.runtime.EnsoContext;
import org.enso.pkg.QualifiedName;
import org.enso.pkg.SourceFile;
import scala.collection.immutable.Map;

import java.io.Serializable;
import java.util.List;
import java.util.Optional;
import java.util.logging.Level;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.oracle.truffle.api.TruffleFile;
import com.oracle.truffle.api.TruffleLogger;

import buildinfo.Info;
import scala.collection.immutable.Map;

public final class ImportExportCache extends Cache<ImportExportCache.CachedBindings, ImportExportCache.Metadata> {

Expand Down Expand Up @@ -125,11 +127,12 @@ Map<QualifiedName, BindingsMap> entries() {
}

// CachedBindings is not a record **on purpose**. There appears to be a Frgaal bug leading to invalid compilation error.
static class CachedBindings {
public static final class CachedBindings {
private final LibraryName _libraryName;
private final MapToBindings _bindings;
private final Optional<List<SourceFile<TruffleFile>>> _sources;
public CachedBindings(LibraryName libraryName, MapToBindings bindings, Optional<List<SourceFile<TruffleFile>>> sources) {

CachedBindings(LibraryName libraryName, MapToBindings bindings, Optional<List<SourceFile<TruffleFile>>> sources) {
this._libraryName = libraryName;
this._bindings = bindings;
this._sources = sources;
Expand Down
2 changes: 1 addition & 1 deletion engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void initialize() {
var resourceManager = new org.enso.distribution.locking.ResourceManager(lockManager);

packageRepository =
PackageRepository.initializeRepository(
DefaultPackageRepository.initializeRepository(
OptionConverters.toScala(projectPackage),
OptionConverters.toScala(languageHome),
OptionConverters.toScala(editionOverride),
Expand Down
Loading