Menu
▾
▴
[Instantobjects-cvscommit] SF.net SVN: instantobjects:[815] trunk
|
From: <na...@us...> - 2009-08-05 17:15:48
|
Revision: 815
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=815&view=rev
Author: nandod
Date: 2009-08-05 17:15:33 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
* Fixed error "implementation expected" when editing a class in the model expert at design time in D2009.
* svn:ignore set.
Modified Paths:
--------------
trunk/Demos/PrimerCross/ModelExternal/Model.pas
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantTextFiler.pas
trunk/Source/Design/D2009/DclIOCore.dproj
trunk/Source/PackageGroups/D2009/CorePackages.groupproj
trunk/Tests/TestModel.pas
Property Changed:
----------------
trunk/Demos/PrimerCross/ModelExternal/
trunk/Source/Brokers/ADO/D2009/
trunk/Source/Brokers/BDE/D2009/
trunk/Source/Brokers/DBX/D2009/
trunk/Source/Brokers/IBX/D2009/
trunk/Source/Catalogs/IBFb/D2009/
trunk/Source/Catalogs/MSSql/D2009/
trunk/Source/Catalogs/MySQL/D2009/
trunk/Source/Core/D2009/
trunk/Source/Design/D2009/
Property changes on: trunk/Demos/PrimerCross/ModelExternal
___________________________________________________________________
Modified: svn:ignore
- *.dcu
*.~pas
+ *.dcu
*.~pas
__history
Modified: trunk/Demos/PrimerCross/ModelExternal/Model.pas
===================================================================
--- trunk/Demos/PrimerCross/ModelExternal/Model.pas 2009-08-05 11:44:58 UTC (rev 814)
+++ trunk/Demos/PrimerCross/ModelExternal/Model.pas 2009-08-05 17:15:33 UTC (rev 815)
@@ -22,7 +22,7 @@
TPhone = class;
TAddress = class(TInstantObject)
- {IOMETADATA stored;
+ {IOMETADATA stored;
City: String(30) index;
Country: Reference(TCountry);
State: String(4);
@@ -95,7 +95,7 @@
end;
TCategory = class(TInstantObject)
- {IOMETADATA stored;
+ {IOMETADATA stored;
Name: String(30); }
_Name: TInstantString;
private
@@ -236,7 +236,7 @@
implementation
uses
- SysUtils, InstantUtils;
+ SysUtils, InstantUtils, InstantMetadata;
{ TAddress }
Property changes on: trunk/Source/Brokers/ADO/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
Property changes on: trunk/Source/Brokers/BDE/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
Property changes on: trunk/Source/Brokers/DBX/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
Property changes on: trunk/Source/Brokers/IBX/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
Property changes on: trunk/Source/Catalogs/IBFb/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
Property changes on: trunk/Source/Catalogs/MSSql/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
Property changes on: trunk/Source/Catalogs/MySQL/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
Property changes on: trunk/Source/Core/D2009
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.local
*.identcache
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2009-08-05 11:44:58 UTC (rev 814)
+++ trunk/Source/Core/InstantCode.pas 2009-08-05 17:15:33 UTC (rev 815)
@@ -8628,23 +8628,25 @@
if not Assigned(AObject) then
Exit;
Stream := TInstantStringStream.Create('');
- Writer := TInstantCodeWriter.Create(Stream);
try
- Writer.Origin := CursorPos;
- while IndentLevel > 0 do
- begin
- Writer.Indent;
- Dec(IndentLevel);
- end;
- AObject.Write(Writer);
- AObject.Lock;
+ Writer := TInstantCodeWriter.Create(Stream);
try
- InsertText(Stream.DataString);
+ while IndentLevel > 0 do
+ begin
+ Writer.Indent;
+ Dec(IndentLevel);
+ end;
+ AObject.Write(Writer);
+ AObject.Lock;
+ try
+ InsertText(Stream.DataString);
+ finally
+ AObject.Unlock;
+ end;
finally
- AObject.Unlock;
+ Writer.Free;
end;
finally
- Writer.Free;
Stream.Free;
end;
end;
Modified: trunk/Source/Core/InstantTextFiler.pas
===================================================================
--- trunk/Source/Core/InstantTextFiler.pas 2009-08-05 11:44:58 UTC (rev 814)
+++ trunk/Source/Core/InstantTextFiler.pas 2009-08-05 17:15:33 UTC (rev 815)
@@ -45,7 +45,7 @@
PInstantTextPos = ^TInstantTextPos;
TInstantTextPos = record
Column, Line: Integer;
- Offset: Int64;
+ Offset: Int64; // In characters, not bytes.
end;
EInstantTextPosError = class(EInstantError)
@@ -143,7 +143,7 @@
else
Inc(Pos.Column);
end;
- Inc(Pos.Offset, SizeOf(Char));
+ Inc(Pos.Offset);
end;
procedure DescendTextPos(var Pos: TInstantTextPos; Ch: Char);
@@ -163,7 +163,7 @@
else
Dec(Pos.Column);
end;
- Dec(Pos.Offset, SizeOf(Char));
+ Dec(Pos.Offset);
end;
{ EInstantTextPosError }
@@ -194,7 +194,7 @@
constructor TInstantTextFiler.Create(AText: string);
begin
- Create(TInstantStringStream.Create(AText), True);
+ Create(TStringStream.Create(AText), True);
end;
procedure TInstantTextFiler.DescendPosition(Ch: Char);
@@ -221,7 +221,7 @@
function TInstantTextFiler.GetPosition: TInstantTextPos;
begin
- FPosition.Offset := StreamPos;
+ FPosition.Offset := StreamPos div SizeOf(Char);
Result := FPosition;
end;
@@ -261,7 +261,7 @@
procedure TInstantTextFiler.SetPosition(const Value: TInstantTextPos);
begin
FPosition := Value;
- StreamPos := FPosition.Offset;
+ StreamPos := FPosition.Offset * SizeOf(Char);
end;
procedure TInstantTextFiler.SetStreamPos(Value: Int64);
Property changes on: trunk/Source/Design/D2009
___________________________________________________________________
Added: svn:ignore
+ __history
*.dcu
*.local
*.identcache
Modified: trunk/Source/Design/D2009/DclIOCore.dproj
===================================================================
--- trunk/Source/Design/D2009/DclIOCore.dproj 2009-08-05 11:44:58 UTC (rev 814)
+++ trunk/Source/Design/D2009/DclIOCore.dproj 2009-08-05 17:15:33 UTC (rev 815)
@@ -136,8 +136,8 @@
<Parameters Name="LoadAllSymbols">True</Parameters>
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
<Parameters Name="HostApplication">C:\Program Files\CodeGear\RAD Studio\6.0\bin\bds.exe</Parameters>
- <Parameters Name="DebugSourceDirs">S:\InstantObjectsUnicode\Source\Core\</Parameters>
- <Parameters Name="RunParams">S:\InstantObjectsUnicode\Tests\TestIO.dproj</Parameters>
+ <Parameters Name="DebugSourceDirs">W:\projects\instantobjects\Source\Core\</Parameters>
+ <Parameters Name="RunParams">"C:\Users\nandod\Documents\RAD Studio\Projects\TestInstantCode\TestInstantCode.dproj"</Parameters>
</Parameters>
<VersionInfo>
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
Modified: trunk/Source/PackageGroups/D2009/CorePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/D2009/CorePackages.groupproj 2009-08-05 11:44:58 UTC (rev 814)
+++ trunk/Source/PackageGroups/D2009/CorePackages.groupproj 2009-08-05 17:15:33 UTC (rev 815)
@@ -24,15 +24,6 @@
<Projects Include="..\..\..\Tests\TestIO_D2009.dproj">
<Dependencies/>
</Projects>
- <Projects Include="S:\InstantObjectsUnicode\Source\Catalogs\MSSql\D2009\IOMSSqlCatalog.dproj">
- <Dependencies/>
- </Projects>
- <Projects Include="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\IOADO.dproj">
- <Dependencies/>
- </Projects>
- <Projects Include="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\DclIOADO.dproj">
- <Dependencies/>
- </Projects>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -104,41 +95,14 @@
<Target Name="TestIO_D2009:Make">
<MSBuild Targets="Make" Projects="..\..\..\Tests\TestIO_D2009.dproj"/>
</Target>
- <Target Name="IOMSSqlCatalog">
- <MSBuild Projects="S:\InstantObjectsUnicode\Source\Catalogs\MSSql\D2009\IOMSSqlCatalog.dproj"/>
- </Target>
- <Target Name="IOMSSqlCatalog:Clean">
- <MSBuild Targets="Clean" Projects="S:\InstantObjectsUnicode\Source\Catalogs\MSSql\D2009\IOMSSqlCatalog.dproj"/>
- </Target>
- <Target Name="IOMSSqlCatalog:Make">
- <MSBuild Targets="Make" Projects="S:\InstantObjectsUnicode\Source\Catalogs\MSSql\D2009\IOMSSqlCatalog.dproj"/>
- </Target>
- <Target Name="IOADO">
- <MSBuild Projects="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\IOADO.dproj"/>
- </Target>
- <Target Name="IOADO:Clean">
- <MSBuild Targets="Clean" Projects="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\IOADO.dproj"/>
- </Target>
- <Target Name="IOADO:Make">
- <MSBuild Targets="Make" Projects="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\IOADO.dproj"/>
- </Target>
- <Target Name="DclIOADO">
- <MSBuild Projects="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\DclIOADO.dproj"/>
- </Target>
- <Target Name="DclIOADO:Clean">
- <MSBuild Targets="Clean" Projects="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\DclIOADO.dproj"/>
- </Target>
- <Target Name="DclIOADO:Make">
- <MSBuild Targets="Make" Projects="S:\InstantObjectsUnicode\Source\Brokers\ADO\D2009\DclIOADO.dproj"/>
- </Target>
<Target Name="Build">
- <CallTarget Targets="IOCore;DclIOCore;IOBDE;DclIOBDE;IOXML;DclIOXML;TestIO_D2009;IOMSSqlCatalog;IOADO;DclIOADO"/>
+ <CallTarget Targets="IOCore;DclIOCore;IOBDE;DclIOBDE;IOXML;DclIOXML;TestIO_D2009"/>
</Target>
<Target Name="Clean">
- <CallTarget Targets="IOCore:Clean;DclIOCore:Clean;IOBDE:Clean;DclIOBDE:Clean;IOXML:Clean;DclIOXML:Clean;TestIO_D2009:Clean;IOMSSqlCatalog:Clean;IOADO:Clean;DclIOADO:Clean"/>
+ <CallTarget Targets="IOCore:Clean;DclIOCore:Clean;IOBDE:Clean;DclIOBDE:Clean;IOXML:Clean;DclIOXML:Clean;TestIO_D2009:Clean"/>
</Target>
<Target Name="Make">
- <CallTarget Targets="IOCore:Make;DclIOCore:Make;IOBDE:Make;DclIOBDE:Make;IOXML:Make;DclIOXML:Make;TestIO_D2009:Make;IOMSSqlCatalog:Make;IOADO:Make;DclIOADO:Make"/>
+ <CallTarget Targets="IOCore:Make;DclIOCore:Make;IOBDE:Make;DclIOBDE:Make;IOXML:Make;DclIOXML:Make;TestIO_D2009:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>
Modified: trunk/Tests/TestModel.pas
===================================================================
--- trunk/Tests/TestModel.pas 2009-08-05 11:44:58 UTC (rev 814)
+++ trunk/Tests/TestModel.pas 2009-08-05 17:15:33 UTC (rev 815)
@@ -124,7 +124,7 @@
end;
TCategory = class(TInstantObject)
- {IOMETADATA stored 'Categories';
+ {IOMETADATA stored 'Categories';
Name: String(30); }
_Name: TInstantString;
private
@@ -137,7 +137,7 @@
end;
TContact = class(TInstantObject)
- {IOMETADATA stored;
+ {IOMETADATA stored;
Address: Part(TAddress);
Category: Reference(TCategory);
City: String(30) index;
|
