Changeset 420

Timestamp:

Jun 11, 2010 9:40:39 AM (14 years ago)

Author:

Anya Helene Bagge

Message:

• Reduce dependency on concrete syntax
• Interface with Java module loader

Location:

MetaXa/src

Files:

• MagnoliaCompile.rsc (modified) (5 diffs)
• XaTree.rsc (modified) (2 diffs)
• gen-tbl (modified) (1 diff)

MetaXa/src/MagnoliaCompile.rsc

@@ -1 +1 @@
 module MagnoliaCompile
-import MagnoliaFront;
-import Magnolia;
 import String;
 import IO;
@@ -8 +6 @@
 import XaLib;
 import XaTree;
-import MagnoliaCxxBack;
 
 data MagnoliaEnv = environ(rel[Name, XaTree] members);
@@ -35 +32 @@
 }
 
-public Tree compileMagnolia(loc file) {
-        Tree parsed = parseMagnolia(file);
-        //Tree desugared = desugarMagnolia(parsed);
-
-        decls = loadTree(parsed, file);
-        return flattenConcepts(parsed, decls);
-}
-public str flattenModule(loc path, str project) {
-        <tree, ctx> = loadFile(path, project);
-        path.path = replaceLast(path.path, "\\.mg", "-flattened.mg");
+//public Tree compileMagnolia(loc file) {
+//      Tree parsed = parseMagnolia(file);
+//      //Tree desugared = desugarMagnolia(parsed);
+//
+//      decls = loadTree(parsed, file);
+//      return flattenConcepts(parsed, decls);
+//}
+//public str flattenModule(loc path, str project) {
+//      <tree, ctx> = loadFile(path, project);
+//      return unparse(reindent(flattenConcepts(tree, ctx)));
+//}
+public str flattenModule(XaTree tree, MagnoliaEnv ctx) {
         return unparse(reindent(flattenConcepts(tree, ctx)));
 }
-
-public void flattenModule(str moduleName, str project) {
-        path = findInPath("<moduleName>.mg", project);
-        <tree, ctx> = loadFile(path);
-        path.path = replaceLast(path.path, "\\.mg", "-flattened.mg");
-        println("Writing flattened module to <path>");
-        writeFile(path, unparse(reindent(flattenConcepts(tree, ctx))));
-}
-
-public void flattenModuleToCxx(str moduleName, str project) {
-        path = findInPath("<moduleName>.mg", project);
-        <tree, ctx> = loadFile(path, project);
-        path.path = replaceLast(path.path, "\\.mg", ".cc");
-        println("Writing flattened module to <path>");
-        writeFile(path, unparse(reindent(cxxFormat(flattenConcepts(tree, ctx)))));
-}
-
-public tuple[XaTree, MagnoliaEnv] loadModule(str moduleName, str project) {
-        path = findInPath("<moduleName>.mg", project);
-        println("Loading module <moduleName> from <path>");
-        return loadFile(path, project);
-}
-
-public tuple[XaTree, MagnoliaEnv] loadFile(loc moduleLoc, str project) {
+//public void flattenModule(str moduleName, str project) {
+//      path = findInPath("<moduleName>.mg", project);
+//      <tree, ctx> = loadFile(path);
+//      path.path = replaceLast(path.path, "\\.mg", "-flattened.mg");
+//      println("Writing flattened module to <path>");
+//      writeFile(path, unparse(reindent(flattenConcepts(tree, ctx))));
+//}
+
+//public void flattenModuleToCxx(str moduleName, str project) {
+//      path = findInPath("<moduleName>.mg", project);
+//      <tree, ctx> = loadFile(path, project);
+//      path.path = replaceLast(path.path, "\\.mg", ".cc");
+//      println("Writing flattened module to <path>");
+//      writeFile(path, unparse(reindent(cxxFormat(flattenConcepts(tree, ctx)))));
+//}
+
+//public tuple[XaTree, MagnoliaEnv] loadModule(str moduleName, str project) {
+//      path = findInPath("<moduleName>.mg", project);
+//      println("Loading module <moduleName> from <path>");
+//      return loadFile(path, project);
+//}
+
+//public tuple[XaTree, MagnoliaEnv] loadFile(loc moduleLoc, str project) {
+//      result = newEnv();
+//      XaTree tree = parseMagnolia(moduleLoc);
+//      if(cons("MagnoliaTree", [cons("ModuleHead", [NAME, seq(CLAUSES,_)], _), seq(DECLS,_)], _) := tree) {
+//              for(clause <- CLAUSES) {
+//                      switch(clause) {
+//                              case cons("Imports", [seq(MODULES, _)], _):
+//                                      for(cons("ImportAll", [m], _) <- MODULES) {
+//                                              result = joinEnv(result, loadModule(unparse(m), project)[1]);
+//                                      }
+//                      }
+//              }
+//              for(decl <- DECLS) {
+//                      // println(decl);
+//                      switch(decl) {
+//                              case cons("DefDecl", [cons("ConceptClause", [CONCEPT], _), _, cons(_, [seq(CONTENTS,_)], _)], _): {
+//                                      result.members += {name(unparse(CONCEPT))} * toSet(CONTENTS);
+//                              }
+//                      }
+//              }
+//      }
+//      return <tree, result>;
+//}
+
+public MagnoliaEnv loadTrees(list[XaTree] trees) {
         result = newEnv();
-        XaTree tree = parseMagnolia(moduleLoc);
+        for(tree <- trees)
+                result = loadTree(tree, result);
+        return result;
+}
+
+public MagnoliaEnv loadTree(XaTree tree, MagnoliaEnv result) {
         if(cons("MagnoliaTree", [cons("ModuleHead", [NAME, seq(CLAUSES,_)], _), seq(DECLS,_)], _) := tree) {
-                for(clause <- CLAUSES) {
-                        switch(clause) {
-                                case cons("Imports", [seq(MODULES, _)], _):
-                                        for(cons("ImportAll", [m], _) <- MODULES) {
-                                                result = joinEnv(result, loadModule(unparse(m), project)[1]);
-                                        }
-                        }
-                }
                 for(decl <- DECLS) {
                         // println(decl);
                         switch(decl) {
                                 case cons("DefDecl", [cons("ConceptClause", [CONCEPT], _), _, cons(_, [seq(CONTENTS,_)], _)], _): {
+                                        println(name(unparse(CONCEPT)));
                                         result.members += {name(unparse(CONCEPT))} * toSet(CONTENTS);
                                 }
@@ -91 +111 @@
                 }
         }
-        return <tree, result>;
+        return result;
 }
 
 public XaTree flattenConcepts(XaTree tree, MagnoliaEnv env) {
         return top-down-break visit(tree) {
-                case cDecl : cons("DefDecl", [cons("ConceptClause", [CONCEPT], ccsort), seq(SUBCLAUSES,scsort), cons("DeclBody", [seq(CONTENTS,_)], _)], _) : {
-                        //      println("Looking at <unparse(CONCEPT)>: ");
+                case cDecl : cons("DefDecl", [cons("ConceptClause", [CONCEPT], _), seq(SUBCLAUSES,_), cons("DeclBody", [seq(CONTENTS,_)], _)], _) : {
+                        println("Looking at <unparse(CONCEPT)>: ");
                         set[XaTree] decls = {};
                         for(decl <- CONTENTS) {
-                                //      println("  Decl: ", decl);
+                                println("  Decl: ", decl);
                                 switch(decl) {
                                         case cons("Requires", [seq(reqs, _)], _):
                                                 for(req  <- reqs) {
-                                                        // println("  <unparse(CONCEPT)> requires <unparse(req)>:");
+                                                        println("  <unparse(CONCEPT)> requires <unparse(req)>:");
                                                         <ds, env> = getConcept(req, env);
                                                         decls += ds;
@@ -140 +160 @@
                         insert decl;
                 }
-                case cDecl: cons(c,as,"Decl") => cDecl
+                //case cDecl: cons(c,as,"Decl") => cDecl
         }
 }

MetaXa/src/XaTree.rsc

@@ -31 +31 @@
         implodeOptions(bool foldInjections, bool addConcrete, bool addLocation, list[str] varConses);
 
-XaImplodeOpts defaultOpts = implodeOptions(true, true, false, ["RascalVar", "RascalListVar"]);
+XaImplodeOpts defaultOpts = implodeOptions(true, false, false, ["RascalVar", "RascalListVar"]);
 
 public XaTree implodeTree(Tree t) { return implodeTree(t, defaultOpts); }
@@ -138 +138 @@
                                 case cf(opt(layout())): {
                                         l = unparse(ts[i]);
-                                        if(/^<before:\s*><com:\S(.|\r|\n)*\S><after:\s*>$/ := l) {
+                                        if(false && /^<before:\s*><com:\S(.|\r|\n)*\S><after:\s*>$/ := l) {
                                                 if(before != "")
                                                         cstArgs += layout(before);

MetaXa/src/gen-tbl

@@ -1 @@
-LD_LIBRARY_PATH=/home/anya/eclipse/plugins/rascal_fragment_linux_0.1.5/installed/lib/ /home/anya/eclipse/plugins/rascal_fragment_linux_0.1.5/installed/bin/sdf2table -c -m Magnolia -o Magnolia.tbl
+if [ -d /home/anya/eclipse/ ]; then
+        ECLIPSE=/home/anya/eclipse
+elif [ -d /usr/local/eclipse/ ]; then
+        ECLIPSE=/usr/local/eclipse
+fi
+
+LD_LIBRARY_PATH=$ECLIPSE/plugins/rascal_fragment_linux_0.1.5/installed/lib/ $ECLIPSE/plugins/rascal_fragment_linux_0.1.5/installed/bin/sdf2table -c -m Magnolia -o Magnolia.tbl
+