From 8be5e8a419d12185b410e881271875a2612dd2d5 Mon Sep 17 00:00:00 2001 From: Dmitriy Vyukov Date: Sat, 4 Aug 2012 16:11:53 +0400 Subject: [PATCH] =?utf8?q?cmd/cc:=20allow=20to=20call=20nested=20packages?= =?utf8?q?=20from=20within=20C=20code=20E.g.=20sync/atomic.LoadInt32()=20c?= =?utf8?q?an=20be=20called=20as=20sync=C2=BBatomic=C2=B7LoadInt32()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit R=rsc CC=golang-dev https://golang.org/cl/6448057 --- src/cmd/cc/lex.c | 7 ++++++- src/cmd/cc/lexbody | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/cmd/cc/lex.c b/src/cmd/cc/lex.c index ac190a8cb1..653c298a24 100644 --- a/src/cmd/cc/lex.c +++ b/src/cmd/cc/lex.c @@ -377,11 +377,16 @@ lookup(void) symb[1] = '"'; } - // turn · into . for(r=w=symb; *r; r++) { + // turn · (U+00B7) into . + // turn ∕ (U+2215) into / if((uchar)*r == 0xc2 && (uchar)*(r+1) == 0xb7) { *w++ = '.'; r++; + }else if((uchar)*r == 0xe2 && (uchar)*(r+1) == 0x88 && (uchar)*(r+2) == 0x95) { + *w++ = '/'; + r++; + r++; }else *w++ = *r; } diff --git a/src/cmd/cc/lexbody b/src/cmd/cc/lexbody index 51d2e9396a..4cc9c73d9d 100644 --- a/src/cmd/cc/lexbody +++ b/src/cmd/cc/lexbody @@ -251,11 +251,16 @@ lookup(void) symb[1] = '"'; } - // turn · into . for(r=w=symb; *r; r++) { + // turn · (U+00B7) into . + // turn ∕ (U+2215) into / if((uchar)*r == 0xc2 && (uchar)*(r+1) == 0xb7) { *w++ = '.'; r++; + }else if((uchar)*r == 0xe2 && (uchar)*(r+1) == 0x88 && (uchar)*(r+2) == 0x95) { + *w++ = '/'; + r++; + r++; }else *w++ = *r; } -- 2.48.1