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

0004975: bug fixed uPSRuntime.pas

Browse Source 
git-svn-id: http://code.remobjects.com/svn/pascalscript@52 5c9d2617-0215-0410-a2ee-e80e04d1c6d8
This commit is contained in:
carlokok 2008-01-22 11:24:48 +00:00
parent 8b2822e520
commit 7cc0140937
18 changed files with 92 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Source/BuildPackages_D10.groupproj Normal file
View File

@ -0,0 +1,40 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{baff68a2-38f9-4c8c-b423-9ed555fd31df}</ProjectGuid>
</PropertyGroup>
<ItemGroup />
<ItemGroup />
<ProjectExtensions>
<Borland.Personality>Default.Personality</Borland.Personality>
<Borland.ProjectType />
<BorlandProject>
<BorlandProject xmlns=""> <Default.Personality> </Default.Personality> </BorlandProject></BorlandProject>
</ProjectExtensions>
<Target Name="PascalScript_Core_D10">
<MSBuild Projects="PascalScript_Core_D10.dproj" Targets="" />
</Target>
<Target Name="PascalScript_Core_D10:Clean">
<MSBuild Projects="PascalScript_Core_D10.dproj" Targets="Clean" />
</Target>
<Target Name="PascalScript_Core_D10:Make">
<MSBuild Projects="PascalScript_Core_D10.dproj" Targets="Make" />
</Target>
<Target Name="PascalScript_RO_D10">
<MSBuild Projects="PascalScript_RO_D10.dproj" Targets="" />
</Target>
<Target Name="PascalScript_RO_D10:Clean">
<MSBuild Projects="PascalScript_RO_D10.dproj" Targets="Clean" />
</Target>
<Target Name="PascalScript_RO_D10:Make">
<MSBuild Projects="PascalScript_RO_D10.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="PascalScript_Core_D10;PascalScript_RO_D10" />
</Target>
<Target Name="Clean">
<CallTarget Targets="PascalScript_Core_D10:Clean;PascalScript_RO_D10:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="PascalScript_Core_D10:Make;PascalScript_RO_D10:Make" />
</Target>
</Project>

10
Source/PascalScript_Core_D10.bdsproj
View File

@ -149,10 +149,10 @@
<VersionInfo>
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">0</VersionInfo>
<VersionInfo Name="MajorVer">0</VersionInfo>
<VersionInfo Name="MajorVer">3</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">0</VersionInfo>
<VersionInfo Name="Build">0</VersionInfo>
<VersionInfo Name="Release">6</VersionInfo>
<VersionInfo Name="Build">442</VersionInfo>
<VersionInfo Name="Debug">0</VersionInfo>
<VersionInfo Name="PreRelease">0</VersionInfo>
<VersionInfo Name="Special">0</VersionInfo>
@ -164,14 +164,14 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName">RemObjects Software</VersionInfoKeys>
<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">0.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">3.0.6.442</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"></VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName">Pascal Script</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">3.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="CompileDate">Monday, December 19, 2005 4:43 PM</VersionInfoKeys> <VersionInfoKeys Name="Compile Date">Monday, February 28, 2005 3:33 PM</VersionInfoKeys>
<VersionInfoKeys Name="CompileDate">Tuesday, March 21, 2006 1:32 PM</VersionInfoKeys> <VersionInfoKeys Name="Compile Date">Monday, February 28, 2005 3:33 PM</VersionInfoKeys>
</VersionInfoKeys>
</Delphi.Personality>
</BorlandProject>

BIN
Source/PascalScript_Core_D10.res
View File

Binary file not shown.

4
Source/PascalScript_Core_D3.dpk
View File

@ -57,8 +57,8 @@ contains
uPSR_DB in 'uPSR_DB.pas',
uPSR_dll in 'uPSR_dll.pas',
uPSR_extctrls in 'uPSR_extctrls.pas',
UPSR_forms in 'uPSR_forms.pas',
UPSR_graphics in 'uPSR_graphics.pas',
uPSR_forms in 'uPSR_forms.pas',
uPSR_graphics in 'uPSR_graphics.pas',
uPSR_menus in 'uPSR_menus.pas',
uPSR_std in 'uPSR_std.pas',
uPSR_stdctrls in 'uPSR_stdctrls.pas',

4
Source/PascalScript_Core_D4.dpk
View File

@ -57,8 +57,8 @@ contains
uPSR_DB in 'uPSR_DB.pas',
uPSR_dll in 'uPSR_dll.pas',
uPSR_extctrls in 'uPSR_extctrls.pas',
UPSR_forms in 'uPSR_forms.pas',
UPSR_graphics in 'uPSR_graphics.pas',
uPSR_forms in 'uPSR_forms.pas',
uPSR_graphics in 'uPSR_graphics.pas',
uPSR_menus in 'uPSR_menus.pas',
uPSR_std in 'uPSR_std.pas',
uPSR_stdctrls in 'uPSR_stdctrls.pas',

