shithub: mc

Download patch

ref: 6cc5bc96736774d258b2cd7757f9831be6845863
parent: e239a342a21b54d5e2302f5dece5624ef0f1aea7
author: Ori Bernstein <[email protected]>
date: Mon Dec 22 18:44:25 EST 2014 

Another plan9 change: 6a doens't like '.' in function names.


--- a/parse/type.c
+++ b/parse/type.c
@@ -757,19 +757,19 @@
         case Tyflt64:   p += snprintf(p, end - p, "d");  break;
         case Tyvalist:  p += snprintf(p, end - p, "V");  break;
         case Typtr:
-            p += snprintf(p, end - p, ".p");
+            p += snprintf(p, end - p, "$p");
             p += tyidfmt(p, end - p, ty->sub[0]);
             break;
         case Tyarray:
-            p += snprintf(p, end - p, ".a%lld", (vlong)arraysz(ty->asize));
+            p += snprintf(p, end - p, "$a%lld", (vlong)arraysz(ty->asize));
             p += tyidfmt(p, end - p, ty->sub[0]);
             break;
         case Tyslice:
-            p += snprintf(p, end - p, ".s");
+            p += snprintf(p, end - p, "$s");
             p += tyidfmt(p, end - p, ty->sub[0]);
             break;
         case Tyfunc:
-            p += snprintf(p, end - p, ".f");
+            p += snprintf(p, end - p, "$f");
             for (i = 0; i < ty->nsub; i++) {
                 p += tyidfmt(p, end - p, ty->sub[i]);
                 p += snprintf(p, end - p, "$");
@@ -776,7 +776,7 @@
             }
             break;
         case Tytuple:
-            p += snprintf(p, end - p, ".p");
+            p += snprintf(p, end - p, "$p");
             for (i = 0; i < ty->nsub; i++) {
                 p += tyidfmt(p, end - p, ty->sub[i]);
             }
@@ -783,7 +783,7 @@
             p += snprintf(p, end - p, "$");
             break;
         case Tystruct:
-            p += snprintf(p, end - p, ".t");
+            p += snprintf(p, end - p, "$t");
             for (i = 0; i < ty->nmemb; i++) {
                 p += snprintf(p, end - p, "%s.", declname(ty->sdecls[i]));
                 p += tyidfmt(p, end - p, decltype(ty->sdecls[i]));
@@ -791,7 +791,7 @@
             }
             break;
         case Tyunion:
-            p += snprintf(p, end - p, ".u");
+            p += snprintf(p, end - p, "$u");
             for (i = 0; i < ty->nmemb; i++) {
                 p += snprintf(p, end - p, "%s.", namestr(ty->udecls[i]->name));
                 if (ty->udecls[i]->etype)
@@ -800,15 +800,15 @@
             }
             break;
         case Typaram:
-            p += snprintf(p, end - p, ".p");
+            p += snprintf(p, end - p, "$p");
             p += tyidfmt(p, end - p, ty->sub[0]);
             break;
         case Tyunres:
         case Tyname:
-            p += snprintf(p, end - p, ".n");
+            p += snprintf(p, end - p, "$n");
             if (ty->name->name.ns)
                 p += snprintf(p, end - p, "%s", ty->name->name.ns);
-            p += snprintf(p, end - p, ".%s", ty->name->name.name);
+            p += snprintf(p, end - p, "$%s", ty->name->name.name);
             if (ty->arg)
                 for (i = 0; i < ty->narg; i++)
                     p += tyidfmt(p, end - p, ty->arg[i]);