Changeset 440

Timestamp:

Jun 21, 2010 12:11:57 PM (14 years ago)

Author:

Anya Helene Bagge

Message:

• Handle newlines separately from other spaces

File:

• trunk/MagnoliaPlugin/src/org/magnolialang/xatree/TreeImplodeVisitor.java (modified) (4 diffs)

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

@@ -88 +88 @@
                         cons = cons != null ? cons : sort;
                         result = (IConstructor) ((IList) t.get(0)).get(0);
-                        concrete = ((IList) result.getAnnotation("concrete")).insert(concrete.get(0)).append(concrete.get(2));
+                        IListWriter cst = vf.listWriter(Type_XaToken);
+                        for(IValue tok : concrete) {
+                                System.out.println(tok);
+                                if(((IConstructor)tok).getConstructorType() == Type_Child)
+                                        cst.appendAll((IList)result.getAnnotation("concrete"));
+                                else
+                                        cst.append(tok);
+                        }
+                        concrete = cst.done();
+                        //concrete = ((IList) result.getAnnotation("concrete")).insert(concrete.get(0)).append(concrete.get(2));
                 }
                 else if(SymbolAdapter.isCf(rhs)) {
@@ -147 +156 @@
 
         private final Pattern LAYOUT_PAT = Pattern.compile("^(\\s*)(\\S.*\\S)(\\s*)$", Pattern.DOTALL);
-        
+
         public ITuple visitChildren(Iterable<IValue> trees) throws FactTypeUseException, VisitorException {
                 IListWriter ast = vf.listWriter(Type_XaTree);
@@ -161 +170 @@
                                         Matcher m = LAYOUT_PAT.matcher(chars);
                                         if(m.matches()) {
-                                                cst.append(space(m.group(1)));
+                                                splitSpaces(m.group(1), cst);
                                                 cst.append(comment(m.group(2)));
-                                                cst.append(space(m.group(3)));
+                                                splitSpaces(m.group(3), cst);
                                         }
                                         else
-                                                cst.append(space(chars));
+                                                splitSpaces(chars, cst);
                                 }
                         }
@@ -182 +191 @@
                 return vf.tuple(ast.done(), cst.done());
         }
+        
+        private final Pattern PAT_SPACE = Pattern.compile("^([^\r\n]*)([\r\n]+)(.*)$", Pattern.DOTALL);
+        
+        private void splitSpaces(String chars, IListWriter cst) {
+                Matcher m = PAT_SPACE.matcher(chars);
+                while(m.matches()) {
+                        if(m.group(1).length() > 0)
+                                cst.append(space(m.group(1)));
+                        cst.append(space(m.group(2)));
+                        chars = m.group(3);
+                        m = PAT_SPACE.matcher(chars);
+                }
+                
+                if(chars.length() > 0)
+                        cst.append(space(chars));
+        }
         @Override
         public IConstructor visitTreeChar(IConstructor tree)