Changeset 424

Timestamp:

Jun 12, 2010 11:26:38 PM (14 years ago)

Author:

Anya Helene Bagge

Message:

Update plugin to work with Rascal 0.1.26

Location:

trunk/MagnoliaPlugin

Files:

• META-INF/MANIFEST.MF (modified) (2 diffs)
• plugin.xml (modified) (1 diff)
• src/org/magnolialang/eclipse/MagnoliaPlugin.java (modified) (4 diffs)
• src/org/magnolialang/eclipse/editor/NodeLocator.java (modified) (2 diffs)
• src/org/magnolialang/eclipse/editor/ParseController.java (modified) (3 diffs)
• src/org/magnolialang/eclipse/rascal/ProjectModuleLoader.java (deleted)
• src/org/magnolialang/eclipse/rascal/RascalInterpreter.java (modified) (7 diffs)
• src/org/magnolialang/load/ModuleLoader.java (modified) (2 diffs)
• src/org/magnolialang/parsetree/TreeImplodeVisitor.java (modified) (1 diff)
• src/org/magnolialang/parsetree/XaTreeAdapter.java (modified) (1 diff)
• src/org/magnolialang/parsetree/XaTreeFactory.java (modified) (2 diffs)

trunk/MagnoliaPlugin/META-INF/MANIFEST.MF

@@ -3 +3 @@
 Bundle-Name: magnolia-eclipse
 Bundle-SymbolicName: magnolia_eclipse;singleton:=true
-Bundle-Version: 0.1.3.qualifier
+Bundle-Version: 0.1.4.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Activator: org.magnolialang.eclipse.MagnoliaPlugin
@@ -21 +21 @@
  org.eclipse.ui.ide,
  org.eclipse.ui.workbench.texteditor,
- rascal_eclipse;bundle-version="0.1.10",
- rascal;bundle-version="0.1.10",
+ rascal_eclipse;bundle-version="0.1.14",
+ rascal;bundle-version="0.1.16",
  sglr_invoker;bundle-version="0.1.3",
  org.eclipse.imp.smapifier,

trunk/MagnoliaPlugin/plugin.xml

@@ -189 +189 @@
       </page>
    </extension>
-   <!-- extension
-         point="org.eclipse.imp.runtime.modelTreeBuilder">
-      <treeBuilder
-            class="org.magnolialang.eclipse.treeModelBuilder.MagnoliaTreeModelBuilder"
-            language="Magnolia">
-      </treeBuilder>
-   </extension -->
-   <!-- extension
-         point="org.eclipse.imp.runtime.labelProvider">
-      <labelProvider
-            class="org.magnolialang.eclipse.treeModelBuilder.MagnoliaLabelProvider"
-            language="Magnolia">
-      </labelProvider>
-   </extension -->
 
 </plugin>

trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/MagnoliaPlugin.java

@@ -12 +12 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.rascalmpl.uri.URIResolverRegistry;
-
+import org.rascalmpl.uri.*;
 import sglr.LegacySGLRInvoker;
 import sglr.SGLRInvoker;
@@ -22 +21 @@
         public static final String kLanguageID = "Magnolia";
 
