Mercurial > projects > dil
changeset 599:c4cdea3a65ba
Moved dil.Keywords to dil.lexer.Keywords.
| author | Aziz K?ksal <aziz.koeksal@gmail.com> |
|---|---|
| date | Sun, 06 Jan 2008 00:45:53 +0100 |
| parents | 4ba8157bde1f |
| children | 041eae272362 |
| files | trunk/src/dil/IdTable.d trunk/src/dil/Keywords.d trunk/src/dil/lexer/Keywords.d trunk/src/dil/lexer/Lexer.d |
| diffstat | 4 files changed, 123 insertions(+), 123 deletions(-) [+] |
line wrap: on
line diff
--- a/trunk/src/dil/IdTable.d Sun Jan 06 00:39:15 2008 +0100 +++ b/trunk/src/dil/IdTable.d Sun Jan 06 00:45:53 2008 +0100 @@ -6,7 +6,7 @@ import dil.lexer.TokensEnum; import dil.IdentsGenerator; -import dil.Keywords; +import dil.lexer.Keywords; import common; public import dil.Identifier;
--- a/trunk/src/dil/Keywords.d Sun Jan 06 00:39:15 2008 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -/++ - Author: Aziz Köksal - License: GPL3 -+/ -module dil.Keywords; - -import dil.lexer.Token; -import dil.Identifier; - -/// Table of reserved identifiers. -static const Identifier[] keywords = [ - {"abstract", TOK.Abstract}, - {"alias", TOK.Alias}, - {"align", TOK.Align}, - {"asm", TOK.Asm}, - {"assert", TOK.Assert}, - {"auto", TOK.Auto}, - {"body", TOK.Body}, - {"bool", TOK.Bool}, - {"break", TOK.Break}, - {"byte", TOK.Byte}, - {"case", TOK.Case}, - {"cast", TOK.Cast}, - {"catch", TOK.Catch}, - {"cdouble", TOK.Cdouble}, - {"cent", TOK.Cent}, - {"cfloat", TOK.Cfloat}, - {"char", TOK.Char}, - {"class", TOK.Class}, - {"const", TOK.Const}, - {"continue", TOK.Continue}, - {"creal", TOK.Creal}, - {"dchar", TOK.Dchar}, - {"debug", TOK.Debug}, - {"default", TOK.Default}, - {"delegate", TOK.Delegate}, - {"delete", TOK.Delete}, - {"deprecated", TOK.Deprecated}, - {"do", TOK.Do}, - {"double", TOK.Double}, - {"else", TOK.Else}, - {"enum", TOK.Enum}, - {"export", TOK.Export}, - {"extern", TOK.Extern}, - {"false", TOK.False}, - {"final", TOK.Final}, - {"finally", TOK.Finally}, - {"float", TOK.Float}, - {"for", TOK.For}, - {"foreach", TOK.Foreach}, - {"foreach_reverse", TOK.Foreach_reverse}, - {"function", TOK.Function}, - {"goto", TOK.Goto}, - {"idouble", TOK.Idouble}, - {"if", TOK.If}, - {"ifloat", TOK.Ifloat}, - {"import", TOK.Import}, - {"in", TOK.In}, - {"inout", TOK.Inout}, - {"int", TOK.Int}, - {"interface", TOK.Interface}, - {"invariant", TOK.Invariant}, - {"ireal", TOK.Ireal}, - {"is", TOK.Is}, - {"lazy", TOK.Lazy}, - {"long", TOK.Long}, - {"macro", TOK.Macro}, // D2.0 - {"mixin", TOK.Mixin}, - {"module", TOK.Module}, - {"new", TOK.New}, - {"null", TOK.Null}, - {"out", TOK.Out}, - {"override", TOK.Override}, - {"package", TOK.Package}, - {"pragma", TOK.Pragma}, - {"private", TOK.Private}, - {"protected", TOK.Protected}, - {"public", TOK.Public}, - {"real", TOK.Real}, - {"ref", TOK.Ref}, - {"return", TOK.Return}, - {"scope", TOK.Scope}, - {"short", TOK.Short}, - {"static", TOK.Static}, - {"struct", TOK.Struct}, - {"super", TOK.Super}, - {"switch", TOK.Switch}, - {"synchronized", TOK.Synchronized}, - {"template", TOK.Template}, - {"this", TOK.This}, - {"throw", TOK.Throw}, - {"__traits", TOK.Traits}, // D2.0 - {"true", TOK.True}, - {"try", TOK.Try}, - {"typedef", TOK.Typedef}, - {"typeid", TOK.Typeid}, - {"typeof", TOK.Typeof}, - {"ubyte", TOK.Ubyte}, - {"ucent", TOK.Ucent}, - {"uint", TOK.Uint}, - {"ulong", TOK.Ulong}, - {"union", TOK.Union}, - {"unittest", TOK.Unittest}, - {"ushort", TOK.Ushort}, - {"version", TOK.Version}, - {"void", TOK.Void}, - {"volatile", TOK.Volatile}, - {"wchar", TOK.Wchar}, - {"while", TOK.While}, - {"with", TOK.With}, - // Special tokens: - {"__FILE__", TOK.FILE}, - {"__LINE__", TOK.LINE}, - {"__DATE__", TOK.DATE}, - {"__TIME__", TOK.TIME}, - {"__TIMESTAMP__", TOK.TIMESTAMP}, - {"__VENDOR__", TOK.VENDOR}, - {"__VERSION__", TOK.VERSION}, - {"__EOF__", TOK.EOF}, // D2.0 -];
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/trunk/src/dil/lexer/Keywords.d Sun Jan 06 00:45:53 2008 +0100 @@ -0,0 +1,120 @@ +/++ + Author: Aziz Köksal + License: GPL3 ++/ +module dil.lexer.Keywords; + +import dil.lexer.Token; +import dil.Identifier; + +/// Table of reserved identifiers. +static const Identifier[] keywords = [ + {"abstract", TOK.Abstract}, + {"alias", TOK.Alias}, + {"align", TOK.Align}, + {"asm", TOK.Asm}, + {"assert", TOK.Assert}, + {"auto", TOK.Auto}, + {"body", TOK.Body}, + {"bool", TOK.Bool}, + {"break", TOK.Break}, + {"byte", TOK.Byte}, + {"case", TOK.Case}, + {"cast", TOK.Cast}, + {"catch", TOK.Catch}, + {"cdouble", TOK.Cdouble}, + {"cent", TOK.Cent}, + {"cfloat", TOK.Cfloat}, + {"char", TOK.Char}, + {"class", TOK.Class}, + {"const", TOK.Const}, + {"continue", TOK.Continue}, + {"creal", TOK.Creal}, + {"dchar", TOK.Dchar}, + {"debug", TOK.Debug}, + {"default", TOK.Default}, + {"delegate", TOK.Delegate}, + {"delete", TOK.Delete}, + {"deprecated", TOK.Deprecated}, + {"do", TOK.Do}, + {"double", TOK.Double}, + {"else", TOK.Else}, + {"enum", TOK.Enum}, + {"export", TOK.Export}, + {"extern", TOK.Extern}, + {"false", TOK.False}, + {"final", TOK.Final}, + {"finally", TOK.Finally}, + {"float", TOK.Float}, + {"for", TOK.For}, + {"foreach", TOK.Foreach}, + {"foreach_reverse", TOK.Foreach_reverse}, + {"function", TOK.Function}, + {"goto", TOK.Goto}, + {"idouble", TOK.Idouble}, + {"if", TOK.If}, + {"ifloat", TOK.Ifloat}, + {"import", TOK.Import}, + {"in", TOK.In}, + {"inout", TOK.Inout}, + {"int", TOK.Int}, + {"interface", TOK.Interface}, + {"invariant", TOK.Invariant}, + {"ireal", TOK.Ireal}, + {"is", TOK.Is}, + {"lazy", TOK.Lazy}, + {"long", TOK.Long}, + {"macro", TOK.Macro}, // D2.0 + {"mixin", TOK.Mixin}, + {"module", TOK.Module}, + {"new", TOK.New}, + {"null", TOK.Null}, + {"out", TOK.Out}, + {"override", TOK.Override}, + {"package", TOK.Package}, + {"pragma", TOK.Pragma}, + {"private", TOK.Private}, + {"protected", TOK.Protected}, + {"public", TOK.Public}, + {"real", TOK.Real}, + {"ref", TOK.Ref}, + {"return", TOK.Return}, + {"scope", TOK.Scope}, + {"short", TOK.Short}, + {"static", TOK.Static}, + {"struct", TOK.Struct}, + {"super", TOK.Super}, + {"switch", TOK.Switch}, + {"synchronized", TOK.Synchronized}, + {"template", TOK.Template}, + {"this", TOK.This}, + {"throw", TOK.Throw}, + {"__traits", TOK.Traits}, // D2.0 + {"true", TOK.True}, + {"try", TOK.Try}, + {"typedef", TOK.Typedef}, + {"typeid", TOK.Typeid}, + {"typeof", TOK.Typeof}, + {"ubyte", TOK.Ubyte}, + {"ucent", TOK.Ucent}, + {"uint", TOK.Uint}, + {"ulong", TOK.Ulong}, + {"union", TOK.Union}, + {"unittest", TOK.Unittest}, + {"ushort", TOK.Ushort}, + {"version", TOK.Version}, + {"void", TOK.Void}, + {"volatile", TOK.Volatile}, + {"wchar", TOK.Wchar}, + {"while", TOK.While}, + {"with", TOK.With}, + // Special tokens: + {"__FILE__", TOK.FILE}, + {"__LINE__", TOK.LINE}, + {"__DATE__", TOK.DATE}, + {"__TIME__", TOK.TIME}, + {"__TIMESTAMP__", TOK.TIMESTAMP}, + {"__VENDOR__", TOK.VENDOR}, + {"__VERSION__", TOK.VERSION}, + {"__EOF__", TOK.EOF}, // D2.0 +];
--- a/trunk/src/dil/lexer/Lexer.d Sun Jan 06 00:39:15 2008 +0100 +++ b/trunk/src/dil/lexer/Lexer.d Sun Jan 06 00:45:53 2008 +0100 @@ -5,9 +5,9 @@ module dil.lexer.Lexer; import dil.lexer.Token; +import dil.lexer.Keywords; +import dil.Identifier; import dil.Information; -import dil.Keywords; -import dil.Identifier; import dil.Messages; import dil.HtmlEntities; import dil.CompilerInfo;