re-export of bools was changing

format from hex to decimal, confusing
ar's strcmp-based value comparison.

switched export format to "true" or "false"
to keep bools separate from ints.

R=ken
OCL=22944
CL=22944

diff --git a/src/cmd/gc/export.c b/src/cmd/gc/export.c
index 13a481cab94a1043430214d234106f4a0e09812e..f71f929b2a05abcadb120d1525d978619af3ab50 100644 (file)
--- a/src/cmd/gc/export.c
+++ b/src/cmd/gc/export.c
@@ -119,9 +119,9 @@ dumpexportconst(Sym *s)
                Bprint(bout, "export ");
        else if(s->export == 2)
                Bprint(bout, "package ");
-       Bprint(bout, "const %lS ", s);
+       Bprint(bout, "const %lS", s);
        if(t != T)
-               Bprint(bout, "%#T ", t);
+               Bprint(bout, " %#T", t);
        Bprint(bout, " = ");
 
        switch(n->val.ctype) {
@@ -133,7 +133,10 @@ dumpexportconst(Sym *s)
                Bprint(bout, "%B\n", n->val.u.xval);
                break;
        case CTBOOL:
-               Bprint(bout, "0x%llux\n", n->val.u.bval);
+               if(n->val.u.bval)
+                       Bprint(bout, "true\n");
+               else
+                       Bprint(bout, "false\n");
                break;
        case CTFLT:
                Bprint(bout, "%F\n", n->val.u.fval);

diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y
index a6ea498d425194839d55dbe277c71cb33438acc8..442baadda49327c73e987b7d951db50075966845 100644 (file)
--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -1969,6 +1969,14 @@ hidden_constant:
                        yyerror("bad negated constant");
                }
        }
+|      LTRUE
+       {
+               $$ = booltrue->val;
+       }
+|      LFALSE
+       {
+               $$ = boolfalse->val;
+       }
 
 hidden_importsym:
        sym1 '.' sym2