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

0004176: Duplicate local with diff caps don't show errors

Browse Source 
0004192: Fix for ErTypeMismatch in TPSExec.DoBooleanCalc 
0004443: public.pascalscript: uPSComponentExt.pas issue 
0003310: bugfix for PascalScript
fix for casing of dll exports

git-svn-id: http://code.remobjects.com/svn/pascalscript@35 5c9d2617-0215-0410-a2ee-e80e04d1c6d8
This commit is contained in:
carlokok 2007-09-13 15:53:58 +00:00
parent 6ecd1680dc
commit c9afc33bdf
12 changed files with 443 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/BuildPackages_D11.groupproj Normal file
View File

@ -0,0 +1,44 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{301d154e-a852-4e08-89a3-6bfb2774fb38}</ProjectGuid>
</PropertyGroup>
<ItemGroup />
<ItemGroup>
<Projects Include="PascalScript_Core_D11.dproj" />
<Projects Include="PascalScript_RO_D11.dproj" />
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Default.Personality</Borland.Personality>
<Borland.ProjectType />
<BorlandProject>
<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Target Name="PascalScript_Core_D11">
<MSBuild Projects="PascalScript_Core_D11.dproj" Targets="" />
</Target>
<Target Name="PascalScript_Core_D11:Clean">
<MSBuild Projects="PascalScript_Core_D11.dproj" Targets="Clean" />
</Target>
<Target Name="PascalScript_Core_D11:Make">
<MSBuild Projects="PascalScript_Core_D11.dproj" Targets="Make" />
</Target>
<Target Name="PascalScript_RO_D11">
<MSBuild Projects="PascalScript_RO_D11.dproj" Targets="" />
</Target>
<Target Name="PascalScript_RO_D11:Clean">
<MSBuild Projects="PascalScript_RO_D11.dproj" Targets="Clean" />
</Target>
<Target Name="PascalScript_RO_D11:Make">
<MSBuild Projects="PascalScript_RO_D11.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="PascalScript_Core_D11;PascalScript_RO_D11" />
</Target>
<Target Name="Clean">
<CallTarget Targets="PascalScript_Core_D11:Clean;PascalScript_RO_D11:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="PascalScript_Core_D11:Make;PascalScript_RO_D11:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

76
Source/PascalScript_Core_D11.dpk Normal file
View File

@ -0,0 +1,76 @@
package PascalScript_Core_D11;
{$R *.res}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'RemObjects Pascal Script - Core Package'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}
requires
rtl,
vcl,
dbrtl;
contains
uPSC_extctrls in 'uPSC_extctrls.pas',
uPSC_forms in 'uPSC_forms.pas',
uPSC_graphics in 'uPSC_graphics.pas',
uPSC_menus in 'uPSC_menus.pas',
uPSC_std in 'uPSC_std.pas',
uPSC_stdctrls in 'uPSC_stdctrls.pas',
uPSCompiler in 'uPSCompiler.pas',
uPSComponent in 'uPSComponent.pas',
uPSComponent_COM in 'uPSComponent_COM.pas',
uPSComponent_Controls in 'uPSComponent_Controls.pas',
uPSComponent_DB in 'uPSComponent_DB.pas',
uPSComponent_Default in 'uPSComponent_Default.pas',
uPSComponent_Forms in 'uPSComponent_Forms.pas',
uPSComponent_StdCtrls in 'uPSComponent_StdCtrls.pas',
uPSDebugger in 'uPSDebugger.pas',
uPSDisassembly in 'uPSDisassembly.pas',
uPSPreProcessor in 'uPSPreProcessor.pas',
uPSR_buttons in 'uPSR_buttons.pas',
uPSR_classes in 'uPSR_classes.pas',
uPSR_comobj in 'uPSR_comobj.pas',
uPSR_controls in 'uPSR_controls.pas',
uPSR_dateutils in 'uPSR_dateutils.pas',
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_menus in 'uPSR_menus.pas',
uPSR_std in 'uPSR_std.pas',
uPSR_stdctrls in 'uPSR_stdctrls.pas',
uPSRuntime in 'uPSRuntime.pas',
uPSUtils in 'uPSUtils.pas',
uPSC_buttons in 'uPSC_buttons.pas',
uPSC_classes in 'uPSC_classes.pas',
uPSC_comobj in 'uPSC_comobj.pas',
uPSC_controls in 'uPSC_controls.pas',
uPSC_dateutils in 'uPSC_dateutils.pas',
uPSC_DB in 'uPSC_DB.pas',
uPSC_dll in 'uPSC_dll.pas',
PascalScript_Core_Reg in 'PascalScript_Core_Reg.pas';
end.

