From c753bf2b3239bf268e6562af8605c8526f5f3280 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Thu, 28 Jul 2016 14:15:39 +0200 Subject: [PATCH] regenerated table for special keywords + add isitthere scripts --- isitthere/d2kw.sh | 1 + isitthere/d2kw.txt | 130 +++++++++++++++++++++++++++++++++++++++++++ isitthere/d2sp.sh | 1 + isitthere/d2sp.txt | 12 ++++ src/ce_dlangmaps.pas | 42 +++++++------- 5 files changed, 165 insertions(+), 21 deletions(-) create mode 100644 isitthere/d2kw.sh create mode 100644 isitthere/d2kw.txt create mode 100644 isitthere/d2sp.sh create mode 100644 isitthere/d2sp.txt diff --git a/isitthere/d2kw.sh b/isitthere/d2kw.sh new file mode 100644 index 00000000..247f6ffe --- /dev/null +++ b/isitthere/d2kw.sh @@ -0,0 +1 @@ +isitthere --if=d2kw.txt --ml=512 --hf=0 \ No newline at end of file diff --git a/isitthere/d2kw.txt b/isitthere/d2kw.txt new file mode 100644 index 00000000..5c540f9c --- /dev/null +++ b/isitthere/d2kw.txt @@ -0,0 +1,130 @@ +abstract +alias +align +asm +assert +auto + +body +bool +break +byte + +case +cast +catch +cdouble +cent +cfloat +char +class +const +continue +creal + +dchar +debug +default +delegate +delete +deprecated +do +double +dstring + +else +enum +export +extern + +false +final +finally +float +for +foreach +foreach_reverse +function + +goto + +idouble +if +ifloat +immutable +import +in +inout +int +interface +invariant +ireal +is + +lazy +long + +macro +mixin +module + +new +nothrow +null + +out +override + +package +pragma +private +protected +public +pure +ptrdiff_t + +real +ref +return + +scope +shared +short +static +string +struct +super +switch +synchronized +size_t + +template +this +throw +true +try +typedef +typeid +typeof + +ubyte +ucent +uint +ulong +union +unittest +ushort + +version +void +volatile + +wchar +while +with +wstring + +__gshared +__traits +__vector +__parameters \ No newline at end of file diff --git a/isitthere/d2sp.sh b/isitthere/d2sp.sh new file mode 100644 index 00000000..dffd3075 --- /dev/null +++ b/isitthere/d2sp.sh @@ -0,0 +1 @@ +isitthere --if=d2sp.txt --ml=16 --hf=0 \ No newline at end of file diff --git a/isitthere/d2sp.txt b/isitthere/d2sp.txt new file mode 100644 index 00000000..db297b26 --- /dev/null +++ b/isitthere/d2sp.txt @@ -0,0 +1,12 @@ +__FILE__ +__FILE_FULL_PATH__ +__MODULE__ +__LINE__ +__FUNCTION__ +__PRETTY_FUNCTION__ +__DATE__ +__EOF__ +__TIME__ +__TIMESTAMP__ +__VENDOR__ +__VERSION__ \ No newline at end of file diff --git a/src/ce_dlangmaps.pas b/src/ce_dlangmaps.pas index 75551445..c1eb8bd0 100644 --- a/src/ce_dlangmaps.pas +++ b/src/ce_dlangmaps.pas @@ -15,33 +15,33 @@ type private const fWords: array [0..15] of string = ( - '__FILE__', '', '__TIME__', '', '', '__EOF__', '__VENDOR__', '__LINE__', - '', '__PRETTY_FUNCTION__', '__DATE__', '__MODULE__', '__FUNCTION__', - '__TIMESTAMP__', '__VERSION__', '' + '__VERSION__', '', '__FILE_FULL_PATH__', '__TIME__', '__FILE__', '__VENDOR__', + '', '__DATE__', '__FUNCTION__', '__LINE__', '__EOF__', '__MODULE__', + '__PRETTY_FUNCTION__', '', '', '__TIMESTAMP__' ); const fHasEntry: array [0..15] of boolean = ( - true, false, true, false, false, true, true, true, false, true, true, true, - true, true, true, false + true, false, true, true, true, true, false, true, true, true, true, true, + true, false, false, true ); const fCoeffs: array[0..255] of Byte = ( - 23, 54, 252, 239, 192, 69, 42, 70, 63, 3, 89, 171, 21, 218, 140, 187, 191, - 74, 12, 230, 108, 85, 152, 3, 56, 199, 164, 61, 172, 64, 225, 99, 179, 182, - 174, 189, 171, 243, 108, 60, 208, 146, 6, 17, 236, 103, 127, 4, 219, 83, - 85, 138, 228, 29, 243, 85, 155, 246, 32, 93, 255, 80, 135, 160, 38, 224, 3, - 134, 54, 8, 27, 129, 142, 243, 201, 39, 198, 171, 242, 78, 141, 183, 57, - 187, 168, 138, 251, 219, 96, 186, 112, 117, 220, 164, 203, 21, 127, 101, - 77, 41, 187, 233, 66, 20, 108, 205, 192, 246, 49, 38, 71, 106, 176, 176, - 253, 21, 18, 136, 165, 120, 50, 144, 62, 90, 56, 10, 0, 109, 109, 70, 108, - 191, 244, 103, 237, 145, 214, 39, 227, 200, 40, 135, 49, 12, 7, 203, 37, - 101, 142, 4, 156, 251, 234, 144, 54, 251, 17, 82, 59, 108, 178, 60, 229, - 43, 72, 97, 193, 36, 253, 36, 154, 219, 246, 59, 165, 144, 136, 136, 231, - 243, 222, 108, 73, 148, 208, 148, 147, 57, 9, 1, 193, 247, 251, 116, 48, - 72, 165, 80, 49, 86, 220, 197, 227, 71, 24, 98, 21, 132, 2, 164, 133, 186, - 43, 19, 138, 166, 119, 202, 109, 124, 91, 32, 159, 155, 145, 124, 164, 19, - 200, 143, 191, 31, 199, 229, 240, 115, 135, 52, 181, 14, 140, 174, 12, 139, - 45, 158, 171, 146, 186, 72, 34, 12, 6, 207, 151, 117 + 162, 105, 225, 180, 180, 12, 125, 73, 237, 109, 3, 67, 160, 192, 35, 42, + 131, 170, 41, 106, 103, 53, 105, 74, 29, 64, 247, 248, 184, 146, 172, 142, + 239, 232, 158, 168, 29, 243, 40, 241, 255, 85, 184, 38, 44, 242, 193, 222, + 86, 131, 181, 101, 161, 209, 115, 124, 91, 118, 188, 67, 172, 115, 24, 221, + 142, 99, 17, 30, 231, 80, 185, 182, 185, 55, 4, 23, 152, 63, 126, 37, 158, + 36, 28, 235, 65, 220, 243, 62, 169, 129, 127, 76, 149, 232, 21, 119, 134, + 144, 20, 89, 103, 65, 109, 12, 95, 200, 41, 14, 52, 25, 56, 228, 4, 227, + 86, 113, 77, 158, 46, 246, 90, 25, 210, 214, 149, 219, 219, 27, 95, 203, + 43, 21, 191, 94, 216, 113, 100, 222, 245, 224, 127, 174, 214, 44, 78, 89, + 213, 184, 73, 77, 236, 131, 46, 90, 58, 171, 34, 215, 201, 104, 138, 251, + 54, 103, 75, 235, 12, 149, 49, 19, 128, 72, 138, 224, 73, 174, 151, 50, + 152, 32, 135, 238, 132, 34, 3, 230, 201, 166, 31, 119, 50, 155, 125, 103, + 133, 250, 253, 218, 48, 167, 207, 107, 235, 53, 214, 213, 49, 8, 13, 247, + 37, 251, 21, 43, 34, 108, 162, 160, 133, 199, 169, 218, 189, 1, 128, 17, + 67, 186, 55, 2, 23, 23, 133, 114, 240, 176, 124, 127, 217, 231, 129, 220, + 250, 17, 136, 92, 191, 172, 16, 137, 23, 109, 37, 191, 74, 218 ); class function hash(const w: string): Byte; static; {$IFNDEF DEBUG}inline;{$ENDIF} public