Changeset 49 for branches/DelphiToC/Analyze/UPascalParser.pas

Timestamp:

Aug 9, 2010, 2:24:24 PM (14 years ago)

Author:

george

Message:

Added support for setting cursor position to place of error code for error messages.

File:

• branches/DelphiToC/Analyze/UPascalParser.pas (modified) (5 diffs)

branches/DelphiToC/Analyze/UPascalParser.pas

@@ -10 +10 @@
 
 type
-  TOnErrorMessage = procedure (Text: string) of object;
+  TOnErrorMessage = procedure (Text: string; Position: TPoint) of object;
 
   TTokenType = (ttNone, ttIdentifier, ttConstantNumber, ttConstantString,
@@ -85 +85 @@
 begin
   if Assigned(FOnErrorMessage) then
-    FOnErrorMessage(Format(Text, Arguments));
+    FOnErrorMessage(Format(Text, Arguments), CodePosition);
 end;
 
@@ -172 +172 @@
 procedure TBaseParser.Init;
 begin
+  CodePosition := Point(1, 1);
   CurrentChar := #0;
   PreviousChar := #0;
@@ -201 +202 @@
         Break;
       end;
+
       if FNextTokenType = ttNone then begin
         if IsWhiteSpace(CurrentChar) then FNextTokenType := ttWhiteSpace
@@ -262 +264 @@
 
       if FNextTokenType <> ttNone then begin
+        // Update cursor position
+        Inc(CodePosition.X);
+        if (CurrentChar = #13) then begin
+          CodePosition.X := 1;
+          Inc(CodePosition.Y);
+        end;
+
         Inc(CodeStreamPosition);
         PreviousChar := CurrentChar;