4
Source/PascalScript_Core_D5.dpk
View File

@ -57,8 +57,8 @@ contains
uPSR_DB in 'uPSR_DB.pas',
uPSR_dll in 'uPSR_dll.pas',
uPSR_extctrls in 'uPSR_extctrls.pas',
UPSR_forms in 'uPSR_forms.pas',
UPSR_graphics in 'uPSR_graphics.pas',
uPSR_forms in 'uPSR_forms.pas',
uPSR_graphics in 'uPSR_graphics.pas',
uPSR_menus in 'uPSR_menus.pas',
uPSR_std in 'uPSR_std.pas',
uPSR_stdctrls in 'uPSR_stdctrls.pas',

15
Source/PascalScript_Core_D6.dof
View File

@ -101,20 +101,6 @@ Conditionals=
DebugSourceDirs=
UsePackages=0
[Version Info]
MajorVer=3
MinorVer=0
Release=2
Build=36
AutoIncBuild=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252
[Version Info Keys]
CompanyName=RemObjects Software
InternalName=
@ -125,3 +111,4 @@ ProductVersion=3.0.0.0
FileDescription=
FileVersion=3.0.2.36
OriginalFilename=

4
Source/PascalScript_Core_D6.dpk
View File

@ -57,8 +57,8 @@ contains
uPSR_DB in 'uPSR_DB.pas',
uPSR_dll in 'uPSR_dll.pas',
uPSR_extctrls in 'uPSR_extctrls.pas',
UPSR_forms in 'uPSR_forms.pas',
UPSR_graphics in 'uPSR_graphics.pas',
uPSR_forms in 'uPSR_forms.pas',
uPSR_graphics in 'uPSR_graphics.pas',
uPSR_menus in 'uPSR_menus.pas',
uPSR_std in 'uPSR_std.pas',
uPSR_stdctrls in 'uPSR_stdctrls.pas',

1
Source/PascalScript_Core_D7.cfg
View File

@ -31,7 +31,6 @@
-M
-$M16384,1048576
-K$00400000
-E"s:\exe"
-N"..\Dcu\D7"
-LE"..\Dcu\D7"
-LN"..\Dcu\D7"

25
Source/PascalScript_Core_D7.dof
View File

@ -1,6 +1,5 @@
[FileVersion]
Version=7.0
[Compiler]
A=8
B=0
@ -80,7 +79,6 @@ PrivatePropAccessor=1
UnsafeType=0
UnsafeCode=0
UnsafeCast=0
[Linker]
MapFile=0
OutputObjs=0
@ -91,7 +89,6 @@ MinStackSize=16384
MaxStackSize=1048576
ImageBase=4194304
ExeDescription=RemObjects Pascal Script - Core Package
[Directories]
OutputDir=
UnitOutputDir=..\Dcu\D7
@ -102,14 +99,23 @@ Packages=
Conditionals=
DebugSourceDirs=
UsePackages=0
[Parameters]
RunParams=
HostApplication=
Launcher=
UseLauncher=0
DebugCWD=
[Language]
ActiveLang=
ProjectLang=
RootDir=
[Version Info]
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=3
MinorVer=0
Release=2
Build=36
AutoIncBuild=0
Release=6
Build=442
Debug=0
PreRelease=0
Special=0
@ -125,5 +131,6 @@ LegalTrademarks=
ProductName=Pascal Script
ProductVersion=3.0.0.0
FileDescription=
FileVersion=3.0.2.36
FileVersion=3.0.6.442
OriginalFilename=
CompileDate=Tuesday, March 21, 2006 1:32 PM

4
Source/PascalScript_Core_D7.dpk
View File

@ -57,8 +57,8 @@ contains
uPSR_DB in 'uPSR_DB.pas',
uPSR_dll in 'uPSR_dll.pas',
uPSR_extctrls in 'uPSR_extctrls.pas',
UPSR_forms in 'uPSR_forms.pas',
UPSR_graphics in 'uPSR_graphics.pas',
uPSR_forms in 'uPSR_forms.pas',
uPSR_graphics in 'uPSR_graphics.pas',
uPSR_menus in 'uPSR_menus.pas',
uPSR_std in 'uPSR_std.pas',
uPSR_stdctrls in 'uPSR_stdctrls.pas',

BIN
Source/PascalScript_Core_D7.res
View File

Binary file not shown.

2
Source/PascalScript_Core_Reg.pas
View File

