# HG changeset patch
# User Leandro Lucarella <llucax@gmail.com>
# Date 1262801901 10800
# Node ID dbf7b54f542f3375010bd4121093a310229e2aa7
# Parent  8f50a13d09a0c23ceaea161ee22a8c4eab6c9a44
Merge DMD r292: bugzilla 3455 Some Unicode characters not allowed...
bugzilla 3455 Some Unicode characters not allowed in identifiers.
---
 dmd/lexer.c |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff -r 8f50a13d09a0 -r dbf7b54f542f dmd/lexer.c
--- a/dmd/lexer.c	Wed Jan 06 15:18:21 2010 -0300
+++ b/dmd/lexer.c	Wed Jan 06 15:18:21 2010 -0300
@@ -634,15 +634,25 @@
 	    case '_':
 	    case_ident:
 	    {   unsigned char c;
-		StringValue *sv;
-		Identifier *id;
-
-		do
+
+		while (1)
 		{
 		    c = *++p;
-		} while (isidchar(c) || (c & 0x80 && isUniAlpha(decodeUTF())));
-		sv = stringtable.update((char *)t->ptr, p - t->ptr);
-		id = (Identifier *) sv->ptrvalue;
+		    if (isidchar(c))
+			continue;
+		    else if (c & 0x80)
+		    {	unsigned char *s = p;
+			unsigned u = decodeUTF();
+			if (isUniAlpha(u))
+			    continue;
+			error("char 0x%04x not allowed in identifier", u);
+			p = s;
+		    }
+		    break;
+		}
+
+		StringValue *sv = stringtable.update((char *)t->ptr, p - t->ptr);
+		Identifier *id = (Identifier *) sv->ptrvalue;
 		if (!id)
 		{   id = new Identifier(sv->lstring.string,TOKidentifier);
 		    sv->ptrvalue = id;
@@ -1177,23 +1187,23 @@
 		continue;
 
 	    default:
-	    {	unsigned char c = *p;
+	    {	unsigned c = *p;
 
 		if (c & 0x80)
-		{   unsigned u = decodeUTF();
+		{   c = decodeUTF();
 
 		    // Check for start of unicode identifier
-		    if (isUniAlpha(u))
+		    if (isUniAlpha(c))
 			goto case_ident;
 
-		    if (u == PS || u == LS)
+		    if (c == PS || c == LS)
 		    {
 			loc.linnum++;
 			p++;
 			continue;
 		    }
 		}
-		if (isprint(c))
+		if (c < 0x80 && isprint(c))
 		    error("unsupported char '%c'", c);
 		else
 		    error("unsupported char 0x%02x", c);
@@ -1455,7 +1465,7 @@
 		    if (u == PS || u == LS)
 			loc.linnum++;
 		    else
-			error("non-hex character \\u%x", u);
+			error("non-hex character \\u%04x", u);
 		}
 		else
 		    error("non-hex character '%c'", c);