112
Source/PascalScript_Core_D11.dproj Normal file
View File

@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{634be604-b73a-4b3d-bc81-719c905199e6}</ProjectGuid>
<MainSource>PascalScript_Core_D11.dpk</MainSource>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>..\Dcu\D11\PascalScript_Core_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
<DCC_DebugInformation>False</DCC_DebugInformation>
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_DcuOutput>..\Dcu\D10</DCC_DcuOutput>
<DCC_ObjOutput>..\Dcu\D10</DCC_ObjOutput>
<DCC_HppOutput>..\Dcu\D10</DCC_HppOutput>
<DCC_BplOutput>..\Dcu\D10</DCC_BplOutput>
<DCC_DcpOutput>..\Dcu\D10</DCC_DcpOutput>
<DCC_UnitSearchPath>..\Dcu\D10</DCC_UnitSearchPath>
<DCC_ResourcePath>..\Dcu\D10</DCC_ResourcePath>
<DCC_ObjPath>..\Dcu\D10</DCC_ObjPath>
<DCC_IncludePath>..\Dcu\D10</DCC_IncludePath>
<DCC_Define>RELEASE</DCC_Define>
<DCC_SYMBOL_DEPRECATED>False</DCC_SYMBOL_DEPRECATED>
<DCC_SYMBOL_LIBRARY>False</DCC_SYMBOL_LIBRARY>
<DCC_SYMBOL_PLATFORM>False</DCC_SYMBOL_PLATFORM>
<DCC_SYMBOL_EXPERIMENTAL>False</DCC_SYMBOL_EXPERIMENTAL>
<DCC_UNIT_LIBRARY>False</DCC_UNIT_LIBRARY>
<DCC_UNIT_PLATFORM>False</DCC_UNIT_PLATFORM>
<DCC_UNIT_DEPRECATED>False</DCC_UNIT_DEPRECATED>
<DCC_UNIT_EXPERIMENTAL>False</DCC_UNIT_EXPERIMENTAL>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<Version>7.0</Version>
<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
<DCC_DcuOutput>..\Dcu\D11</DCC_DcuOutput>
<DCC_ObjOutput>..\Dcu\D11</DCC_ObjOutput>
<DCC_HppOutput>..\Dcu\D11</DCC_HppOutput>
<DCC_BplOutput>..\Dcu\D11</DCC_BplOutput>
<DCC_DcpOutput>..\Dcu\D11</DCC_DcpOutput>
<DCC_UnitSearchPath>..\Dcu\D11</DCC_UnitSearchPath>
<DCC_ResourcePath>..\Dcu\D11</DCC_ResourcePath>
<DCC_ObjPath>..\Dcu\D11</DCC_ObjPath>
<DCC_IncludePath>..\Dcu\D11</DCC_IncludePath>
<DCC_SYMBOL_DEPRECATED>False</DCC_SYMBOL_DEPRECATED>
<DCC_SYMBOL_LIBRARY>False</DCC_SYMBOL_LIBRARY>
<DCC_SYMBOL_PLATFORM>False</DCC_SYMBOL_PLATFORM>
<DCC_SYMBOL_EXPERIMENTAL>False</DCC_SYMBOL_EXPERIMENTAL>
<DCC_UNIT_LIBRARY>False</DCC_UNIT_LIBRARY>
<DCC_UNIT_PLATFORM>False</DCC_UNIT_PLATFORM>
<DCC_UNIT_DEPRECATED>False</DCC_UNIT_DEPRECATED>
<DCC_UNIT_EXPERIMENTAL>False</DCC_UNIT_EXPERIMENTAL>
</PropertyGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">RemObjects Pascal Script - Core Package</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">True</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">442</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">RemObjects Software</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></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">Tuesday, March 21, 2006 1:32 PM</VersionInfoKeys><VersionInfoKeys Name="Compile Date">Monday, February 28, 2005 3:33 PM</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">PascalScript_Core_D11.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="PascalScript_Core_D11.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\dbrtl.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\rtl.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\vcl.dcp" />
<DCCReference Include="PascalScript_Core_Reg.pas" />
<DCCReference Include="uPSCompiler.pas" />
<DCCReference Include="uPSComponent.pas" />
<DCCReference Include="uPSComponent_COM.pas" />
<DCCReference Include="uPSComponent_Controls.pas" />
<DCCReference Include="uPSComponent_DB.pas" />
<DCCReference Include="uPSComponent_Default.pas" />
<DCCReference Include="uPSComponent_Forms.pas" />
<DCCReference Include="uPSComponent_StdCtrls.pas" />
<DCCReference Include="uPSC_buttons.pas" />
<DCCReference Include="uPSC_classes.pas" />
<DCCReference Include="uPSC_comobj.pas" />
<DCCReference Include="uPSC_controls.pas" />
<DCCReference Include="uPSC_dateutils.pas" />
<DCCReference Include="uPSC_DB.pas" />
<DCCReference Include="uPSC_dll.pas" />
<DCCReference Include="uPSC_extctrls.pas" />
<DCCReference Include="uPSC_forms.pas" />
<DCCReference Include="uPSC_graphics.pas" />
<DCCReference Include="uPSC_menus.pas" />
<DCCReference Include="uPSC_std.pas" />
<DCCReference Include="uPSC_stdctrls.pas" />
<DCCReference Include="uPSDebugger.pas" />
<DCCReference Include="uPSDisassembly.pas" />
<DCCReference Include="uPSPreProcessor.pas" />
<DCCReference Include="uPSRuntime.pas" />
<DCCReference Include="uPSR_buttons.pas" />
<DCCReference Include="uPSR_classes.pas" />
<DCCReference Include="uPSR_comobj.pas" />
<DCCReference Include="uPSR_controls.pas" />
<DCCReference Include="uPSR_dateutils.pas" />
<DCCReference Include="uPSR_DB.pas" />
<DCCReference Include="uPSR_dll.pas" />
<DCCReference Include="uPSR_extctrls.pas" />
<DCCReference Include="uPSR_forms.pas" />
<DCCReference Include="uPSR_graphics.pas" />
<DCCReference Include="uPSR_menus.pas" />
<DCCReference Include="uPSR_std.pas" />
<DCCReference Include="uPSR_stdctrls.pas" />
<DCCReference Include="uPSUtils.pas" />
</ItemGroup>
</Project>

