Changeset 426

Timestamp:

Jun 13, 2010 7:08:56 PM (14 years ago)

Author:

Anya Helene Bagge

Message:

• Implement proper build path
• Subclass Rascal's URI resolvers with some improvements

Location:

trunk/MagnoliaPlugin

Files:

• lang/Magnolia.tbl (modified) ( previous)
• src/org/magnolialang/eclipse/MagnoliaPlugin.java (modified) (1 diff)
• src/org/magnolialang/load/IBuildPath.java (added)
• src/org/magnolialang/load/MagnoliaBuildPath.java (added)
• src/org/magnolialang/load/ModuleLoader.java (modified) (4 diffs)
• src/org/magnolialang/load/ProjectURIResolver.java (modified) (3 diffs)
• src/org/magnolialang/parsetree/XaTreeAdapter.java (modified) (1 diff)
• src/org/magnolialang/uri (added)
• src/org/magnolialang/uri/CWDURIResolver.java (added)
• src/org/magnolialang/uri/ClassResourceInputStreamResolver.java (added)
• src/org/magnolialang/uri/FileURIResolver.java (added)
• src/org/magnolialang/uri/HttpURIResolver.java (added)
• src/org/magnolialang/uri/IURIInputStreamResolver.java (added)
• src/org/magnolialang/uri/IURIOutputStreamResolver.java (added)
• src/org/magnolialang/uri/StandardInputURIResolver.java (added)
• src/org/magnolialang/uri/StandardOutputURIResolver.java (added)
• src/org/magnolialang/uri/URIResolverRegistry.java (added)

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

@@ -10 +10 @@
 import org.eclipse.imp.runtime.PluginBase;
 import org.magnolialang.load.ProjectURIResolver;
+import org.magnolialang.uri.*;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.rascalmpl.uri.*;
+import org.magnolialang.uri.*;
 import sglr.LegacySGLRInvoker;
 import sglr.SGLRInvoker;

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

@@ -13 +13 @@
 import org.magnolialang.env.MagnoliaEnvironment;
 import org.magnolialang.parsetree.TreeImploder;
+import org.magnolialang.uri.URIResolverRegistry;
+
 import static org.magnolialang.parsetree.XaTreeAdapter.*;
 import org.rascalmpl.interpreter.staticErrors.SyntaxError;
-import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.values.ValueFactoryFactory;
 import org.rascalmpl.values.errors.SubjectAdapter;
@@ -36 +37 @@
         private final boolean saveParsedModules = (System.getProperty("rascal.options.saveBinaries") != null ? System.getProperty("rascal.options.saveBinaries").equals("true") : false);
         private ISourceProject project;
+        private MagnoliaBuildPath buildPath;
         
         public ModuleLoader(){
@@ -48 +50 @@
                 this.parser = parser;
                 this.project = project;
+                this.buildPath = new MagnoliaBuildPath(null);
+                if(project != null)
+                        this.buildPath.addPath(ProjectURIResolver.constructProjectURI(project, new Path("")));
         }
 
@@ -138 +143 @@
                                                         if(isCons(imp, "ImportAll", 1)) {
                                                                 String name = yield(getArg(imp, 0));
-                                                                URI uri = ProjectURIResolver.constructProjectURI(project, new Path(name).addFileExtension("mg"));
+                                                                URI uri = buildPath.find(name);
                                                                 loadModule(uri, env);
-                                                                System.out.println("import " + name);
+                                                                System.out.println("import " + uri);
                                                         }
                                                 }

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

@@ -16 +16 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.imp.model.ISourceProject;
 import org.magnolialang.eclipse.MagnoliaPlugin;
+import org.magnolialang.uri.IURIInputStreamResolver;
+import org.magnolialang.uri.IURIOutputStreamResolver;
 import org.rascalmpl.uri.BadURIException;
-import org.rascalmpl.uri.IURIInputStreamResolver;
-import org.rascalmpl.uri.IURIOutputStreamResolver;
 
 public class ProjectURIResolver implements IURIInputStreamResolver, IURIOutputStreamResolver {
@@ -27 +28 @@
                 try{
                         // making sure that spaces in 'path' are properly escaped
-                        return new URI("project://"+project.getName()+"/"+URLEncoder.encode(path.toOSString(),"UTF8"));
+                        return new URI("project", project.getName(), path.makeAbsolute().toString(), null);
                 }catch(URISyntaxException usex){
                         throw new BadURIException(usex);
-                } catch (UnsupportedEncodingException e) {
-                        MagnoliaPlugin.getInstance().logException(e.getMessage(), e);
-                        return null;
                 }
+        //      } catch (UnsupportedEncodingException e) {
+        //              MagnoliaPlugin.getInstance().logException(e.getMessage(), e);
+        //              return null;
+        //      }
         }
 
@@ -78 +80 @@
         }
 
+        @Override
+        public long lastModified(URI uri) {
+                try {
+                        return resolve(uri).getLocalTimeStamp();
+                } catch (MalformedURLException e) {
+                        return 0;
+                } catch (IOException e) {
+                        return 0;
+                }
+        }
+
 }

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

@@ -213 +213 @@
                                                 Type type = ((IConstructor)token).getConstructorType();
                                                 if(type == Type_Token || type == Type_Space || type == Type_Comment) {
-                                                        result.append(((IConstructor)token).get("chars"));
+                                                        result.append(((IString)((IConstructor)token).get("chars")).getValue());
                                                 }
                                                 else {