Mercurial > projects > dil
changeset 507:996041463028
Removed TOK.WCharLiteral and TOK.DCharLiteral.
Removed unnecessary TOK members.
author | Aziz K?ksal <aziz.koeksal@gmail.com> |
---|---|
date | Wed, 12 Dec 2007 02:41:30 +0100 |
parents | 1b897a4536a4 |
children | 943ecc9c133a |
files | trunk/src/cmd/Generate.d trunk/src/dil/Lexer.d trunk/src/dil/Parser.d trunk/src/dil/Token.d trunk/src/dil/TokensEnum.d |
diffstat | 5 files changed, 9 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/trunk/src/cmd/Generate.d Wed Dec 12 02:28:37 2007 +0100 +++ b/trunk/src/cmd/Generate.d Wed Dec 12 02:41:30 2007 +0100 @@ -437,7 +437,7 @@ case TOK.String: print.format(tags[DP.StringLiteral], srcText); break; - case TOK.CharLiteral, TOK.WCharLiteral, TOK.DCharLiteral: + case TOK.CharLiteral: print.format(tags[DP.CharLiteral], srcText); break; case TOK.Assign, TOK.Equal,
--- a/trunk/src/dil/Lexer.d Wed Dec 12 02:28:37 2007 +0100 +++ b/trunk/src/dil/Lexer.d Wed Dec 12 02:41:30 2007 +0100 @@ -1254,14 +1254,6 @@ switch (*p) { case '\\': - switch (p[1]) - { - case 'u': - t.type = TOK.WCharLiteral; break; - case 'U': - t.type = TOK.DCharLiteral; break; - default: - } t.dchar_ = scanEscapeSequence(); break; case '\'': @@ -1272,10 +1264,7 @@ break; uint c = *p; if (!isascii(c)) - { c = decodeUTF8(); - t.type = c <= 0xFFFF ? TOK.WCharLiteral : TOK.DCharLiteral; - } t.dchar_ = c; ++p; }
--- a/trunk/src/dil/Parser.d Wed Dec 12 02:28:37 2007 +0100 +++ b/trunk/src/dil/Parser.d Wed Dec 12 02:41:30 2007 +0100 @@ -1853,7 +1853,7 @@ case T.Int32, T.Int64, T.Uint32, T.Uint64: case T.Float32, T.Float64, T.Float80, T.Imaginary32, T.Imaginary64, T.Imaginary80: - case T.CharLiteral, T.WCharLiteral, T.DCharLiteral: + case T.CharLiteral: case T.String: case T.LBracket: // case T.LBrace: @@ -3521,7 +3521,7 @@ e = new RealExpression(token.type, token.real_); nT(); break; - case T.CharLiteral, T.WCharLiteral, T.DCharLiteral: + case T.CharLiteral: e = new CharExpression(token); nT(); break;
--- a/trunk/src/dil/Token.d Wed Dec 12 02:28:37 2007 +0100 +++ b/trunk/src/dil/Token.d Wed Dec 12 02:41:30 2007 +0100 @@ -338,11 +338,10 @@ T.Enum, T.Class, T.Interface, T.Struct, T.Union, T.LBrace, T.Typedef, T.This, T.Super, T.Null, T.True, T.False, T.Int32, T.Int64, T.Uint32, T.Uint64, T.Float32, T.Float64, T.Float80, T.Imaginary32, - T.Imaginary64, T.Imaginary80, T.CharLiteral, T.WCharLiteral, - T.DCharLiteral, T.String, T.LBracket, T.Function, T.Delegate, - T.Assert, T.Import, T.Typeid, T.Is, T.LParen, T.Traits/*D2.0*/, - T.AndBinary, T.PlusPlus, T.MinusMinus, T.Mul,T.Minus, T.Plus, T.Not, - T.Tilde, T.New, T.Delete, T.Cast: + T.Imaginary64, T.Imaginary80, T.CharLiteral, T.String, T.LBracket, + T.Function, T.Delegate, T.Assert, T.Import, T.Typeid, T.Is, T.LParen, + T.Traits/*D2.0*/, T.AndBinary, T.PlusPlus, T.MinusMinus, T.Mul, + T.Minus, T.Plus, T.Not, T.Tilde, T.New, T.Delete, T.Cast: case T.Char, T.Wchar, T.Dchar, T.Bool, T.Byte, T.Ubyte, T.Short, T.Ushort, T.Int, T.Uint, T.Long, T.Ulong,
--- a/trunk/src/dil/TokensEnum.d Wed Dec 12 02:28:37 2007 +0100 +++ b/trunk/src/dil/TokensEnum.d Wed Dec 12 02:41:30 2007 +0100 @@ -21,7 +21,7 @@ Identifier = 8, String, - CharLiteral, WCharLiteral, DCharLiteral, + CharLiteral, // Special tokens FILE, @@ -126,7 +126,7 @@ "Identifier", "String", - "CharLiteral", "WCharLiteral", "DCharLiteral", + "CharLiteral", "__FILE__", "__LINE__",