BIN
Source/PascalScript_Core_D11.res Normal file
View File

Binary file not shown.

47
Source/PascalScript_RO_D11.dpk Normal file
View File

@ -0,0 +1,47 @@
package PascalScript_RO_D11;
{$R *.res}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'RemObjects Pascal Script - RemObjects SDK 5.0 Integration'}
{$IMPLICITBUILD OFF}
requires
rtl,
{$IFDEF RemObjects_INDY9}
Indy,
{$ELSE}
IndyCore, IndySystem, IndyProtocols,
{$ENDIF}
PascalScript_Core_D11,
RemObjects_Core_D11,
RemObjects_Indy_D11,
dbrtl,
vcl,
vclx;
contains
PascalScript_RO_Reg in 'PascalScript_RO_Reg.pas',
uROPSServerLink in 'uROPSServerLink.pas',
uROPSImports in 'uROPSImports.pas';
end.

81
Source/PascalScript_RO_D11.dproj Normal file
View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{0eefdf9b-7853-40e5-9b29-b631f51beeda}</ProjectGuid>
<MainSource>PascalScript_RO_D11.dpk</MainSource>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>..\Dcu\D11\PascalScript_RO_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
<DCC_DebugInformation>False</DCC_DebugInformation>
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_DcuOutput>..\Dcu\D9</DCC_DcuOutput>
<DCC_ObjOutput>..\Dcu\D9</DCC_ObjOutput>
<DCC_HppOutput>..\Dcu\D9</DCC_HppOutput>
<DCC_BplOutput>..\Dcu\D9</DCC_BplOutput>
<DCC_UnitSearchPath>..\Dcu\D9;$(BDS)\lib\Indy9;..\..\RemObjects SDK for Dephi\Dcu\D9</DCC_UnitSearchPath>
<DCC_ResourcePath>..\Dcu\D9;$(BDS)\lib\Indy9;..\..\RemObjects SDK for Dephi\Dcu\D9</DCC_ResourcePath>
<DCC_ObjPath>..\Dcu\D9;$(BDS)\lib\Indy9;..\..\RemObjects SDK for Dephi\Dcu\D9</DCC_ObjPath>
<DCC_IncludePath>..\Dcu\D9;$(BDS)\lib\Indy9;..\..\RemObjects SDK for Dephi\Dcu\D9</DCC_IncludePath>
<DCC_Define>RELEASE</DCC_Define>
<DCC_SYMBOL_DEPRECATED>False</DCC_SYMBOL_DEPRECATED>
<DCC_SYMBOL_LIBRARY>False</DCC_SYMBOL_LIBRARY>
<DCC_SYMBOL_PLATFORM>False</DCC_SYMBOL_PLATFORM>
<DCC_SYMBOL_EXPERIMENTAL>False</DCC_SYMBOL_EXPERIMENTAL>
<DCC_UNIT_LIBRARY>False</DCC_UNIT_LIBRARY>
<DCC_UNIT_PLATFORM>False</DCC_UNIT_PLATFORM>
<DCC_UNIT_DEPRECATED>False</DCC_UNIT_DEPRECATED>
<DCC_UNIT_EXPERIMENTAL>False</DCC_UNIT_EXPERIMENTAL>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<Version>7.0</Version>
<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
<DCC_DcuOutput>..\Dcu\D11</DCC_DcuOutput>
<DCC_ObjOutput>..\Dcu\D11</DCC_ObjOutput>
<DCC_HppOutput>..\Dcu\D11</DCC_HppOutput>
<DCC_BplOutput>..\Dcu\D11</DCC_BplOutput>
<DCC_UnitSearchPath>..\Dcu\D11;..\..\RemObjects SDK for Dephi\Dcu\D11</DCC_UnitSearchPath>
<DCC_ResourcePath>..\Dcu\D11;..\..\RemObjects SDK for Dephi\Dcu\D11</DCC_ResourcePath>
<DCC_ObjPath>..\Dcu\D11;..\..\RemObjects SDK for Dephi\Dcu\D11</DCC_ObjPath>
<DCC_IncludePath>..\Dcu\D11;..\..\RemObjects SDK for Dephi\Dcu\D11</DCC_IncludePath>
<DCC_SYMBOL_DEPRECATED>False</DCC_SYMBOL_DEPRECATED>
<DCC_SYMBOL_LIBRARY>False</DCC_SYMBOL_LIBRARY>
<DCC_SYMBOL_PLATFORM>False</DCC_SYMBOL_PLATFORM>
<DCC_SYMBOL_EXPERIMENTAL>False</DCC_SYMBOL_EXPERIMENTAL>
<DCC_UNIT_LIBRARY>False</DCC_UNIT_LIBRARY>
<DCC_UNIT_PLATFORM>False</DCC_UNIT_PLATFORM>
<DCC_UNIT_DEPRECATED>False</DCC_UNIT_DEPRECATED>
<DCC_UNIT_EXPERIMENTAL>False</DCC_UNIT_EXPERIMENTAL>
<DCC_DcpOutput>..\Dcu\D11</DCC_DcpOutput>
</PropertyGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">RemObjects Pascal Script - RemObjects SDK 5.0 Integration</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">442</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">RemObjects Software</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></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">Tuesday, March 21, 2006 1:32 PM</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">PascalScript_RO_D11.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="PascalScript_RO_D11.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\dbrtl.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\IndyCore.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\IndyProtocols.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\IndySystem.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\PascalScript_Core_D11.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\rtl.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\vcl.dcp" />
<DCCReference Include="..\..\..\Stardock\Object Desktop\DeskScapes\vclx.dcp" />
<DCCReference Include="PascalScript_RO_Reg.pas" />
<DCCReference Include="uROPSImports.pas" />
<DCCReference Include="uROPSServerLink.pas" />
</ItemGroup>
</Project>