@ -28,7 +28,6 @@ uses
LResources,
{$ENDIF}
uPSComponent,
uPSComponentExt,
uPSDebugger,
uPSComponent_Default,
{$IFNDEF FPC}
@ -53,7 +52,6 @@ begin
TPSImport_Forms,
TPSImport_Controls,
TPSImport_StdCtrls,
TPSScriptExtension,
TPSCustumPlugin]);
end;

BIN
Source/PascalScript_RO_D10.res
View File

Binary file not shown.

4
Source/__Clean.bat
View File

@ -1,3 +1,5 @@
del *.bak
del *.dcu
del *.~*
del *.~*
del *.o
del *.ppu

1
Source/changelog.txt
View File

@ -1,4 +1,5 @@
Jan 2008
- 0004975: bug fixed uPSRuntime.pas
- 0004862: FPC/Lazarus please check.
- 0004870: Re: fixed bug
- 0004905: Duplicate Identifiers with constants

3
Source/uPSPreProcessor.pas
View File

@ -258,8 +258,7 @@ begin
Result := TPSLineInfo(FItems[i]);
end;
function TPSLineInfoList.GetLineInfo(Pos: Cardinal;
var Res: TPSLineInfoResults): Boolean;
function TPSLineInfoList.GetLineInfo(Pos: Cardinal; var Res: TPSLineInfoResults): Boolean;
var
i,j: Longint;
linepos: Cardinal;

15
Source/uPSRuntime.pas
View File

@ -9317,6 +9317,7 @@ begin
n := Stack[Stack.Count -2];
if (n = nil) or (n^.FType.BaseType <> btClass)or (PPSVariantClass(n).Data = nil) then
begin
Caller.CMD_Err(erNullPointerException);
result := false;
exit;
end;
@ -9461,12 +9462,14 @@ begin
n := Stack[Stack.Count -2];
if (n = nil) or (n^.FType.BaseType <> btU32) then
begin
Caller.CMD_Err(erNullPointerException);
result := false;
exit;
end;
FType := Caller.GetTypeNo(PPSVariantU32(N).Data);
if (FType = nil) then
begin
Caller.CMD_Err(erNullPointerException);
Result := False;
exit;
end;
@ -9620,6 +9623,7 @@ begin
if (n.Dta = nil) or ((n.aType.BaseType <> btClass) and (n.aType.BaseType <> btInterface)) then
begin
Result := False;
Caller.CMD_Err(erNullPointerException);
Exit;
end;
{$IFNDEF PS_NOINTERFACES}
@ -9660,6 +9664,7 @@ begin
n := NewTPSVariantIFC(Stack[Stack.Count -2], false);
if (n.dta = nil) or (n.atype.BaseType <> btInterface) or (Pointer(n.Dta^) = nil) then
begin
Caller.CMD_Err(erNullPointerException);
result := false;
exit;
end;
@ -9742,6 +9747,7 @@ begin
if (n.Dta = nil) or (n.aType.BaseType <> btclass) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := Pointer(n.dta^);
@ -9790,6 +9796,7 @@ begin
if (n.dta = nil) or (n.aType.BaseType <> btClass)then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := Pointer(n.dta^);
@ -9865,6 +9872,7 @@ begin
if (n.Dta = nil) or (n.aType.BaseType <> btClass) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := pointer(n.Dta^);
@ -9890,6 +9898,7 @@ begin
if (n.Dta = nil) or (n.aType.BaseType <> btClass) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := pointer(n.Dta^);
@ -9938,6 +9947,7 @@ begin
if (n.Dta = nil) or (n.aType.BaseType <> btClass) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := Tobject(n.dta^);
@ -9962,6 +9972,7 @@ begin
if (n.Dta = nil) or (n.aType.BaseType <> btClass) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := Tobject(n.dta^);
@ -10014,6 +10025,7 @@ begin
if (n.Dta = nil) or (n.aType.BaseType <> btClass) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := Tobject(n.dta^);
@ -10021,6 +10033,7 @@ begin
if (n.aType.BaseType <> btU32) and (n.aType.BaseType <> btProcPtr) then
begin
Result := False;
Caller.CMD_Err(erNullPointerException);
exit;
end;
n2 := CreateHeapVariant(Caller.FindType2(btDouble));
@ -10052,6 +10065,7 @@ begin
if (n.Dta = nil) or (n.aType.BaseType <> btClass) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
FSelf := Tobject(n.dta^);
@ -10059,6 +10073,7 @@ begin
if (n.Dta = nil) or ((n.aType.BaseType <> btu32) and (n.aType.BaseType <> btProcPtr)) then
begin
result := false;
Caller.CMD_Err(erNullPointerException);
exit;
end;
n2 := CreateHeapVariant(Caller.FindType2(btDouble));