Changeset 453


Ignore:
Timestamp:
Jul 5, 2010 4:10:01 AM (14 years ago)
Author:
Anya Helene Bagge
Message:
  • Fix all warnings
  • Move some files around
  • Delete some unused files
Location:
trunk/MagnoliaPlugin
Files:
1 deleted
22 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/MagnoliaPlugin/plugin.xml

    r452 r453  
    2525         point="org.eclipse.imp.runtime.parser">
    2626      <parser
    27             class="org.magnolialang.eclipse.editor.ParseController"
     27            class="org.magnolialang.eclipse.editor.MagnoliaParseController"
    2828            language="Magnolia">
    2929      </parser>
    … …  
    3232         point="org.eclipse.imp.runtime.parser">
    3333      <parser
    34             class="org.magnolialang.eclipse.editor.ParseController"
     34            class="org.magnolialang.eclipse.editor.MagnoliaParseController"
    3535            language="MetaXa">
    3636      </parser>
    … …  
    4949            language="MetaXa">
    5050      </tokenColorer>
    51    </extension>
    52    <extension
    53          point="org.eclipse.imp.runtime.refactoringContributions">
    54       <refactoringContributor
    55             class="imp.magnolia.refactoring.RefactoringContributor"
    56             language="Magnolia">
    57       </refactoringContributor>
    5851   </extension>
    5952   <extension

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/builders/MagnoliaBuilder.java

    r452 r453  
    2121
    2222import org.magnolialang.eclipse.MagnoliaPlugin;
    23 import org.magnolialang.eclipse.editor.ImplementationError;
    24 import org.magnolialang.eclipse.editor.ParseController;
     23import org.magnolialang.eclipse.editor.MagnoliaParseController;
    2524import org.magnolialang.errors.CompilationError;
    2625import org.magnolialang.errors.ErrorMarkers;
    … …  
    193192               
    194193                try {
    195                         IParseController parseController = new ParseController();
     194                        IParseController parseController = new MagnoliaParseController();
    196195
    197196                        // TODO:  Pick a version of the marker creator (or just go with this one)

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/commands/SelectConstruct.java

    r442 r453  
    88import org.eclipse.core.commands.ExecutionException;
    99import org.eclipse.imp.pdb.facts.IConstructor;
    10 import org.eclipse.imp.pdb.facts.IMap;
    1110import org.eclipse.imp.pdb.facts.ISourceLocation;
    1211import org.eclipse.imp.pdb.facts.IValue;
    … …  
    1615import org.magnolialang.eclipse.editor.MagnoliaEditor;
    1716import org.magnolialang.eclipse.editor.NodeLocator;
    18 import org.magnolialang.eclipse.editor.ParseController;
     17import org.magnolialang.eclipse.editor.MagnoliaParseController;
    1918import org.magnolialang.eclipse.rascal.RascalInterpreter;
    2019import org.magnolialang.xatree.SortNameMatcher;
    2120import org.magnolialang.xatree.TreeImploder;
    22 import org.magnolialang.xatree.XaTreeAdapter;
    23 import org.magnolialang.xatree.XaTreeFactory;
    24 import org.rascalmpl.values.ValueFactoryFactory;
    2521import org.rascalmpl.values.uptr.TreeAdapter;
    2622
    … …  
    3127                        MagnoliaEditor editor = (MagnoliaEditor)editorPart;
    3228                        Point p = editor.getSelection();
    33                         ParseController parseCtrl = (ParseController) editor.getParseController();
     29                        MagnoliaParseController parseCtrl = (MagnoliaParseController) editor.getParseController();
    3430                        NodeLocator locator = parseCtrl.getSourcePositionLocator();
    3531                        IConstructor tree = locator.findNode(parseCtrl.getCurrentAst(), p.x, new SortNameMatcher("Expr", "Type", "Decl", "Program"), NodeLocator.INNERMOST);
    … …  
    4642                               
    4743                                System.out.printf("Java tree imploder: %fms\n", diffTime/1000000.0);
    48                                 IValue result = XaTreeFactory.cons("Foo", "Expr", XaTreeFactory.leaf("foo", "Literal"));
    49                                 IValue result2 = RascalInterpreter.getInstance().eval("cons(\"Foo\", [leaf(\"foo\", \"Literal\")], \"Expr\")", "import XaTree;");
    5044                                System.out.println("Ready.");
    5145                                startTime = System.nanoTime();
    … …  
    6155                                System.out.println("Imploded term equality: " + imploded.toString().equals(imploded2.toString()));
    6256                               
    63                                 IMap m = XaTreeAdapter.match(imploded, imploded2);
    64                                 IValue pattern = XaTreeFactory.cons("Apply", "Expr", ValueFactoryFactory.getValueFactory().list(XaTreeFactory.termvar("f", "Fun"), XaTreeFactory.termvar("as", "Expr")));
    65                                 m = XaTreeAdapter.match(pattern, imploded);
    66                                 //String up1 = ((IString)RascalInterpreter.getInstance().call("unparse", "import XaTree;", imploded)).getValue();
    67                                 //String up2 = ((IString)RascalInterpreter.getInstance().call("unparse", "import XaTree;", imploded2)).getValue();
    6857
    6958                                try {

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/commands/ViewFlattenedModule.java

    r442 r453  
    1313import org.eclipse.ui.IEditorPart;
    1414import org.eclipse.ui.handlers.HandlerUtil;
    15 import org.magnolialang.eclipse.editor.ImplementationError;
    1615import org.magnolialang.eclipse.rascal.RascalInterpreter;
    1716import org.magnolialang.env.MagnoliaEnvironment;
    1817import org.magnolialang.errors.CompilationError;
     18import org.magnolialang.errors.ImplementationError;
    1919import org.magnolialang.load.ProjectURIResolver;
    2020import org.magnolialang.manager.MagnoliaProjectManager;

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/AmbiguityMarkerModelListener.java

    r448 r453  
    4343        public void update(IParseController parseController,
    4444                        IProgressMonitor monitor) {
    45                 if(parseController instanceof ParseController) {
    46                         ParseController ctrl = (ParseController)parseController;
     45                if(parseController instanceof MagnoliaParseController) {
     46                        MagnoliaParseController ctrl = (MagnoliaParseController)parseController;
    4747
    4848                        IConstructor tree = ctrl.getCurrentAst();

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/MagnoliaEditor.java

    r449 r453  
    1919        super.createPartControl(parent);
    2020        if(getParseController() != null)
    21                 ((ParseController)getParseController()).setEditor(this);
     21                ((MagnoliaParseController)getParseController()).setEditor(this);
    2222       
    2323    }
    … …  
    3232   
    3333    @Override public void dispose() {
    34         ((ParseController)getParseController()).dispose();
     34        ((MagnoliaParseController)getParseController()).dispose();
    3535        super.dispose();
    3636    }

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/MagnoliaParseController.java

    r452 r453  
    2020import org.magnolialang.eclipse.MagnoliaPlugin;
    2121import org.magnolialang.env.MagnoliaEnvironment;
     22import org.magnolialang.errors.ImplementationError;
    2223import org.magnolialang.errors.SyntaxError;
    2324import org.magnolialang.load.ModuleLoader;
    2425import org.magnolialang.load.ProjectURIResolver;
    2526import org.magnolialang.manager.EditedProjectManager;
    26 import org.rascalmpl.values.errors.SummaryAdapter;
    27 import org.rascalmpl.values.uptr.Factory;
    2827import org.rascalmpl.values.uptr.ParsetreeAdapter;
    2928
    30 public class ParseController implements IParseController {
     29public class MagnoliaParseController implements IParseController {
    3130        private ModuleLoader loader;
    3231
    … …  
    4443        private MagnoliaEditor editor;
    4544
    46         public ParseController() {
     45        public MagnoliaParseController() {
    4746                super();
    4847        }

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/StaticCheckModelListener.java

    r452 r453  
    11package org.magnolialang.eclipse.editor;
    22
     3import org.eclipse.core.runtime.IProgressMonitor;
     4import org.eclipse.imp.parser.IModelListener;
     5import org.eclipse.imp.parser.IParseController;
     6/*
     7import org.magnolialang.magnolia.StaticChecker;
    38import org.eclipse.core.resources.IFile;
    49import org.eclipse.core.resources.IMarker;
    … …  
    914import org.eclipse.core.runtime.CoreException;
    1015import org.eclipse.core.runtime.IPath;
    11 import org.eclipse.core.runtime.IProgressMonitor;
    12 import org.eclipse.imp.parser.IModelListener;
    13 import org.eclipse.imp.parser.IParseController;
    1416import org.eclipse.imp.pdb.facts.IConstructor;
    1517import org.magnolialang.eclipse.MagnoliaPlugin;
    1618import org.magnolialang.env.MagnoliaEnvironment;
    1719import org.magnolialang.errors.CompilationError;
    18 import org.magnolialang.magnolia.StaticChecker;
    1920import org.magnolialang.manager.EditedProjectManager;
    2021import org.magnolialang.manager.MagnoliaProjectManager;
    21 
     22*/
    2223public class StaticCheckModelListener implements IModelListener {
    23         private final StaticChecker checker = StaticChecker.getInstance();
     24        // private final StaticChecker checker = StaticChecker.getInstance();
    2425
    2526        public AnalysisRequired getAnalysisRequired() {

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/TokenIterator.java

    r448 r453  
    55import java.util.List;
    66
    7 import org.eclipse.core.resources.IFile;
    8 import org.eclipse.core.resources.IMarker;
    9 import org.eclipse.core.resources.IResource;
    10 import org.eclipse.core.runtime.CoreException;
    11 import org.eclipse.core.runtime.IPath;
    12 import org.eclipse.imp.model.ISourceProject;
    13 import org.eclipse.imp.parser.IMessageHandler;
    14 import org.eclipse.imp.parser.IMessageHandlerExtension;
    157import org.eclipse.imp.pdb.facts.IConstructor;
    16 import org.eclipse.imp.pdb.facts.ISet;
    17 import org.eclipse.imp.pdb.facts.ISourceLocation;
    188import org.eclipse.imp.pdb.facts.IValue;
    199import org.eclipse.imp.pdb.facts.visitors.VisitorException;
    20 import org.magnolialang.load.ProjectURIResolver;
    2110import org.rascalmpl.values.uptr.ProductionAdapter;
    2211import org.rascalmpl.values.uptr.TreeAdapter;

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/hoverHelper/HelperReferenceResolver.java

    r448 r453  
    11package org.magnolialang.eclipse.hoverHelper;
    22
    3 import lpg.runtime.IAst;
    4 
    53import org.eclipse.imp.parser.IParseController;
    6 import org.eclipse.imp.parser.SimpleLPGParseController;
    7 import org.eclipse.imp.parser.SymbolTable;
    84import org.eclipse.imp.services.IReferenceResolver;
    95

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/hoverHelper/MagnoliaHoverHelper.java

    r448 r453  
    1414import org.eclipse.imp.services.IReferenceResolver;
    1515import org.eclipse.imp.services.base.HoverHelperBase;
    16 import org.eclipse.imp.utils.ExtensionException;
    17 import org.eclipse.imp.utils.ExtensionFactory;
    1816import org.eclipse.jface.text.BadLocationException;
     17import org.eclipse.jface.text.source.Annotation;
    1918import org.eclipse.jface.text.source.ISourceViewer;
    2019
    … …  
    3433                // the given offset, return those
    3534                try {
    36                         List annotations = AnnotationHoverBase.getSourceAnnotationsForLine(
     35                        List<Annotation> annotations = AnnotationHoverBase.getSourceAnnotationsForLine(
    3736                                        srcViewer, srcViewer.getDocument().getLineOfOffset(offset));
    3837                        if (annotations != null && annotations.size() > 0) {

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/preferences/MagnoliaInstanceTab.java

    r451 r453  
    33import java.util.List;
    44import java.util.ArrayList;
    5 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
    6 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
    75import org.eclipse.swt.widgets.Composite;
    86import org.eclipse.swt.widgets.Link;
    97import org.eclipse.imp.preferences.*;
    108import org.eclipse.imp.preferences.fields.*;
    11 import org.osgi.service.prefs.Preferences;
    129
    1310

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/preferences/MagnoliaProjectTab.java

    r451 r453  
    33import java.util.List;
    44import java.util.ArrayList;
    5 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
    65import org.eclipse.core.runtime.preferences.IEclipsePreferences;
    76import org.eclipse.swt.widgets.Composite;

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/rascal/RascalInterpreter.java

    r424 r453  
    99import org.eclipse.core.resources.ResourcesPlugin;
    1010import org.eclipse.imp.pdb.facts.IValue;
    11 import org.magnolialang.eclipse.editor.ImplementationError;
     11import org.magnolialang.errors.ImplementationError;
    1212import org.rascalmpl.interpreter.Evaluator;
    1313import org.rascalmpl.interpreter.env.GlobalEnvironment;

  • trunk/MagnoliaPlugin/src/org/magnolialang/errors/ImplementationError.java

    r451 r453  
    1 package org.magnolialang.eclipse.editor;
     1package org.magnolialang.errors;
    22
    33import org.eclipse.imp.pdb.facts.ISourceLocation;

  • trunk/MagnoliaPlugin/src/org/magnolialang/load/ModuleParser.java

    r421 r453  
    1818import org.eclipse.imp.pdb.facts.io.PBFReader;
    1919import org.magnolialang.eclipse.MagnoliaPlugin;
    20 import org.magnolialang.eclipse.editor.ImplementationError;
     20import org.magnolialang.errors.ImplementationError;
    2121import org.rascalmpl.values.ValueFactoryFactory;
    2222import org.rascalmpl.values.uptr.Factory;

  • trunk/MagnoliaPlugin/src/org/magnolialang/manager/EditedModuleInfo.java

    r452 r453  
    55import org.eclipse.imp.pdb.facts.IConstructor;
    66import org.eclipse.imp.utils.Pair;
    7 import org.magnolialang.eclipse.editor.ParseController;
     7import org.magnolialang.eclipse.editor.MagnoliaParseController;
    88import org.magnolialang.load.ProjectURIResolver;
    99
    1010class EditedModuleInfo extends MagnoliaModuleInfo {
    11         private final ParseController ctrl;
     11        private final MagnoliaParseController ctrl;
    1212
    13         public EditedModuleInfo(EditedProjectManager manager, ParseController ctrl) {
     13        public EditedModuleInfo(EditedProjectManager manager, MagnoliaParseController ctrl) {
    1414                super(manager);
    1515                this.uri = ProjectURIResolver.constructProjectURI(ctrl.getProject(), ctrl.getPath());

  • trunk/MagnoliaPlugin/src/org/magnolialang/manager/EditedProjectManager.java

    r452 r453  
    88import org.eclipse.core.resources.ResourcesPlugin;
    99import org.eclipse.imp.model.ISourceProject;
    10 import org.magnolialang.eclipse.editor.ImplementationError;
    11 import org.magnolialang.eclipse.editor.ParseController;
     10import org.magnolialang.eclipse.editor.MagnoliaParseController;
     11import org.magnolialang.errors.ImplementationError;
    1212
    1313public class EditedProjectManager extends MagnoliaProjectManager {
    1414        private static HashMap<String, EditedProjectManager> managerMap;
    1515        protected final MagnoliaProjectManager backManager;
    16         protected final Map<ParseController, EditedModuleInfo> ctrlMap;
     16        protected final Map<MagnoliaParseController, EditedModuleInfo> ctrlMap;
    1717
    1818        public EditedProjectManager(IProject project) {
    1919                super(project);
    20                 this.ctrlMap = new IdentityHashMap<ParseController, EditedModuleInfo>();
     20                this.ctrlMap = new IdentityHashMap<MagnoliaParseController, EditedModuleInfo>();
    2121                this.backManager = MagnoliaProjectManager.getProjectManager(project);
    2222        }
    … …  
    4343        }
    4444
    45         public void addEditedModule(ParseController ctrl) {
     45        public void addEditedModule(MagnoliaParseController ctrl) {
    4646                if(ctrlMap.containsKey(ctrl))
    4747                        ctrlMap.remove(ctrl);
    … …  
    5353        }
    5454       
    55         public void removeEditedModule(ParseController ctrl) {
     55        public void removeEditedModule(MagnoliaParseController ctrl) {
    5656                // TODO: Handle multiple editors for same module
    5757                EditedModuleInfo info = ctrlMap.get(ctrl);
    … …  
    6666        }
    6767
    68         public String findEditedModule(ParseController ctrl) {
     68        public String findEditedModule(MagnoliaParseController ctrl) {
    6969                // TODO: Handle multiple editors for same module
    7070                EditedModuleInfo info = ctrlMap.get(ctrl);

  • trunk/MagnoliaPlugin/src/org/magnolialang/manager/FileModuleInfo.java

    r452 r453  
    88import org.eclipse.core.resources.IResource;
    99import org.eclipse.core.runtime.CoreException;
    10 import org.magnolialang.eclipse.MagnoliaPlugin;
    11 import org.magnolialang.eclipse.editor.ImplementationError;
     10import org.magnolialang.errors.ImplementationError;
    1211import org.magnolialang.errors.ModuleNotFoundError;
    1312import org.magnolialang.load.ProjectURIResolver;

  • trunk/MagnoliaPlugin/src/org/magnolialang/manager/MagnoliaModuleInfo.java

    r452 r453  
    44import java.net.URI;
    55
    6 import org.eclipse.core.resources.IFile;
    7 import org.eclipse.core.resources.IMarker;
    8 import org.eclipse.core.resources.IResource;
    9 import org.eclipse.core.runtime.CoreException;
    106import org.eclipse.imp.pdb.facts.IConstructor;
    11 import org.magnolialang.eclipse.MagnoliaPlugin;
    12 import org.magnolialang.eclipse.editor.ImplementationError;
    13 import org.magnolialang.eclipse.editor.ParseController;
    147import org.magnolialang.env.MagnoliaEnvironment;
     8import org.magnolialang.errors.ImplementationError;
    159import org.magnolialang.xatree.TreeImploder;
    1610import org.rascalmpl.values.uptr.ParsetreeAdapter;

  • trunk/MagnoliaPlugin/src/org/magnolialang/manager/MagnoliaProjectManager.java

    r452 r453  
    11package org.magnolialang.manager;
    22
    3 import java.io.IOException;
    4 import java.io.StringBufferInputStream;
    53import java.net.URI;
    64import java.util.HashMap;
    7 import java.util.IdentityHashMap;
    85import java.util.Map;
    96
    … …  
    1815import org.eclipse.imp.pdb.facts.IConstructor;
    1916import org.eclipse.imp.pdb.facts.ISourceLocation;
    20 import org.eclipse.imp.utils.Pair;
    21 import org.magnolialang.eclipse.editor.ImplementationError;
    2217import org.magnolialang.env.MagnoliaEnvironment;
    2318import org.magnolialang.errors.CompilationError;
    24 import org.magnolialang.errors.ModuleNotFoundError;
     19import org.magnolialang.errors.ImplementationError;
    2520import org.magnolialang.load.IBuildPath;
    2621import org.magnolialang.load.MagnoliaBuildPath;
    … …  
    3530 *
    3631 */
    37 @SuppressWarnings("deprecation")
    3832public class MagnoliaProjectManager {
    3933        private static Map<String, MagnoliaProjectManager> managerMap;
    … …  
    181175                ce.printStackTrace();
    182176        }
    183 
    184         public Object getImports(String moduleName) {
    185                 MagnoliaEnvironment env = getModuleEnv(moduleName);
    186                 return null;
    187         }
    188 
    189177}

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/TreeImplodeVisitor.java

    r448 r453  
    44import java.util.regex.Pattern;
    55
    6 import org.eclipse.core.resources.IFile;
    7 import org.eclipse.core.resources.IMarker;
    8 import org.eclipse.core.resources.IResource;
    9 import org.eclipse.core.resources.IResourceRuleFactory;
    10 import org.eclipse.core.runtime.CoreException;
    11 import org.eclipse.imp.parser.IMessageHandler;
    126import org.eclipse.imp.pdb.facts.IConstructor;
    137import org.eclipse.imp.pdb.facts.IList;
    148import org.eclipse.imp.pdb.facts.IListWriter;
    159import org.eclipse.imp.pdb.facts.INode;
    16 import org.eclipse.imp.pdb.facts.ISet;
    17 import org.eclipse.imp.pdb.facts.ISourceLocation;
    1810import org.eclipse.imp.pdb.facts.IString;
    1911import org.eclipse.imp.pdb.facts.ITuple;
    … …  
    2517import org.eclipse.imp.pdb.facts.type.TypeStore;
    2618import org.eclipse.imp.pdb.facts.visitors.VisitorException;
    27 import org.magnolialang.eclipse.editor.Token;
    28 import org.magnolialang.eclipse.editor.TokenColorer;
    29 import org.magnolialang.load.ProjectURIResolver;
    3019import org.rascalmpl.values.ValueFactoryFactory;
    3120import org.rascalmpl.values.uptr.Factory;
    … …  
    4534        public static final Type Attr = tf.abstractDataType(uptr, "Attr");
    4635        public static final Type Attr_Abstract = tf.constructor(uptr, Attr, "selectable");
    47         private static final String AMB_MARKER = "magnolia_eclipse.ambiguityMarker";
    48         private IMessageHandler handler;
    4936       
    5037       
    … …  
    5340         */
    5441        public TreeImplodeVisitor() {
    55                 this.handler = null;
    56         }
    57        
    58         /**
    59          * Create a new tree imploder, attached to the file.
    60          * @param handler Message handler for reporting errors
    61          */
    62         public TreeImplodeVisitor(IMessageHandler handler) {
    63                 this.handler = handler;
    64         }
    65        
    66        
     42        }
     43       
     44
    6745        @Override
    6846        public IConstructor visitTreeAmb(IConstructor tree) throws VisitorException {

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/TreeImploder.java

    r448 r453  
    11package org.magnolialang.xatree;
    22
    3 import org.eclipse.core.resources.IFile;
    4 import org.eclipse.imp.parser.IMessageHandler;
    53import org.eclipse.imp.pdb.facts.IValue;
    64import org.eclipse.imp.pdb.facts.visitors.VisitorException;
    7 import org.magnolialang.eclipse.editor.ImplementationError;
     5import org.magnolialang.errors.ImplementationError;
    86
    97public class TreeImploder {
    … …  
    2119                }       
    2220        }
    23 
    24         /**
    25          * Implode an AsFix tree to an XaTree, annotating the given file with any errors encountered.
    26          * @param tree A tree in AsFix format
    27          * @param file A file, for marker annotations
    28          * @return An imploded XaTree
    29          */
    30         public static IValue implodeTree(IValue tree, IMessageHandler handler) {
    31                 try {
    32                         return tree.accept(new TreeImplodeVisitor(handler));
    33                 } catch (VisitorException e) {
    34                         throw new ImplementationError("Failed to implode parse tree", e);
    35                 }       
    36         }
    37 
    3821}

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/XaTreeAdapter.java

    r442 r453  
    1414import org.eclipse.imp.pdb.facts.visitors.NullVisitor;
    1515import org.eclipse.imp.pdb.facts.visitors.VisitorException;
    16 import org.magnolialang.eclipse.editor.ImplementationError;
     16import org.magnolialang.errors.ImplementationError;
    1717import org.rascalmpl.values.ValueFactoryFactory;
    1818
Note: See TracChangeset for help on using the changeset viewer.