BIN
Source/PascalScript_RO_D11.res Normal file
View File

Binary file not shown.

8
Source/changelog.txt
View File

@ -1,4 +1,12 @@
Sept 2007
- 0004176: Duplicate local with diff caps don't show errors
- 0004192: Fix for ErTypeMismatch in TPSExec.DoBooleanCalc
- 0004443: public.pascalscript: uPSComponentExt.pas issue
- 0003310: bugfix for PascalScript
- fix for casing of dll exports
April 2007 April 2007
- 11 apr: 0003310: bugfix for PascalScript in uPSComponentExt; Simon Forsberg
- 5 apr: 0003274: Finally inside except block does not reset exception (reported by Martijn Laan) - 5 apr: 0003274: Finally inside except block does not reset exception (reported by Martijn Laan)
- 5 apr: Fix by Fabio Lindner: using AND on booleans and notification variants - 5 apr: Fix by Fabio Lindner: using AND on booleans and notification variants

8
Source/uPSC_dll.pas
View File

@ -23,7 +23,7 @@ const
function DllExternalProc(Sender: TPSPascalCompiler; Decl: TPSParametersDecl; const Name, FExternal: string): TPSRegProc; function DllExternalProc(Sender: TPSPascalCompiler; Decl: TPSParametersDecl; const OriginalName, FExternal: string): TPSRegProc;
type type
TDllCallingConvention = (clRegister TDllCallingConvention = (clRegister
@ -56,16 +56,19 @@ begin
if (Result <> '') and (Result[Length(result)] = '"') then delete(result, length(result), 1); if (Result <> '') and (Result[Length(result)] = '"') then delete(result, length(result), 1);
end; end;
function DllExternalProc(Sender: TPSPascalCompiler; Decl: TPSParametersDecl; const Name, FExternal: string): TPSRegProc; function DllExternalProc(Sender: TPSPascalCompiler; Decl: TPSParametersDecl; const OriginalName, FExternal: string): TPSRegProc;
var var
FuncName, FuncName,
Name,
FuncCC, s: string; FuncCC, s: string;
CC: TDllCallingConvention; CC: TDllCallingConvention;
DelayLoad: Boolean; DelayLoad: Boolean;
begin begin
Name := FastUpperCase(OriginalName);
DelayLoad := False; DelayLoad := False;
FuncCC := FExternal; FuncCC := FExternal;
if (pos('@', FuncCC) = 0) then if (pos('@', FuncCC) = 0) then
begin begin
Sender.MakeError('', ecCustomError, RPS_Invalid_External); Sender.MakeError('', ecCustomError, RPS_Invalid_External);
@ -122,6 +125,7 @@ begin
Result.ImportDecl := FuncName; Result.ImportDecl := FuncName;
Result.Decl.Assign(Decl); Result.Decl.Assign(Decl);
Result.Name := Name; Result.Name := Name;
Result.OrgName := OriginalName;
Result.ExportName := False; Result.ExportName := False;
end; end;

4
Source/uPSCompiler.pas
View File

@ -4072,7 +4072,7 @@ begin
for l := proc.ProcVars.Count - 1 downto 0 do for l := proc.ProcVars.Count - 1 downto 0 do
begin begin
if (PIFPSProcVar(proc.ProcVars.Data[l]).NameHash = h) and if (PIFPSProcVar(proc.ProcVars.Data[l]).NameHash = h) and
(TPSVar(proc.ProcVars.Data[l]).Name = s) then (PIFPSProcVar(proc.ProcVars.Data[l]).Name = s) then
begin begin
Result := True; Result := True;
exit; exit;
@ -4726,7 +4726,7 @@ begin
MakeError('', ecSemicolonExpected, ''); MakeError('', ecSemicolonExpected, '');
exit; exit;
end; end;
pp := FOnExternalProc(Self, FunctionDecl, FunctionName, FunctionParamNames); pp := FOnExternalProc(Self, FunctionDecl, OriginalName, FunctionParamNames);
if pp = nil then if pp = nil then
begin begin
MakeError('', ecCustomError, ''); MakeError('', ecCustomError, '');

61
Source/uPSComponentExt.pas
View File

@ -202,6 +202,7 @@ end;
destructor TPSScriptExtension.Destroy; destructor TPSScriptExtension.Destroy;
begin begin
FMethodList.Free; FMethodList.Free;
FMethodList := nil;
inherited Destroy; inherited Destroy;
end; end;
@ -545,6 +546,7 @@ procedure TPSScriptExtension.Notification(AComponent: TComponent;
begin begin
inherited; inherited;
If Operation = opRemove then begin If Operation = opRemove then begin
if MethodList <> nil then
MethodList.SetMethodName(aComponent,'',''); MethodList.SetMethodName(aComponent,'','');
end; end;
end; end;
@ -676,15 +678,61 @@ var
nProcs : Integer; nProcs : Integer;
line, test : String; line, test : String;
function IsItem(line,item:String; First :Boolean = false):Boolean; function IsItem(line,item:String; First :Boolean = false):Boolean;
var var
nPos : Integer; nPos : Integer;
begin begin
repeat
nPos := pos(item,line); nPos := pos(item,line);
result := ((npos>0) and ((length(Line)-nPos<= length(item)) or not(line[nPos+length(item)] in ['0'..'9','A'..'Z','_'])) And result := ((npos>0) and ((length(Line)-nPos<= length(item)) or not(line[nPos+length(item)] in ['0'..'9','A'..'Z','_'])) And
((Npos = 1) or ((not first) and not(line[nPos-1] in ['0'..'9','A'..'Z','_'])))); ((Npos = 1) or ((not first) and not(line[nPos-1] in ['0'..'9','A'..'Z','_']))));
if nPos <> 0 then line := copy(line,nPos+Length(Item),Length(line));
until (Result) or (nPos = 0);
end; end;
function DelSpaces(AText: String): String;
var i: Integer;
begin
Result := '';
for i := 1 to Length(AText) do
if AText[i] <> ' ' then
Result := Result + AText[i];
end;
function IsProcDecl(AnOriginalProcDecl: String): Boolean;
var
bIsFunc: Boolean;
iLineNo: Integer;
sProcKey: String;
sProcDecl: String;
begin
Result := false;
sProcDecl := Line;
iLineNo := x;
bIsFunc := isItem(AnOriginalProcDecl,'FUNCTION',true);
if bIsFunc
then sProcKey := 'FUNCTION'
else sProcKey := 'PROCEDURE';
sProcDecl := copy(sProcDecl,Pos(sProcKey,sProcDecl),Length(sProcDecl));
while not IsItem(sProcDecl,'BEGIN') do
begin
inc(iLineNo);
if iLineNo > (fowner.script.Count - 1) then exit;
sProcDecl := sProcDecl + ' ' + uppercase(trim(fowner.script[iLineNo])) + ' ';
end;
sProcDecl := DelSpaces(sProcDecl);
AnOriginalProcDecl := DelSpaces(AnOriginalProcDecl);
sProcDecl := copy(sProcDecl,1,Length(AnOriginalProcDecl));
Result := sProcDecl = AnOriginalProcDecl;
end;
begin begin
sl := TStringList.create; sl := TStringList.create;
Try Try
@ -701,23 +749,26 @@ begin
Line := fowner.script[x]; Line := fowner.script[x];
Line := uppercase(trim(line)); Line := uppercase(trim(line));
If IsItem(line,'PROCEDURE', true) or IsItem(line,'FUNCTION', true) then begin If IsItem(line,'PROCEDURE', true) or IsItem(line,'FUNCTION', true) then begin
If nBegins >0 then Raise exception.create('Missing some ''End'' statments'); If nBegins >0 then Raise exception.create('Missing some ''end'' statments');
If (nProcs = 0) and (line = test) then If (nProcs = 0) and IsProcDecl(test) and
(not IsItem(line,'FORWARD')) and (not IsItem(line,'EXTERNAL')) then
Exit; Exit;
Inc(nProcs); Inc(nProcs);
end; end;
if IsItem(line,'FORWARD') or IsItem(line,'EXTERNAL') then
dec(nProcs);
If Pos('END',line) < Pos('BEGIN',line) then begin If Pos('END',line) < Pos('BEGIN',line) then begin
If IsItem(line,'END') then begin If IsItem(line,'END') then begin
If (nBegins = 0) and (nProcs=0) then Break; If (nBegins = 0) and (nProcs=0) then Break;
Dec(nBegins); Dec(nBegins);
If nBegins = 0 then Dec(nProcs); If nBegins = 0 then Dec(nProcs);
end; end;
If IsItem(line,'BEGIN') or IsItem(line,'TRY') then begin If IsItem(line,'BEGIN') or IsItem(line,'TRY') or IsItem(line,'CASE') then begin
If nProcs = 0 then Break; If nProcs = 0 then Break;
Inc(nBegins); Inc(nBegins);
end; end;
end else begin end else begin
If IsItem(line,'BEGIN') or IsItem(line,'TRY') then begin If IsItem(line,'BEGIN') or IsItem(line,'TRY') or IsItem(line,'CASE') then begin
If nProcs = 0 then Break; If nProcs = 0 then Break;
Inc(nBegins); Inc(nBegins);
end; end;
@ -733,7 +784,7 @@ begin
Try Try
If (nProcs <> 0) or (nBegins<>0) then If (nProcs <> 0) or (nBegins<>0) then
Raise exception.create(sMissingEndStatment); Raise exception.create(sMissingEndStatment);
If (Not Ontop) and (x>0) and (TRim(FOwner.script[x-1])<>'') then begin If (Not Ontop) and (x>0) and (Trim(FOwner.script[x-1])<>'') then begin
FOwner.script.Insert(x,''); FOwner.script.Insert(x,'');
inc(x); inc(x);
end; end;

1
Source/uPSRuntime.pas
View File

@ -4371,6 +4371,7 @@ var
btS16: tbts16(Into^) := Longint(b); btS16: tbts16(Into^) := Longint(b);
btU32: tbtu32(Into^) := Cardinal(b); btU32: tbtu32(Into^) := Cardinal(b);
btS32: tbts32(Into^) := Longint(b); btS32: tbts32(Into^) := Longint(b);
btVariant: Variant(Into^) := b;
else begin else begin
CMD_Err(ErTypeMismatch); CMD_Err(ErTypeMismatch);
Ok := False; Ok := False;