Changeset 417

Timestamp:

Jun 7, 2010 1:51:28 PM (14 years ago)

Author:

Anya Helene Bagge

Message:

mer pattern matching

Location:

trunk/MagnoliaPlugin/src/org/magnolialang

Files:

• eclipse/commands/SelectConstruct.java (modified) (3 diffs)
• parsetree/XaTreeAdapter.java (modified) (5 diffs)

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

@@ -9 +9 @@
 import org.eclipse.imp.editor.UniversalEditor;
 import org.eclipse.imp.pdb.facts.IConstructor;
+import org.eclipse.imp.pdb.facts.IMap;
 import org.eclipse.imp.pdb.facts.ISourceLocation;
 import org.eclipse.imp.pdb.facts.IString;
@@ -23 +24 @@
 import org.magnolialang.parsetree.TreeImplodeVisitor;
 import org.magnolialang.parsetree.TreeImploder;
+import org.magnolialang.parsetree.XaTreeAdapter;
 import org.magnolialang.parsetree.XaTreeFactory;
+import org.rascalmpl.values.ValueFactoryFactory;
 import org.rascalmpl.values.uptr.TreeAdapter;
 
@@ -57 +60 @@
         
                                 
-                                System.out.println(imploded.toString().substring(0, 200));
-                                System.out.println(imploded2.toString().substring(0, 200));
+                                System.out.println(imploded.toString().substring(0, Math.min(200,imploded.toString().length())));
+                                System.out.println(imploded2.toString().substring(0, Math.min(200,imploded2.toString().length())));
                                 System.out.println("Imploded equality: " + imploded.isEqual(imploded2));
                                 System.out.println("Imploded Java equality: " + imploded.equals(imploded2));
                                 System.out.println("Imploded term equality: " + imploded.toString().equals(imploded2.toString()));
+                                
+                                IMap m = XaTreeAdapter.match(imploded, imploded2);
+                                IValue pattern = XaTreeFactory.cons("Apply", "Expr", ValueFactoryFactory.getValueFactory().list(XaTreeFactory.termvar("f", "Fun"), XaTreeFactory.termvar("as", "Expr")));
+                                m = XaTreeAdapter.match(pattern, imploded);
                                 //String up1 = ((IString)RascalInterpreter.getInstance().call("unparse", "import XaTree;", imploded)).getValue();
                                 //String up2 = ((IString)RascalInterpreter.getInstance().call("unparse", "import XaTree;", imploded2)).getValue();

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

@@ -5 +5 @@
 import org.eclipse.imp.pdb.facts.type.TypeFactory;
 import org.eclipse.imp.pdb.facts.type.TypeStore;
+import org.eclipse.imp.pdb.facts.visitors.BottomUpVisitor;
+import org.eclipse.imp.pdb.facts.visitors.IValueVisitor;
+import org.eclipse.imp.pdb.facts.visitors.IdentityVisitor;
+import org.eclipse.imp.pdb.facts.visitors.NullVisitor;
+import org.eclipse.imp.pdb.facts.visitors.VisitorException;
+import org.magnolialang.eclipse.editor.ImplementationError;
 import org.rascalmpl.values.ValueFactoryFactory;
+import org.rascalmpl.values.uptr.visitors.TreeVisitor;
+
 import static org.magnolialang.parsetree.XaTreeFactory.*;
 public class XaTreeAdapter {
@@ -15 +23 @@
         private static IValueFactory vf = ValueFactoryFactory.getValueFactory();
 
+        public static IMap match(IValue pattern, IValue tree) {
+                if(pattern instanceof IConstructor && tree instanceof IConstructor)
+                        return match((IConstructor)pattern, (IConstructor)tree, vf.map(Type_XaTree, Type_XaTree));
+                else
+                        return null;
+        }
+
         public static IMap match(IConstructor pattern, IConstructor tree) {
                 return match(pattern, tree, vf.map(Type_XaTree, Type_XaTree));
         }
         public static IMap match(IConstructor pattern, IConstructor tree, IMap env) {
-                if(env == null)
+                if(env == null || pattern == null || tree == null)
                         return null;
+                else if(pattern == tree)
+                        return env;
                 else if(isCons(pattern))
                         return matchCons(pattern, tree, env);
@@ -43 +60 @@
 
                 IList pargs = (IList) pattern.get("args");
-                IList targs = (IList) pattern.get("args");
+                IList targs = (IList) tree.get("args");
                 if(pargs.length() != targs.length())
                         return null;
@@ -58 +75 @@
 
                 IList pargs = (IList) pattern.get("args");
-                IList targs = (IList) pattern.get("args");
+                IList targs = (IList) tree.get("args");
                 if(pargs.length() != targs.length())
                         return null;
@@ -88 +105 @@
                 && ((IConstructor)tree).getConstructorType() == Type_TermVar;
         }
+        
+        public static boolean isGround(IValue tree) {
+                try {
+                        return tree.accept(new NullVisitor<Boolean>() {
+                                public Boolean visitConstructor(IConstructor c) {
+                                        if(isLeaf(c))
+                                                return true;
+                                        else if(isVar(c))
+                                                return false;
+                                        for(IValue child : (IList) c.get("args"))
+                                                if(!isGround(child))
+                                                        return false;
+                                        return true;
+                                }});
+                } catch (VisitorException e) {
+                        return false;
+                }
+        }
 
+        public static IList vars(IValue tree) {
+                
+                final IListWriter lw = vf.listWriter(Type_XaTree);
+                
+                try {
+                        tree.accept(new IdentityVisitor() {
+                                public IValue visitConstructor(IConstructor c) throws VisitorException {
+                                        if(isVar(c))
+                                                lw.append(c);
+                                        else if(isCons(c) || isSeq(c))
+                                                for(IValue child : (IList) c.get("args"))
+                                                        child.accept(this);
+                                        return c;
+                                }});
+                } catch (VisitorException e) {
+                        throw new ImplementationError("Visitor error", e);
+                }
 
+                return lw.done();
+        }
 }