Changeset 818

Timestamp:

Aug 2, 2012 7:35:31 PM (12 years ago)

Author:

Anya Helene Bagge

Message:

Fix Magne's weird parenthesis-around-name problem (closes #119)

Location:

branches/magnolia-eclipse-0.2.27/src/org/magnolialang

Files:

• magnolia/frontend/MagnoliaSugar.rsc (modified) (1 diff)
• magnolia/lib/Pretty.rsc (modified) (1 diff)
• syntax/Magnolia.rsc (modified) (1 diff)
• syntax/MagnoliaAST.rsc (modified) (1 diff)
• syntax/MagnoliaInfo.pbf (modified) ( previous)
• syntax/MagnoliaPP.rsc (modified) (2 diffs)
• terms/TermImploder.java (modified) (2 diffs)

branches/magnolia-eclipse-0.2.27/src/org/magnolialang/magnolia/frontend/MagnoliaSugar.rsc

@@ -63 +63 @@
                         case x:Assert(expr,seq(clauses)) =>
                                 preserveAnnos(Assert(expr,seq([*clauses, Src(leaf(unparse(expr)))])), x)
-                        case x:TopParen(expr) => expr
+                        /* This doesn't work, because expr won't be reprocessed 
+                          case x:TopParen(expr) => expr
+                        */
                 };
                 setFact(tr, #DesugaredTree, modName, DesugaredTree(tree));

branches/magnolia-eclipse-0.2.27/src/org/magnolialang/magnolia/lib/Pretty.rsc

@@ -680 +680 @@
 }
 
-Tseq pp(TopParen(arg0), Tseq stream) {
+/*Tseq pp(TopParen(arg0), Tseq stream) {
   return ast2stream(stream, pp, LParen, arg0, RParen);
 }
-
+*/
 Tseq pp(TopPreOp(arg0, arg1), Tseq stream) {
   return ast2stream(stream, pp, arg0, arg1);

branches/magnolia-eclipse-0.2.27/src/org/magnolialang/syntax/Magnolia.rsc

@@ -42 +42 @@
         | AlgDecl
         | RenameList:           "[" {Renaming ","}* "]"
-        | bracket TopParen:             "(" TopExpr ")"
+        | bracket               "(" TopExpr ")"
         > Renamed:              TopExpr "[" {Renaming ","}* "]"
         > TopPreOp:             TOPPREOP TopExpr

branches/magnolia-eclipse-0.2.27/src/org/magnolialang/syntax/MagnoliaAST.rsc

@@ -151 +151 @@
 data AST = TopBinOp(AST arg0, AST arg1, AST arg2); // sort("TopExpr")
 data AST = TopExprTree(AST arg0); // sort("Program")
-data AST = TopParen(AST arg0); // sort("TopExpr")
 data AST = TopPreOp(AST arg0, AST arg1); // sort("TopExpr")
 data AST = Tuple(AST arg0); // sort("Expr")

branches/magnolia-eclipse-0.2.27/src/org/magnolialang/syntax/MagnoliaPP.rsc

@@ -2 +2 @@
 module org::magnolialang::syntax::MagnoliaPP
 import org::magnolialang::pgf::Token;
+import org::magnolialang::pgf::Stream;
 import org::magnolialang::pgf::AstToStream;
 import org::magnolialang::syntax::MagnoliaAST;
-
-public default Tseq pp(AST ast, Tseq stream) {
+public default Stream[Token] pp(AST ast, Stream[Token] stream) {
   return stream;
 }
-
 public Tseq pp(Abstract(), Tseq stream) {
   return ast2stream(stream, pp, Text("abstract"));
@@ -577 +576 @@
 }
 
-public Tseq pp(TopParen(arg0), Tseq stream) {
-  return ast2stream(stream, pp, Text("("), Space(" "), arg0, Space(" "), Text(")"));
-}
-
 public Tseq pp(TopPreOp(arg0, arg1), Tseq stream) {
   return ast2stream(stream, pp, arg0, Space(" "), arg1);

branches/magnolia-eclipse-0.2.27/src/org/magnolialang/terms/TermImploder.java

@@ -113 +113 @@
                                         return check(implode((IConstructor) TreeAdapter.getArgs(tree).get(0)));
                         }
+                        else if(ProductionAdapter.hasAttribute(prod, Factory.Attribute_Bracket) && syms != null && syms.length() == 5) {
+                                IConstructor t = (IConstructor) TreeAdapter.getArgs(tree).get(2);
+                                return check(implode(t));
+                        }
                         else if(SymbolAdapter.isStartSort(ProductionAdapter.getDefined(prod))) {
                                 // IConstructor prod = TreeAdapter.getProduction(pt);
@@ -145 +149 @@
                         }
                         else {
-                                if(ProductionAdapter.isRegular(tree))
+/*                              if(ProductionAdapter.isRegular(tree))
                                         System.out.println("Regular");
-                                final Pair<IValue[], IList> t = visitChildren(TreeAdapter.getArgs(tree));
+*/                              final Pair<IValue[], IList> t = visitChildren(TreeAdapter.getArgs(tree));
                                 concrete = t.second;
                                 result = cons(cons == null ? sort : cons, t.first);