Changeset 423

Timestamp:

Jun 12, 2010 11:26:01 PM (14 years ago)

Author:

Anya Helene Bagge

Message:

More fixes for Rascal 0.1.26

Location:

MetaXa/src

Files:

• XaLib.rsc (modified) (7 diffs)
• XaTree.rsc (modified) (4 diffs)

MetaXa/src/XaLib.rsc

@@ -43 +43 @@
                                         return t.args[i];
                         }
-                        else if(cf(iter(sort(_))) := t.prod.lhs[i]) {
+                        else if(\cf(iter(sort(_))) := t.prod.lhs[i]) {
                                 return t.args[i].args;
                         }
@@ -60 +60 @@
         if(isCF(t))
             for(i <- domain(t.args))
-                        if(cf(iter(sort(_))) := t.prod.lhs[i]) {
+                        if(\cf(iter(sort(_))) := t.prod.lhs[i]) {
                                 return t.args[i].args;
                         }
@@ -68 +68 @@
 
 public bool isCF(Tree t) {
-        return (cf(sort(_)) := t.prod.rhs || cf(\parameterized-sort(_,_)) := t.prod.rhs) ? false;
+        return (\cf(sort(_)) := t.prod.rhs || \cf(\parameterized-sort(_,_)) := t.prod.rhs) ? false;
 }
 
 public bool isCF(Symbol s) {
-        return (cf(sort(_)) := s|| cf(\parameterized-sort(_,_)) := s) ? false;
+        return (\cf(sort(_)) := s|| \cf(\parameterized-sort(_,_)) := s) ? false;
 }
 
@@ -80 +80 @@
 public list[Tree] asList(Tree t) {
         assert notAmb(t);
-        if(cf(\iter-star-sep(sort(srt),lit(sep))) := t.prod.rhs)
-                return [x | x <- t.args, cf(sort(srt)) := x.prod.rhs];
-        else if(cf(\iter-star(sort(srt),lit(sep))) := t.prod.rhs)
-                return [x | x <- t.args, cf(sort(srt)) := x.prod.rhs];
-        else if(cf(\iter-sep(sort(srt),lit(sep))) := t.prod.rhs)
-                return [x | x <- t.args, cf(sort(srt)) := x.prod.rhs];
-        else if(cf(\iter(sort(srt),lit(sep))) := t.prod.rhs)
-                return [x | x <- t.args, cf(sort(srt)) := x.prod.rhs];
-        else if(\list(cf(\iter(sort(srt)))) := t.prod)
-                return [x | x <- t.args, cf(sort(srt)) := x.prod.rhs];
-        else if(\list(cf(\iter-star(sort(srt)))) := t.prod)
-                return [x | x <- t.args, cf(sort(srt)) := x.prod.rhs];
+        if(\cf(\iter-star-sep(sort(srt),lit(sep))) := t.prod.rhs)
+                return [x | x <- t.args, \cf(sort(srt)) := x.prod.rhs];
+        else if(\cf(\iter-star(sort(srt),lit(sep))) := t.prod.rhs)
+                return [x | x <- t.args, \cf(sort(srt)) := x.prod.rhs];
+        else if(\cf(\iter-sep(sort(srt),lit(sep))) := t.prod.rhs)
+                return [x | x <- t.args, \cf(sort(srt)) := x.prod.rhs];
+        else if(\cf(\iter(sort(srt),lit(sep))) := t.prod.rhs)
+                return [x | x <- t.args, \cf(sort(srt)) := x.prod.rhs];
+        else if(\list(\cf(\iter(sort(srt)))) := t.prod)
+                return [x | x <- t.args, \cf(sort(srt)) := x.prod.rhs];
+        else if(\list(\cf(\iter-star(sort(srt)))) := t.prod)
+                return [x | x <- t.args, \cf(sort(srt)) := x.prod.rhs];
         throw IllegalTreeFormat("List node not found", t);
 }
@@ -127 +127 @@
         assert notAmb(t);
         for(i <- [0 .. size(t.prod.lhs)])
-                if(cf(opt(\layout())) := t.prod.lhs[i])
+                if(\cf(opt(\layout())) := t.prod.lhs[i])
                         ;
-                else if(cf(_) := t.prod.lhs[i]) {
+                else if(\cf(_) := t.prod.lhs[i]) {
                         if(n == 0)
                                 return t.args[i];
@@ -188 +188 @@
 public str sortOfList(Symbol sym) {
         switch(sym) {
-                case cf(\iter-star-sep(s, _)):
-                        return sortName(s);
-                case cf(\iter-sep(s, _)):
-                        return sortName(s);
-                case cf(\iter-star(s)):
-                        return sortName(s);
-                case cf(\iter(s)):
+                case \cf(\iter-star-sep(s, _)):
+                        return sortName(s);
+                case \cf(\iter-sep(s, _)):
+                        return sortName(s);
+                case \cf(\iter-star(s)):
+                        return sortName(s);
+                case \cf(\iter(s)):
                         return sortName(s);
                 default:
@@ -212 +212 @@
 public str sortName(Symbol sym) {
         switch(sym) {
-                case cf(s):
+                case \cf(s):
                         return sortName(s);
                 case \lex(s):

MetaXa/src/XaTree.rsc

@@ -238 +238 @@
         
         list[XaToken] concPat = [];
-        list[XaToken] space = [];
+        list[XaToken] spaces = [];
         list[XaToken] toks = [];
         str firstChar;
         for(tok <- tree@concrete) {
                 if(concPat != [])
-                        space = [space(" ")];
+                        spaces = [space(" ")];
                 if(lastChar == "\n") {
                         if(indent != "")
                                 concPat += [space(indent)];
-                        space = [];
+                        spaces = [];
                         lastChar = "\t";
                 }
@@ -254 +254 @@
                 chars = lastChar;
                 toks = [tok];
-
+                rawPrintln(tok);
                 switch(tok) {
                         case space(l):
-                                        space = [];
+                                        spaces = [];
                         case comment(c): {
                                 firstChar = firstChar ? "#";
@@ -286 +286 @@
                                         if(lastChar != "\t") { // add newline and indent
                                                 toks = [space((lastChar == "\n") ? indent : "\n" + indent), tok];
-                                                space = [];
+                                                spaces = [];
                                         }
                                         <tree.args[i], fc, _> = reindent(tree.args[i], indent, "\t");
@@ -303 +303 @@
 
                 if(/^(<suppressSpace>)$/ := chars && /^(<alwaysSpace>)$/ !:= chars)
-                        space = []; 
-                concPat += space;
+                        spaces = []; 
+                concPat += spaces;
                 concPat += toks;
         }