Changeset 20 for trunk/Compiler

Timestamp:

Nov 9, 2010, 12:21:56 PM (14 years ago)

Author:

george

Message:

• Modified: Tokenizer was using slow Text property of TStringList. Replaced by fast native string variable.

Location:

trunk/Compiler

Files:

• Analyze/UAnalyzer.pas (modified) (4 diffs)
• Analyze/UAnalyzerPascal.pas (modified) (3 diffs)
• UCompiler.pas (modified) (1 diff)

trunk/Compiler/Analyze/UAnalyzer.pas

@@ -29 +29 @@
   end;
 
-  TGetSourceEvent = function (Name: string; Source: TStringList): Boolean of object;
+  TGetSourceEvent = function (Name: string; var SourceCode: string): Boolean of object;
 
   { TAnalyzer }
@@ -51 +51 @@
     CodeStreamPosition: Integer;
     CodePosition: TPoint;
-    SourceCodeText: TStringList;
+    SourceCode: string;
     Tokens: TObjectList; // TObjectList<TToken>
     TokenIndex: Integer;
@@ -225 +225 @@
   Tokens.Clear;
   TokenIndex := 0;
-  while CodeStreamPosition < Length(SourceCodeText.Text) do begin
+  while CodeStreamPosition < Length(SourceCode) do begin
     NewToken := TToken.Create;
     GetNextToken;
@@ -255 +255 @@
   FNextTokenType := ttNone;
   FParserState := psNone;
-  with SourceCodeText do
+
     while True do begin
-      if CodeStreamPosition < Length(Text) then begin
-        CurrentChar := Text[CodeStreamPosition];
+      if CodeStreamPosition < Length(SourceCode) then begin
+        CurrentChar := SourceCode[CodeStreamPosition];
       end else begin
         FNextToken := '';

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -91 +91 @@
   try
     Parser := TAnalyzerPascal.Create;
-    Parser.SourceCodeText := TStringList.Create;
     Parser.OnDebugLog := OnDebugLog;
     Parser.ProgramCode := ProgramCode;
     Parser.OnGetSource := OnGetSource;
     if Assigned(OnGetSource) then begin
-      if OnGetSource(Name, Parser.SourceCodeText) then begin
+      if OnGetSource(Name, Parser.SourceCode) then begin
         Parser.Process;
         Parser.FileName := Name;
@@ -107 +106 @@
     end else Result := False;
   finally
-    Parser.SourceCodeText.Free;
     Parser.Free;
   end;
@@ -560 +558 @@
   NewType: TType;
 begin
+  Log('ParseCommonBlockInterface');
   with SourceCode do begin
     while (NextToken <> 'implementation') and (NextTokenType <> ttEndOfFile) do begin

trunk/Compiler/UCompiler.pas

@@ -71 +71 @@
     ProducedCode := TStringList.Create;
     Analyzer.FileName := ModuleName;
-    Analyzer.SourceCodeText := Source;
+    Analyzer.SourceCode := Source.Text;
     Analyzer.Process;
     //ShowMessage(IntToHex(Integer(Addr(Analyzer.OnGetSource)), 8));