+        public URIResolverRegistry uriResolverRegistry;
         /**
          * The unique instance of this plugin class
@@ -77 +77 @@
                 System.setProperty("rascal.parsetable.cache.dir", System
                                 .getProperty("java.io.tmpdir"));
+                uriResolverRegistry = new URIResolverRegistry();
+
                 // project scheme
-                //ProjectURIResolver resolver = new ProjectURIResolver();
-                //URIResolverRegistry registry = URIResolverRegistry.getInstance();
-                //registry.registerInput(resolver.scheme(), resolver);
-                //registry.registerOutput(resolver.scheme(), resolver);
-
+                ProjectURIResolver resolver = new ProjectURIResolver();
+                uriResolverRegistry.registerInput(resolver.scheme(), resolver);
+                uriResolverRegistry.registerOutput(resolver.scheme(), resolver);
+                
+                FileURIResolver files = new FileURIResolver(); 
+                uriResolverRegistry.registerInput(files.scheme(), files);
+                uriResolverRegistry.registerOutput(files.scheme(), files);
+
+                HttpURIResolver http = new HttpURIResolver();
+                uriResolverRegistry.registerInput(http.scheme(), http);
+        
+                CWDURIResolver cwd = new CWDURIResolver();
+                uriResolverRegistry.registerInput(cwd.scheme(), cwd);
+                uriResolverRegistry.registerOutput(cwd.scheme(), cwd);
+                
+                ClassResourceInputStreamResolver library = new ClassResourceInputStreamResolver("stdlib", this.getClass());
+                uriResolverRegistry.registerInput(library.scheme(), library);
         }
 
@@ -88 +102 @@
                 super.start(context);
 
+        }
+        
+        public static URIResolverRegistry getResolverRegistry() {
+                return getInstance().uriResolverRegistry;
         }
 

trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/NodeLocator.java

@@ -66 +66 @@
 
         public int getLength(Object node) {
-                return getLocation(node).getLength();
+                return getLocation(node) == null ? 0 : getLocation(node).getLength();
         }
 
@@ -74 +74 @@
 
         public int getStartOffset(Object node) {
-                return getLocation(node).getOffset();
+                return getLocation(node) == null ? 0 : getLocation(node).getOffset();
         }
         

trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/ParseController.java

@@ -8 +8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.imp.language.Language;
+import org.eclipse.imp.language.LanguageRegistry;
 import org.eclipse.imp.model.ISourceProject;
 import org.eclipse.imp.parser.IMessageHandler;
@@ -36 +37 @@
         private IConstructor parseTree;
         private IPath path;
-        
+        public static final String LANGUAGE_NAME = "Magnolia";
+
+        public static final Language LANGUAGE = LanguageRegistry
+                        .findLanguage(LANGUAGE_NAME);
+
         public ParseController() {
+                super();
         }
         
@@ -53 +59 @@
 
         public Language getLanguage() {
-                return null;
+                return LANGUAGE;
         }
 

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

@@ -2 +2 @@
 package org.magnolialang.eclipse.rascal;
 
-import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.URI;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Map;
 
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.imp.pdb.facts.IConstructor;
 import org.eclipse.imp.pdb.facts.IValue;
 import org.magnolialang.eclipse.editor.ImplementationError;
-import org.rascalmpl.ast.ASTFactory;
-import org.rascalmpl.ast.Command;
-import org.rascalmpl.interpreter.CommandEvaluator;
-import org.rascalmpl.interpreter.Configuration;
+import org.rascalmpl.interpreter.Evaluator;
 import org.rascalmpl.interpreter.env.GlobalEnvironment;
 import org.rascalmpl.interpreter.env.ModuleEnvironment;
-import org.rascalmpl.interpreter.load.FromResourceLoader;
-import org.rascalmpl.interpreter.load.ISdfSearchPathContributor;
 import org.rascalmpl.interpreter.staticErrors.StaticError;
 import org.rascalmpl.interpreter.staticErrors.SyntaxError;
-import org.rascalmpl.parser.ASTBuilder;
 import org.rascalmpl.values.ValueFactoryFactory;
 
@@ -28 +20 @@
         
         //private final CommandEvaluator eval;
-        private final Map<String, CommandEvaluator> evals = new HashMap<String, CommandEvaluator>();
-        private ASTBuilder astBuilder;
+        private final Map<String, Evaluator> evals = new HashMap<String, Evaluator>();
 
         private static final class InstanceKeeper {
@@ -37 +28 @@
         public RascalInterpreter(){
                 super();
-
-                                this.astBuilder = new ASTBuilder(new ASTFactory());
-                
-
         }
 
-        public CommandEvaluator getEvaluator(String prelude) {
+        public Evaluator getEvaluator(String prelude) {
                 if(evals.containsKey(prelude))
                         return evals.get(prelude);
@@ -52 +39 @@
                 PrintWriter stdout = new PrintWriter(System.out);
 
-                CommandEvaluator eval = new CommandEvaluator(ValueFactoryFactory.getValueFactory(), stderr, stdout,  root, heap);
+                Evaluator eval = new Evaluator(ValueFactoryFactory.getValueFactory(), stderr, stdout,  root, heap);
 
-                // everything rooted at the src directory 
+                eval.addRascalSearchPath(ResourcesPlugin.getWorkspace().getRoot().getProject("MetaXa").getFolder("src").getLocationURI());
+                // everything rooted at the src directory
+                /*
                 eval.addModuleLoader(new FromResourceLoader(this.getClass()));
                 eval.addModuleLoader(new ProjectModuleLoader(ResourcesPlugin.getWorkspace().getRoot().getProject("MetaXa")));
@@ -65 +54 @@
                         }
                 });
-                
+                */
                 if(!prelude.equals("")) {
                         String[] cmds = prelude.split(";");
@@ -92 +81 @@
         }
         
