Delphi/pascalscript
Delphi/pascalscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FPC compilation issues

Browse Source 
git-svn-id: http://code.remobjects.com/svn/pascalscript@32 5c9d2617-0215-0410-a2ee-e80e04d1c6d8
This commit is contained in:
carlokok 2007-03-16 09:59:59 +00:00
parent 8691cd91cc
commit 006e13f9fe
4 changed files with 438 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/uPSCompiler.pas
View File

@ -5272,7 +5272,7 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
Result := IsCompatibleType(p1, p2, False); Result := IsCompatibleType(p1, p2, False);
end; end;
function ProcessFunction(ProcCall: TPSValueProc; ResultRegister: TPSValue): Boolean; forward; function _ProcessFunction(ProcCall: TPSValueProc; ResultRegister: TPSValue): Boolean; forward;
function ProcessFunction2(ProcNo: Cardinal; Par: TPSParameters; ResultReg: TPSValue): Boolean; function ProcessFunction2(ProcNo: Cardinal; Par: TPSParameters; ResultReg: TPSValue): Boolean;
var var
Temp: TPSValueProcNo; Temp: TPSValueProcNo;
@ -5284,7 +5284,7 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
Temp.ResultType := TPSInternalProcedure(FProcs[ProcNo]).Decl.Result Temp.ResultType := TPSInternalProcedure(FProcs[ProcNo]).Decl.Result
else else
Temp.ResultType := TPSExternalProcedure(FProcs[ProcNo]).RegProc.Decl.Result; Temp.ResultType := TPSExternalProcedure(FProcs[ProcNo]).RegProc.Decl.Result;
Result := ProcessFunction(Temp, ResultReg); Result := _ProcessFunction(Temp, ResultReg);
Temp.Parameters := nil; Temp.Parameters := nil;
Temp.Free; Temp.Free;
end; end;
@ -6210,7 +6210,7 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
l := FindProc('WSTRSET') l := FindProc('WSTRSET')
else else
{$ENDIF} {$ENDIF}
l := FindProc('STRSET'); l := FindProc('STRSET');
if l = -1 then if l = -1 then
begin begin
MakeError('', ecUnknownIdentifier, 'StrSet'); MakeError('', ecUnknownIdentifier, 'StrSet');
@ -6273,7 +6273,7 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
l := FindProc('WSTRGET') l := FindProc('WSTRGET')
else else
{$ENDIF} {$ENDIF}
l := FindProc('STRGET'); l := FindProc('STRGET');
if l = -1 then if l = -1 then
begin begin
MakeError('', ecUnknownIdentifier, 'StrGet'); MakeError('', ecUnknownIdentifier, 'StrGet');
@ -6288,7 +6288,7 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
tmp3.ResultType := FindBaseType(btWideChar) tmp3.ResultType := FindBaseType(btWideChar)
else else
{$ENDIF} {$ENDIF}
tmp3.ResultType := FindBaseType(btChar); tmp3.ResultType := FindBaseType(btChar);
tmp3.ProcNo := L; tmp3.ProcNo := L;
tmp3.SetParserPos(FParser); tmp3.SetParserPos(FParser);
tmp3.Parameters := TPSParameters.Create; tmp3.Parameters := TPSParameters.Create;
@ -6387,7 +6387,7 @@ function TPSPascalCompiler.ProcessSub(BlockInfo: TPSBlockInfo): Boolean;
FParser.Next; FParser.Next;
if u.BaseType = btRecord then if u.BaseType = btRecord then
begin begin
t := FindSubR(FParser.GetToken, u); t := FindSubR(FParser.GetToken, u);
if t = InvalidVal then if t = InvalidVal then
begin begin
if ImplicitPeriod then exit; if ImplicitPeriod then exit;
@ -8823,7 +8823,7 @@ begin
end; end;
if InData is TPSValueProc then if InData is TPSValueProc then
begin begin
Result := ProcessFunction(TPSValueProc(indata), OutReg) Result := _ProcessFunction(TPSValueProc(indata), OutReg)
end else begin end else begin
if not PreWriteOutRec(OutReg, nil) then if not PreWriteOutRec(OutReg, nil) then
begin begin
@ -8877,7 +8877,7 @@ begin
end; {WriteCalculation} end; {WriteCalculation}
function ProcessFunction(ProcCall: TPSValueProc; ResultRegister: TPSValue): Boolean; function _ProcessFunction(ProcCall: TPSValueProc; ResultRegister: TPSValue): Boolean;
var var
res: TPSType; res: TPSType;
tmp: TPSParameter; tmp: TPSParameter;
@ -9527,7 +9527,7 @@ begin
Result := True; Result := True;
end; {ProcessIf} end; {ProcessIf}
function ProcessLabel: Longint; {0 = failed; 1 = successful; 2 = no label} function _ProcessLabel: Longint; {0 = failed; 1 = successful; 2 = no label}
var var
I, H: Longint; I, H: Longint;
s: string; s: string;
@ -9596,7 +9596,7 @@ begin
vout.Free; vout.Free;
end else if vin is TPSValueProc then end else if vin is TPSValueProc then
begin begin
Result := ProcessFunction(TPSValueProc(vin), nil); Result := _ProcessFunction(TPSValueProc(vin), nil);
vin.Free; vin.Free;
Exit; Exit;
end else end else
@ -10142,7 +10142,7 @@ begin
end; end;
CSTI_Identifier: CSTI_Identifier:
begin begin
case ProcessLabel of case _ProcessLabel of
0: Exit; 0: Exit;
1: ; 1: ;
else else

1
Source/uPSComponent_DB.pas
View File

@ -1,6 +1,7 @@
unit uPSComponent_DB; unit uPSComponent_DB;
interface interface
{$I PascalScript.inc}
uses uses
SysUtils, Classes, uPSComponent, uPSRuntime, uPSCompiler; SysUtils, Classes, uPSComponent, uPSRuntime, uPSCompiler;
type type

2
Source/uPSR_dateutils.pas
View File

@ -1,6 +1,6 @@
unit uPSR_dateutils; unit uPSR_dateutils;
{$I PascalScript.inc}
interface interface
uses uses
SysUtils, uPSRuntime; SysUtils, uPSRuntime;

6
Source/uPSUtils.pas
View File

@ -1092,13 +1092,13 @@ var
end; end;
//------------------------------------------------------------------- //-------------------------------------------------------------------
function GetToken(CurrTokenPos, CurrTokenLen: Cardinal): string; function _GetToken(CurrTokenPos, CurrTokenLen: Cardinal): string;
var var
s: string; s: string;
begin begin
SetLength(s, CurrTokenLen); SetLength(s, CurrTokenLen);
Move(FText[CurrTokenPos], S[1], CurrtokenLen); Move(FText[CurrTokenPos], S[1], CurrtokenLen);
GetToken := s; Result := s;
end; end;
function ParseToken(var CurrTokenPos, CurrTokenLen: Cardinal; var CurrTokenId: TPSPasToken): TPSParserErrorKind; function ParseToken(var CurrTokenPos, CurrTokenLen: Cardinal; var CurrTokenId: TPSPasToken): TPSParserErrorKind;
@ -1124,7 +1124,7 @@ var
end; end;
CurrTokenLen := ci - ct; CurrTokenLen := ci - ct;
FLastUpToken := GetToken(CurrTokenPos, CurrtokenLen); FLastUpToken := _GetToken(CurrTokenPos, CurrtokenLen);
p := pchar(FLastUpToken); p := pchar(FLastUpToken);
while p^<>#0 do while p^<>#0 do
begin begin