Changeset 822


Ignore:
Timestamp:
Aug 2, 2012 11:17:45 PM (12 years ago)
Author:
Anya Helene Bagge
Message:

Recover lost stuff from local history:

  • move tasks library into Magnolia in preparation for migration
  • make a resources interface for the new caching framework
Location:
trunk/magnolia-eclipse
Files:
26 added
54 edited

Legend:

Unmodified
Added
Removed

  • trunk/magnolia-eclipse/META-INF/MANIFEST.MF

    r821 r822  
    33Bundle-Name: magnolia-eclipse
    44Bundle-SymbolicName: magnolia_eclipse;singleton:=true
    5 Bundle-Version: 0.2.27
     5Bundle-Version: 0.3.0
    66Bundle-Activator: org.magnolialang.eclipse.MagnoliaPlugin
    77Bundle-ActivationPolicy: lazy

  • trunk/magnolia-eclipse/src/org/magnolialang/eclipse/OptionsProducer.java

    r651 r822  
    2222import org.rascalmpl.interpreter.IRascalMonitor;
    2323import org.rascalmpl.parser.gtd.io.InputConverter;
    24 import org.rascalmpl.tasks.ITransaction;
     24import org.magnolialang.tasks.ITransaction;
    2525
    26 public class OptionsProducer implements org.rascalmpl.tasks.IIValueTask {
     26public class OptionsProducer implements org.magnolialang.tasks.IIValueTask {
    2727        private final Collection<Type>  keys;
    2828        private final Map<String, URL>  files   = new HashMap<String, URL>();

  • trunk/magnolia-eclipse/src/org/magnolialang/load/FileFact.java

    r631 r822  
    99import org.eclipse.core.runtime.IPath;
    1010import org.eclipse.imp.pdb.facts.IValue;
    11 import org.rascalmpl.tasks.IFact;
    12 import org.rascalmpl.tasks.facts.AbstractFact;
     11import org.magnolialang.tasks.IFact;
     12import org.magnolialang.tasks.facts.AbstractFact;
    1313
    1414@Deprecated

  • trunk/magnolia-eclipse/src/org/magnolialang/load/GenericTreeProducer.java

    r795 r822  
    2121import org.rascalmpl.interpreter.IRascalMonitor;
    2222import org.rascalmpl.parser.gtd.exception.ParseError;
    23 import org.rascalmpl.tasks.IFact;
    24 import org.rascalmpl.tasks.ITransaction;
     23import org.magnolialang.tasks.IFact;
     24import org.magnolialang.tasks.ITransaction;
    2525
    26 public class GenericTreeProducer implements org.rascalmpl.tasks.IIValueTask {
     26public class GenericTreeProducer implements org.magnolialang.tasks.IIValueTask {
    2727        private final Collection<Type>  keys;
    2828

  • trunk/magnolia-eclipse/src/org/magnolialang/load/ModuleParser.java

    r811 r822  
    103103                return module;
    104104        }
    105 
    106105}

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/Magnolia.java

    r796 r822  
    119119
    120120        @Override
     121        public IPath getModulePath(IConstructor moduleId) {
     122                return getModulePath(getNameString(moduleId));
     123        }
     124
     125
     126        @Override
    121127        public IConstructor getNameAST(String name) {
    122128                String[] split = name.split("\\.");
    … …  
    150156                return Infra.get().makeCompiler();
    151157        }
     158
    152159}

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/MagnoliaCompiler.java

    r812 r822  
    2121import org.magnolialang.rascal.RascalInterpreter;
    2222import org.magnolialang.resources.IModuleManager;
     23import org.magnolialang.tasks.IIValueTask;
     24import org.magnolialang.tasks.ITaskRegistry;
     25import org.magnolialang.tasks.PDBValueTaskRegistry;
     26import org.magnolialang.tasks.Transaction;
    2327import org.magnolialang.terms.TermFactory;
    2428import org.rascalmpl.eclipse.nature.RascalMonitor;
    … …  
    2731import org.rascalmpl.interpreter.NullRascalMonitor;
    2832import org.rascalmpl.interpreter.control_exceptions.Throw;
    29 import org.rascalmpl.tasks.IIValueTask;
    30 import org.rascalmpl.tasks.ITaskRegistry;
    31 import org.rascalmpl.tasks.PDBValueTaskRegistry;
    32 import org.rascalmpl.tasks.Transaction;
    3333
    3434/**
    … …  
    166166                        PrintWriter stderr = new PrintWriter(System.err); // new
    167167                        // PrintWriter(RuntimePlugin.getInstance().getConsoleStream());
    168                         Transaction tr = new Transaction(getTransaction(), stderr, false);
     168                        Transaction tr = new Transaction(getTransaction(), stderr, false, null);
    169169                        tr.registerListener(markerListener, MagnoliaFacts.Type_ErrorMark);
    170170                        transaction = tr;
    … …  
    288288                                                                                evaluator.doImport(rm, "org::magnolialang::magnolia::MagnoliaCompiler");
    289289                                                                                evaluator.doImport(rm, "org::magnolialang::magnolia::lib::Pretty");
    290                                                                                 evaluator.doImport(rm, "util::tasks::Vis");
     290                                                                                //              evaluator.doImport(rm, "org::magnolialang::tasks::Vis");
    291291                                                                                evaluator.call(rm, "registerCompiler");
    292292                                                                                initialized = true;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/MagnoliaCompiler.rsc

    r766 r822  
    33import IO;
    44
    5 import util::tasks::Manager;
     5import org::magnolialang::tasks::Manager;
    66import org::magnolialang::magnolia::AbstractSyntax;
    77import org::magnolialang::terms::Terms;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/MagnoliaUtil.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::terms::Terms;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/MarkerListener.java

    r676 r822  
    1919import org.magnolialang.errors.ErrorMarkers;
    2020import org.magnolialang.errors.ImplementationError;
    21 import org.rascalmpl.tasks.IDependencyListener;
    22 import org.rascalmpl.tasks.IFact;
     21import org.magnolialang.tasks.IDependencyListener;
     22import org.magnolialang.tasks.IFact;
    2323
    2424public class MarkerListener implements IDependencyListener {

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/backend/Alerter.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/backend/CxxBackend.rsc

    r821 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/backend/CxxSkeleton.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/backend/LibraryBuilder.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/backend/Mutifier.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/evaluator/Values.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::lib::MagnoliaCompileLib;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/frontend/MagnoliaLoader.rsc

    r795 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::lib::MagnoliaCompileLib;
    … …  
    88import org::magnolialang::terms::Terms;
    99import org::magnolialang::compiler::Util;
     10
    1011
    1112public bool loadTree(Transaction tr, type[&T] key, AST modName) {

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/frontend/MagnoliaSugar.rsc

    r821 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::lib::MagnoliaCompileLib;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/lib/Inliner.rsc

    r821 r822  
    55import List;
    66import Map;
    7 import util::tasks::Manager;
     7import org::magnolialang::tasks::Manager;
    88import org::magnolialang::magnolia::MagnoliaFacts;
    99import org::magnolialang::terms::Terms;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/lib/MagnoliaCompileLib.rsc

    r796 r822  
    55import List;
    66import Map;
    7 import util::tasks::Manager;
     7import org::magnolialang::tasks::Manager;
    88import org::magnolialang::magnolia::MagnoliaFacts;
    99import org::magnolialang::terms::Terms;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/random/RandomPrograms.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 //import util::tasks::Manager;
     4//import org::magnolialang::tasks::Manager;
    55//import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::lib::MagnoliaCompileLib;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/services/MagnoliaOutliner.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::lib::MagnoliaCompileLib;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/services/MagnoliaSimplifier.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/services/XRefs.rsc

    r766 r822  
    11module org::magnolialang::magnolia::services::XRefs
    22
    3 import util::tasks::Manager;
     3import org::magnolialang::tasks::Manager;
    44import org::magnolialang::magnolia::lib::Names;
    55import org::magnolialang::magnolia::lib::MagnoliaCompileLib;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/toplevel/MagnoliaFlattener.rsc

    r796 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/toplevel/TopTestRunner.rsc

    r796 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::MagnoliaFlattener;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/Attributes.rsc

    r766 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/Environment.rsc

    r811 r822  
    11module org::magnolialang::magnolia::typechecker::Environment
    22import IO;
    3 import util::tasks::Manager;
     3import org::magnolialang::tasks::Manager;
    44import org::magnolialang::magnolia::AbstractSyntax;
    55import org::magnolialang::magnolia::MagnoliaFacts;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/Expressions.rsc

    r811 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/Merge.rsc

    r788 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/Statements.rsc

    r811 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/magnolia/typechecker/TypeChecker.rsc

    r788 r822  
    22import IO;
    33import org::magnolialang::magnolia::AbstractSyntax;
    4 import util::tasks::Manager;
     4import org::magnolialang::tasks::Manager;
    55import org::magnolialang::magnolia::MagnoliaFacts;
    66import org::magnolialang::magnolia::toplevel::TopLevelOps;

  • trunk/magnolia-eclipse/src/org/magnolialang/metaxa/MetaXaCompiler.java

    r709 r822  
    1212import org.magnolialang.load.GenericTreeProducer;
    1313import org.magnolialang.resources.IModuleManager;
     14import org.magnolialang.tasks.ITaskRegistry;
     15import org.magnolialang.tasks.PDBValueTaskRegistry;
     16import org.magnolialang.tasks.Transaction;
    1417import org.rascalmpl.interpreter.Evaluator;
    1518import org.rascalmpl.interpreter.IRascalMonitor;
    16 import org.rascalmpl.tasks.ITaskRegistry;
    17 import org.rascalmpl.tasks.PDBValueTaskRegistry;
    18 import org.rascalmpl.tasks.Transaction;
    1919
    2020public class MetaXaCompiler implements ICompiler {
    … …  
    2525                ITaskRegistry<Type, IValue, IValue> registry = PDBValueTaskRegistry.getRegistry();
    2626
    27                 tr = new Transaction(new PrintWriter(RuntimePlugin.getInstance().getConsoleStream()));
     27                tr = new Transaction(new PrintWriter(RuntimePlugin.getInstance().getConsoleStream()), null);
    2828
    2929                GenericTreeProducer parser = new GenericTreeProducer();

  • trunk/magnolia-eclipse/src/org/magnolialang/pgf/tests/DumpMgData.rsc

    r807 r822  
    88import org::magnolialang::magnolia::MagnoliaFacts;
    99import org::magnolialang::magnolia::lib::Names;
    10 import util::tasks::Manager;
     10import org::magnolialang::tasks::Manager;
    1111
    1212import IO;

  • trunk/magnolia-eclipse/src/org/magnolialang/pgf/tests/TestPrettyMagnolia.rsc

    r809 r822  
    1414import org::magnolialang::magnolia::MagnoliaFacts;
    1515
    16 import util::tasks::Manager;
     16import org::magnolialang::tasks::Manager;
    1717
    1818import IO;

  • trunk/magnolia-eclipse/src/org/magnolialang/pgf/tests/TestWithMgModules.rsc

    r808 r822  
    1111import org::magnolialang::terms::Terms;
    1212
    13 import util::tasks::Manager;
     13import org::magnolialang::tasks::Manager;
    1414
    1515import IO;

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/ILanguage.java

    r679 r822  
    7171
    7272        /**
     73         * @param moduleId
     74         *            A module ID; module need not exist
     75         * @return A source-folder relative path to the module, including preferred
     76         *         extension
     77         */
     78        IPath getModulePath(IConstructor moduleId);
     79
     80
     81        /**
    7382         * @param name
    7483         *            A string representation of a name

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/IManagedResource.java

    r576 r822  
    66import org.eclipse.core.runtime.IPath;
    77import org.eclipse.imp.pdb.facts.IValue;
    8 import org.rascalmpl.tasks.IFact;
     8import org.magnolialang.tasks.IFact;
    99
    1010public interface IManagedResource extends IFact<IValue> {

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/IModuleManager.java

    r627 r822  
    66import org.eclipse.imp.pdb.facts.IConstructor;
    77import org.eclipse.imp.pdb.facts.ISourceLocation;
    8 import org.eclipse.imp.pdb.facts.IValue;
    98import org.magnolialang.compiler.ICompiler;
    109import org.magnolialang.nullness.Nullable;
    … …  
    3837
    3938        /**
     39         * @param language
     40         *            A language
     41         * @param moduleId
     42         *            A language-specific module ID
     43         * @return The module with that name, or null.
     44         * @throws IllegalArgumentException
     45         *             if moduleName is not a valid name
     46         */
     47        @Nullable
     48        IManagedResource findModule(ILanguage language, IConstructor moduleId);
     49
     50
     51        /**
    4052         * @param moduleName
    4153         *            A language-specific module identifier (AST)
    … …  
    4355         * @throws IllegalArgumentException
    4456         *             if moduleId is not a valid name
     57         * @Nullable
     58         *
     59         *           This one can't work if modules can have same ID in different
     60         *           languages
     61         *
     62         *           IManagedResource findModule(IValue moduleId);
    4563         */
    46         @Nullable
    47         IManagedResource findModule(IValue moduleId);
    48 
    4964
    5065        Collection<IPath> allModules(ILanguage language);
    … …  
    112127         */
    113128        IPath getOutFolder();
     129
    114130}

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/IResourceManager.java

    r795 r822  
    1111import org.magnolialang.nullness.Nullable;
    1212import org.magnolialang.terms.TermFactory;
    13 import org.rascalmpl.tasks.Transaction;
     13import org.magnolialang.tasks.Transaction;
    1414
    1515public interface IResourceManager {

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/ResourceManager.java

    r691 r822  
    2929import org.magnolialang.resources.internal.FileFact;
    3030import org.magnolialang.resources.internal.ProjectManager;
     31import org.magnolialang.tasks.IDependencyListener.Change;
     32import org.magnolialang.tasks.INameFormatter;
     33import org.magnolialang.tasks.Transaction;
    3134import org.magnolialang.terms.TermAdapter;
    32 import org.rascalmpl.tasks.IDependencyListener.Change;
    33 import org.rascalmpl.tasks.INameFormatter;
    34 import org.rascalmpl.tasks.Transaction;
    3535
    3636@edu.umd.cs.findbugs.annotations.SuppressWarnings("SIC_INNER_SHOULD_BE_STATIC_ANON")
    … …  
    315315                                return name.toString();
    316316                        }
    317                 }, stderr);
     317                }, stderr, null);
    318318        }
    319319

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/internal/AbstractManagedResource.java

    r631 r822  
    1010import org.magnolialang.resources.IManagedResource;
    1111import org.magnolialang.resources.ResourceManager;
    12 import org.rascalmpl.tasks.facts.AbstractFact;
     12import org.magnolialang.tasks.facts.AbstractFact;
    1313
    1414public abstract class AbstractManagedResource extends AbstractFact<IValue> implements IManagedResource {

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/internal/EditedFact.java

    r631 r822  
    88import org.eclipse.imp.pdb.facts.IValue;
    99import org.magnolialang.eclipse.editor.MagnoliaParseController;
    10 import org.rascalmpl.tasks.IFact;
    11 import org.rascalmpl.tasks.facts.AbstractFact;
     10import org.magnolialang.tasks.IFact;
     11import org.magnolialang.tasks.facts.AbstractFact;
    1212
    1313public class EditedFact extends AbstractFact<IValue> implements IModelListener {

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/internal/FileFact.java

    r632 r822  
    1616import org.magnolialang.resources.ResourceManager;
    1717import org.rascalmpl.parser.gtd.io.InputConverter;
    18 import org.rascalmpl.tasks.IFact;
     18import org.magnolialang.tasks.IFact;
    1919
    2020public class FileFact extends AbstractManagedResource implements IManagedFile {

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/internal/FileLinkFact.java

    r631 r822  
    1111import org.magnolialang.resources.ILanguage;
    1212import org.magnolialang.resources.IManagedFile;
    13 import org.rascalmpl.tasks.IFact;
    14 import org.rascalmpl.tasks.Transaction;
    15 import org.rascalmpl.tasks.facts.AbstractFact;
     13import org.magnolialang.tasks.IFact;
     14import org.magnolialang.tasks.Transaction;
     15import org.magnolialang.tasks.facts.AbstractFact;
    1616
    1717public class FileLinkFact extends AbstractFact<IValue> implements IManagedFile {

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/internal/ManagedContainer.java

    r631 r822  
    99import org.magnolialang.resources.IManagedResource;
    1010import org.magnolialang.resources.ResourceManager;
    11 import org.rascalmpl.tasks.IFact;
     11import org.magnolialang.tasks.IFact;
    1212
    1313public class ManagedContainer extends AbstractManagedResource implements IManagedContainer {

  • trunk/magnolia-eclipse/src/org/magnolialang/resources/internal/ProjectManager.java

    r691 r822  
    2323import org.eclipse.imp.pdb.facts.IConstructor;
    2424import org.eclipse.imp.pdb.facts.ISourceLocation;
    25 import org.eclipse.imp.pdb.facts.IString;
    26 import org.eclipse.imp.pdb.facts.IValue;
    2725import org.magnolialang.compiler.ICompiler;
    2826import org.magnolialang.errors.ErrorMarkers;
    … …  
    3836import org.magnolialang.resources.IResourceManager;
    3937import org.magnolialang.resources.LanguageRegistry;
    40 import org.rascalmpl.interpreter.NullRascalMonitor;
    41 import org.rascalmpl.tasks.Transaction;
     38import org.magnolialang.tasks.Transaction;
    4239
    4340public final class ProjectManager implements IModuleManager, IManagedResourceListener {
    … …  
    7067                manager.addListener(this);
    7168                tr = initializeTransaction();
     69                System.err.println("New projectmanager: basepath=" + basePath);
    7270                for(IPath p : contents) {
     71                        System.err.println("New projectmanager: adding " + p);
    7372                        resourceAdded(p);
    7473                }
    … …  
    110109
    111110                try {
     111                        if(path.isAbsolute())
     112                                path = makeProjectRelativePath(path);
     113                        System.err.println("find: relative path: " + path);
    112114                        IManagedResource res = resources.get(path);
     115
    113116                        if(res == null) {
    114117                                IResource member = project.findMember(path);
    … …  
    118121                                        res = resources.get(member.getFullPath());
    119122                        }
     123                        System.err.println("find: resource: " + res);
    120124                        return res;
    121125                }
    … …  
    367371        @Override
    368372        @Nullable
    369         public IManagedResource findModule(IValue moduleName) {
     373        public IManagedResource findModule(ILanguage language, IConstructor moduleId) {
     374                Lock l = lock.readLock();
     375                l.lock();
     376
     377                try {
     378                        return modulesByName.get(language.getId() + MODULE_LANG_SEP + language.getNameString(moduleId));
     379                }
     380                finally {
     381                        l.unlock();
     382                }
     383        }
     384
     385
     386        /*
     387        @Override
     388        @Nullable
     389        public IManagedResource findModule(IValue moduleId) {
    370390                Lock l = lock.readLock();
    371391                l.lock();
    … …  
    373393                l.unlock(); // avoid holding the lock through getFact()
    374394
    375                 IConstructor res = (IConstructor) localTr.getFact(new NullRascalMonitor(), Type_ModuleResource, moduleName);
     395                IValue fact = localTr.getFact(new NullRascalMonitor(), Type_ModuleResource, moduleId);
     396                System.err.println("findModule: " + fact);
     397                IConstructor res = (IConstructor) fact;
    376398                l.lock();
    377399                try {
    … …  
    385407                }
    386408        }
    387 
     409        */
    388410
    389411        @Override
    … …  
    399421                        else {
    400422                                path = resource.getFullPath().makeRelativeTo(getSrcFolder());
     423                                System.err.println("getModuleId: src relative path:" + path);
    401424                                String modName = resource.getLanguage().getModuleName(path);
    402425                                return resource.getLanguage().getNameAST(modName);

  • trunk/magnolia-eclipse/src/org/magnolialang/testutil/MagnoliaCompiler.java

    r812 r822  
    1919import org.magnolialang.nullness.Nullable;
    2020import org.magnolialang.rascal.RascalInterpreter;
     21import org.magnolialang.tasks.IIValueTask;
     22import org.magnolialang.tasks.ITaskRegistry;
     23import org.magnolialang.tasks.PDBValueTaskRegistry;
     24import org.magnolialang.tasks.Transaction;
    2125import org.magnolialang.terms.TermFactory;
    2226import org.rascalmpl.interpreter.Evaluator;
    2327import org.rascalmpl.interpreter.IRascalMonitor;
    2428import org.rascalmpl.interpreter.control_exceptions.Throw;
    25 import org.rascalmpl.tasks.IIValueTask;
    26 import org.rascalmpl.tasks.ITaskRegistry;
    27 import org.rascalmpl.tasks.PDBValueTaskRegistry;
    28 import org.rascalmpl.tasks.Transaction;
    2929
    3030public class MagnoliaCompiler implements ICompiler {
    … …  
    3333        private final ITaskRegistry<Type, IValue, IValue>       registry        = PDBValueTaskRegistry.getRegistry();
    3434        //private final IXRefResolver                                                   xRefResolver;
    35         private final Transaction                                                       transaction     = new Transaction(null);
     35        private final Transaction                                                       transaction     = new Transaction((PrintWriter) null, null);
    3636        //private final OptionsProducer                                         options;
    3737        //private final MagnoliaModuleProducer                          modProd;
    … …  
    221221                evaluator.doImport(rm, "org::magnolialang::magnolia::MagnoliaCompiler");
    222222                evaluator.doImport(rm, "org::magnolialang::magnolia::lib::Pretty");
    223                 //evaluator.doImport(rm, "util::tasks::Vis"); // imports SWT
     223                //evaluator.doImport(rm, "org::magnolialang::tasks::Vis"); // imports SWT
    224224                evaluator.call(rm, "registerCompiler");
    225225        }

  • trunk/magnolia-eclipse/src/org/magnolialang/testutil/MagnoliaModuleProducer.java

    r795 r822  
    1818import org.magnolialang.resources.IResourceManager;
    1919import org.rascalmpl.interpreter.IRascalMonitor;
    20 import org.rascalmpl.tasks.IIValueTask;
    21 import org.rascalmpl.tasks.ITransaction;
     20import org.magnolialang.tasks.IIValueTask;
     21import org.magnolialang.tasks.ITransaction;
    2222
    2323public class MagnoliaModuleProducer implements IIValueTask {

  • trunk/magnolia-eclipse/src/org/magnolialang/testutil/OptionsProducer.java

    r803 r822  
    2222import org.rascalmpl.interpreter.IRascalMonitor;
    2323import org.rascalmpl.parser.gtd.io.InputConverter;
    24 import org.rascalmpl.tasks.ITransaction;
     24import org.magnolialang.tasks.ITransaction;
    2525
    26 public class OptionsProducer implements org.rascalmpl.tasks.IIValueTask {
     26public class OptionsProducer implements org.magnolialang.tasks.IIValueTask {
    2727        private final Collection<Type>          keys;
    2828        private final Map<String, Object>       op;

  • trunk/magnolia-eclipse/src/org/magnolialang/testutil/TestUtil.java

    r807 r822  
    1616import org.magnolialang.terms.skins.MagnoliaSkin;
    1717import org.rascalmpl.interpreter.IRascalMonitor;
    18 import org.rascalmpl.tasks.IFact;
    19 import org.rascalmpl.tasks.Transaction;
     18import org.magnolialang.tasks.IFact;
     19import org.magnolialang.tasks.Transaction;
    2020
    2121public final class TestUtil {

  • trunk/magnolia-eclipse/src/org/magnolialang/testutil/TestUtil.rsc

    r808 r822  
    66import org::magnolialang::magnolia::MagnoliaFacts;
    77import org::magnolialang::magnolia::lib::Names;
    8 import util::tasks::Manager;
     8import org::magnolialang::tasks::Manager;
    99
    1010import IO;

  • trunk/magnolia-eclipse/src/org/magnolialang/testutil/UnmanagedFileFact.java

    r795 r822  
    1717import org.magnolialang.resources.IManagedFile;
    1818import org.rascalmpl.parser.gtd.io.InputConverter;
    19 import org.rascalmpl.tasks.IFact;
    20 import org.rascalmpl.tasks.facts.AbstractFact;
     19import org.magnolialang.tasks.IFact;
     20import org.magnolialang.tasks.facts.AbstractFact;
    2121
    2222public final class UnmanagedFileFact extends AbstractFact<IValue> implements IManagedFile {

  • trunk/magnolia-eclipse/src/org/magnolialang/testutil/core.clj

    r808 r822  
    8888  (rtostring (reval s)))
    8989
    90 ;; E.g. (reval-more "import util::tasks::Manager; getFact; 5;")
     90;; E.g. (reval-more "import org::magnolialang::tasks::Manager; getFact; 5;")
    9191(defn reval-more [s]
    9292  (.evalMore rsc-evaluator s))
    9393
    94 ;; E.g. (rimport "util::tasks::Manager")
     94;; E.g. (rimport "org::magnolialang::tasks::Manager")
    9595(defn rimport [s]
    9696  (.doImport rsc-evaluator s))
Note: See TracChangeset for help on using the changeset viewer.