-        public IValue call(String fun, CommandEvaluator eval, IValue...args) {
+        public IValue call(String fun, Evaluator eval, IValue...args) {
                 try {
                         return eval.call(fun, args);
@@ -101 +90 @@
         }
 
-        public IValue eval(String cmd, CommandEvaluator eval) {
+        public IValue eval(String cmd, Evaluator eval) {
                 try {
-                        IConstructor parsedCmd = eval.parseCommand(cmd);
-                        Command cmdAst = astBuilder.buildCommand(parsedCmd);
-                        return eval.eval(cmdAst).getValue();
-                } catch (IOException e) {
-                        throw new ImplementationError("static checker failed to execute command: '" + cmd + "'", e);
+                        return eval.eval(cmd, URI.create("stdin:///")).getValue();
                 } catch (SyntaxError se) {
                         throw new ImplementationError("syntax error in static checker modules: '" + cmd + "'", se);

trunk/MagnoliaPlugin/src/org/magnolialang/load/ModuleLoader.java

@@ -9 +9 @@
 import org.eclipse.imp.model.ISourceProject;
 
+import org.magnolialang.eclipse.MagnoliaPlugin;
 import org.magnolialang.eclipse.editor.ImplementationError;
 import org.magnolialang.env.MagnoliaEnvironment;
@@ -105 +106 @@
                 InputStream inputStream = null;
                 try{
-                        inputStream = URIResolverRegistry.getInstance().getInputStream(location);
+                        inputStream = MagnoliaPlugin.getResolverRegistry().getInputStream(location);
                         data = readModule(inputStream);
                 }finally{

trunk/MagnoliaPlugin/src/org/magnolialang/parsetree/TreeImplodeVisitor.java

@@ -153 +153 @@
                                 String chars = TreeAdapter.yield(tree);
                                 if(!chars.equals(""))
-                                        cst.append(layout(chars));
+                                        cst.append(space(chars));
                         }
                         else if(TreeAdapter.isLiteral(tree)) {

trunk/MagnoliaPlugin/src/org/magnolialang/parsetree/XaTreeAdapter.java

@@ -212 +212 @@
                                         for(IValue token : concrete) {
                                                 Type type = ((IConstructor)token).getConstructorType();
-                                                if(type == Type_Token || type == Type_Layout || type == Type_Comment) {
+                                                if(type == Type_Token || type == Type_Space || type == Type_Comment) {
                                                         result.append(((IConstructor)token).get("chars"));
                                                 }

trunk/MagnoliaPlugin/src/org/magnolialang/parsetree/XaTreeFactory.java

@@ -49 +49 @@
         public static Type Type_Token = tf.constructor(ts, Type_XaToken, "token", 
                         tf.stringType(), "chars");
-        public static Type Type_Layout = tf.constructor(ts, Type_XaToken, "layout", 
+        public static Type Type_Space = tf.constructor(ts, Type_XaToken, "space", 
                         tf.stringType(), "chars");
         public static Type Type_Comment = tf.constructor(ts, Type_XaToken, "comment", 
@@ -93 +93 @@
         }
 
-        public static IConstructor layout(String chars) {
-                return vf.constructor(Type_Layout, vf.string(chars));
+        public static IConstructor space(String chars) {
+                return vf.constructor(Type_Space, vf.string(chars));
         }