[Synedit-checkins] SynEdit/SynGen HashTableGen.pas, 1.1.2.4, 1.1.2.5 SynGenUnit.pas, 1.18.2.8, 1.18.2.9

[Maël Hörz <ma...@us...>]

Update of /cvsroot/synedit/SynEdit/SynGen
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19785/SynGen

Modified Files:
      Tag: Unicode_2004_08_31
	HashTableGen.pas SynGenUnit.pas 
Log Message:
Changes for compatibility with Delphi 2009

Index: HashTableGen.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/SynGen/Attic/HashTableGen.pas,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- HashTableGen.pas	12 Jan 2005 17:11:26 -0000	1.1.2.4
+++ HashTableGen.pas	14 Sep 2008 16:27:16 -0000	1.1.2.5
@@ -69,11 +69,11 @@
   c, d, m: Cardinal;
   FinalC, FinalD, FinalM: Cardinal;
   searching: Boolean;
-  KeyWords: array of WideString;
+  KeyWords: array of UnicodeString;
   HashKeyList: THashKeyList;
 
 {$Q-}
-function HashKey(const S: WideString): Cardinal;
+function HashKey(const S: UnicodeString): Cardinal;
 var
   i: Integer;
 begin
@@ -85,7 +85,7 @@
 {$Q+}
 
 {$Q-}
-function FinalHashKey(const S: WideString): Cardinal;
+function FinalHashKey(const S: UnicodeString): Cardinal;
 var
   i: Integer;
 begin
@@ -341,7 +341,7 @@
   // write KeyWords
   if not CaseSensitive then
     Result := Result + '  // as this language is case-insensitive keywords *must* be in lowercase'#13#10;
-  Result := Result + Format('  KeyWords: array[0..%d] of WideString = (', [High(KeyWords)]) + #13#10;
+  Result := Result + Format('  KeyWords: array[0..%d] of UnicodeString = (', [High(KeyWords)]) + #13#10;
   sl := TStringList.Create;
   try
     for i := Low(KeyWords) to High(KeyWords) do

Index: SynGenUnit.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/SynGen/SynGenUnit.pas,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
diff -u -d -r1.18.2.8 -r1.18.2.9
--- SynGenUnit.pas	12 Dec 2006 07:42:36 -0000	1.18.2.8
+++ SynGenUnit.pas	14 Sep 2008 16:27:16 -0000	1.18.2.9
@@ -238,7 +238,7 @@
   end;
 end;
 
-function FirstLetterCap(S: WideString): WideString;
+function FirstLetterCap(S: UnicodeString): UnicodeString;
 begin
   Result := SynWideLowerCase(S);
   if Length(Result) > 0 then
@@ -252,7 +252,7 @@
 end;
 {$ENDIF}
 
-function ToAlphaNum(S: WideString): AnsiString;
+function ToAlphaNum(S: UnicodeString): AnsiString;
 var
   c: AnsiChar;
 begin
@@ -270,7 +270,7 @@
     Result := AnsiReplaceStr(Result, c, IntToStr(Ord(c)));
 end;
 
-function IsASCIIAlphaNum(S: WideString): Boolean;
+function IsASCIIAlphaNum(S: UnicodeString): Boolean;
 var
   i: Integer;
 begin
@@ -1209,11 +1209,11 @@
       + 'Proc;');
   end;
   Writeln(OutFile, '  protected');
-  Writeln(OutFile, '    function GetSampleSource: WideString; override;');
+  Writeln(OutFile, '    function GetSampleSource: UnicodeString; override;');
   Writeln(OutFile, '    function IsFilterStored: Boolean; override;');
   Writeln(OutFile, '  public');
   Writeln(OutFile, '    constructor Create(AOwner: TComponent); override;');
-  Writeln(OutFile, '    class function GetFriendlyLanguageName: WideString; override;');  
+  Writeln(OutFile, '    class function GetFriendlyLanguageName: UnicodeString; override;');  
   Writeln(OutFile, '    class function GetLanguageName: string; override;');
   Writeln(OutFile, '    function GetRange: Pointer; override;');
   Writeln(OutFile, '    procedure ResetRange; override;');
@@ -1222,7 +1222,7 @@
     '    function GetDefaultAttribute(Index: Integer): TSynHighlighterAttributes; override;');
   Writeln(OutFile, '    function GetEol: Boolean; override;');
   if ChkGetKeyWords.Checked then
-    Writeln(OutFile, '    function GetKeyWords(TokenKind: Integer): WideString; override;');
+    Writeln(OutFile, '    function GetKeyWords(TokenKind: Integer): UnicodeString; override;');
   Writeln(OutFile, '    function GetTokenID: TtkTokenKind;');
   Writeln(OutFile,
     '    function GetTokenAttribute: TSynHighlighterAttributes; override;');
@@ -1695,7 +1695,7 @@
 
   if ChkGetKeyWords.Checked then
   begin
-    Writeln(OutFile, 'function ' + LexName + '.GetKeyWords(TokenKind: Integer): WideString;');
+    Writeln(OutFile, 'function ' + LexName + '.GetKeyWords(TokenKind: Integer): UnicodeString;');
     Writeln(OutFile, 'begin');
     TempStringList := TStringList.Create;
     try
@@ -1774,7 +1774,7 @@
   Writeln(OutFile, 'end;');  
   Writeln(OutFile);
 
-  Writeln(OutFile, 'function ' + LexName + '.GetSampleSource: WideString;');
+  Writeln(OutFile, 'function ' + LexName + '.GetSampleSource: UnicodeString;');
   Writeln(OutFile, 'begin');
   if (SampleSourceList.Count = 0) then
   begin
@@ -1805,7 +1805,7 @@
   Writeln(OutFile, 'end;');
   Writeln(OutFile);
 
-  Writeln(OutFile, 'class function ' + LexName + '.GetFriendlyLanguageName: WideString;');
+  Writeln(OutFile, 'class function ' + LexName + '.GetFriendlyLanguageName: UnicodeString;');
   Writeln(OutFile, 'begin');
   Writeln(OutFile, '  Result := ' + GetFriendlyLangName + ';');
   Writeln(OutFile, 'end;');