fcl-passrc: scanner: fixed column starting at 1

git-svn-id: trunk@36670 -

packages/fcl-passrc/src/pscanner.pp

@@ -3329,9 +3329,9 @@ end;
 function TPascalScanner.GetCurColumn: Integer;
 begin
   If (TokenStr<>Nil) then
-    Result := TokenStr - PChar(CurLine)
+    Result := TokenStr - PChar(CurLine) + 1
   else
-    Result := 0;
+    Result := 1;
 end;
 
 function TPascalScanner.OnCondEvalFunction(Sender: TCondDirectiveEvaluator;

packages/fcl-passrc/tests/tcresolver.pas

@@ -1933,7 +1933,7 @@ begin
     //WriteSources(FileName,Row,Column);
     AssertEquals('ResolverEngine.LastSourcePos.Filename','afile.pp',FileName);
     AssertEquals('ResolverEngine.LastSourcePos.Row',4,Row);
-    AssertEquals('ResolverEngine.LastSourcePos.Column',19,Column);
+    AssertEquals('ResolverEngine.LastSourcePos.Column',20,Column);
     end;
 end;
 
@@ -4143,7 +4143,7 @@ begin
   '  if unit1.j1=0 then ;',
   '  if unitdots.unit1.j1=0 then ;',
   '']);
-  CheckResolverException('Duplicate identifier "unitdots.unit1" at unitdots.main1.pas(2,13)',
+  CheckResolverException('Duplicate identifier "unitdots.unit1" at unitdots.main1.pas(2,14)',
     nDuplicateIdentifier);
 end;
 
@@ -4363,7 +4363,7 @@ begin
   'begin',
   '  DoIt(i);',
   '']);
-  CheckResolverException('Can''t determine which overloaded function to call, afile.pp(3,14), afile.pp(2,14)',
+  CheckResolverException('Can''t determine which overloaded function to call, afile.pp(3,15), afile.pp(2,15)',
     nCantDetermineWhichOverloadedFunctionToCall);
 end;
 
@@ -6681,7 +6681,7 @@ begin
   Add('    Some: longint;');
   Add('  end;');
   Add('begin');
-  CheckResolverException('Duplicate identifier "Some" at afile.pp(5,8)',nDuplicateIdentifier);
+  CheckResolverException('Duplicate identifier "Some" at afile.pp(5,9)',nDuplicateIdentifier);
 end;
 
 procedure TTestResolver.TestClass_ReintroducePrivateVar;

packages/pastojs/tests/tcmodules.pas

@@ -8011,7 +8011,7 @@ begin
   'end',
   'begin',
   '']);
-  SetExpectedPasResolverError('Duplicate identifier "Self" at test1.pp(5,23)',nDuplicateIdentifier);
+  SetExpectedPasResolverError('Duplicate identifier "Self" at test1.pp(5,24)',nDuplicateIdentifier);
   ConvertProgram;
 end;
 
@@ -8991,7 +8991,7 @@ begin
   Add('    Id: longint;');
   Add('  end;');
   Add('begin');
-  SetExpectedPasResolverError('Duplicate identifier "Id" at test1.pp(6,6)',nDuplicateIdentifier);
+  SetExpectedPasResolverError('Duplicate identifier "Id" at test1.pp(6,7)',nDuplicateIdentifier);
   ConvertProgram;
 end;
 
@@ -12742,7 +12742,7 @@ begin
   Add('    procedure Proc(Sender: tobject); virtual; abstract;');
   Add('  end;');
   Add('begin');
-  SetExpectedPasResolverError('Duplicate identifier "Proc" at test1.pp(6,18)',
+  SetExpectedPasResolverError('Duplicate identifier "Proc" at test1.pp(6,19)',
     nDuplicateIdentifier);
   ConvertProgram;
 end;