summaryrefslogtreecommitdiff
path: root/utils/acid
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2010-07-22 11:56:14 +0100
committerforsyth <forsyth@vitanuova.com>2010-07-22 11:56:14 +0100
commitce8e0d607a2bec33fcaac7237d0b5535e5b152a1 (patch)
tree41e7f8c5524e6636b88085bb8d675e041ffd4c52 /utils/acid
parent98a84ad18808c4c7892dac82539cd678dc45e952 (diff)
20100722
Diffstat (limited to 'utils/acid')
-rw-r--r--utils/acid/builtin.c8
-rw-r--r--utils/acid/print.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/utils/acid/builtin.c b/utils/acid/builtin.c
index 56c4dceb..1d8b0e77 100644
--- a/utils/acid/builtin.c
+++ b/utils/acid/builtin.c
@@ -915,10 +915,10 @@ patom(char type, Store *res)
Bprint(bout, "%3d", (int)res->u0.sival&0xff);
break;
case 'X':
- Bprint(bout, "%.8lux", (int)res->u0.sival);
+ Bprint(bout, "%.8ux", (int)res->u0.sival);
break;
case 'x':
- Bprint(bout, "%.4lux", (int)res->u0.sival&0xffff);
+ Bprint(bout, "%.4ux", (int)res->u0.sival&0xffff);
break;
case 'Y':
Bprint(bout, "%.16llux", res->u0.sival);
@@ -933,7 +933,7 @@ patom(char type, Store *res)
Bprint(bout, "%ud", (int)res->u0.sival&0xffff);
break;
case 'U':
- Bprint(bout, "%ud", (ulong)res->u0.sival);
+ Bprint(bout, "%lud", (ulong)res->u0.sival);
break;
case 'Z':
Bprint(bout, "%llud", res->u0.sival);
@@ -972,7 +972,7 @@ patom(char type, Store *res)
if(type != TSTRING)
Bprint(bout, "*%c<%s>*", res->fmt, typenames[type]);
else
- Bprint(bout, "%S", res->u0.sstring->string);
+ Bprint(bout, "%S", (Rune*)res->u0.sstring->string);
break;
case 'a':
case 'A':
diff --git a/utils/acid/print.c b/utils/acid/print.c
index 8043fcd7..3a101b80 100644
--- a/utils/acid/print.c
+++ b/utils/acid/print.c
@@ -201,10 +201,10 @@ pcode(Node *n, int d)
Bprint(bout, "%.*sif ", d, tabs);
pexpr(l);
d++;
- Bprint(bout, " then\n", d, tabs);
+ Bprint(bout, "%.*sthen\n", d, tabs);
if(r && r->op == OELSE) {
slist(r->left, d);
- Bprint(bout, "%.*selse\n", d-1, tabs, d, tabs);
+ Bprint(bout, "%.*selse\n", d-1, tabs);
slist(r->right, d);
}
else
@@ -214,7 +214,7 @@ pcode(Node *n, int d)
Bprint(bout, "%.*swhile ", d, tabs);
pexpr(l);
d++;
- Bprint(bout, " do\n", d, tabs);
+ Bprint(bout, "%.*sdo\n", d, tabs);
slist(r, d);
break;
case ORET:
@@ -387,7 +387,7 @@ pexpr(Node *n)
pexpr(l);
break;
case OWHAT:
- Bprint(bout, "whatis", n->sym->name);
+ Bprint(bout, "whatis");
if(n->sym)
Bprint(bout, " %s", n->sym->name);
break;