Changeset 13

Timestamp:

Oct 23, 2009, 8:12:34 AM (15 years ago)

Author:

george

Message:

• Added: Support for Single and Double float data types.

Location:

ProtocolBuffers

Files:

• Demo.lpi (modified) (1 diff)
• UProtocolBuffers.pas (modified) (10 diffs)
• fpc-res.or (deleted)

ProtocolBuffers/Demo.lpi

@@ -50 +50 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
-        <CursorPos X="42" Y="159"/>
+        <CursorPos X="35" Y="159"/>
         <TopLine Value="146"/>
         <EditorIndex Value="0"/>

ProtocolBuffers/UProtocolBuffers.pas

@@ -30 +30 @@
     DefaultString: string;
     DefaultInteger: Integer;
+    DefaultDouble: Double;
     constructor Create;
     destructor Destroy; override;
@@ -46 +47 @@
     procedure SaveVariantToStream(Stream: TStream; Value: Integer);
     function LoadVariantFromStream(Stream: TStream): Integer;
+    procedure SaveFixed32ToStream(Stream: TStream; Value: Cardinal);
+    function LoadFixed32FromStream(Stream: TStream): Cardinal;
+    procedure SaveFixed64ToStream(Stream: TStream; Value: QWord);
+    function LoadFixed64FromStream(Stream: TStream): QWord;
     procedure SaveLengthDelimitedToStream(Stream: TStream; Block: TStream);
     procedure LoadLengthDelimitedFromStream(Stream: TStream; Block: TStream);
@@ -70 +75 @@
   TPBIntegerItem = class(TPBItem)
     Value: Integer;
+    procedure SaveToStream(Stream: TStream; Definition: TPBDefinition); override;
+    procedure LoadFromStream(Stream: TStream; Definition: TPBDefinition); override;
+    constructor Create;
+    procedure Assign(Source: TPBItem); override;
+  end;
+
+  { TPBFloatItem }
+  TPBFloatItem = class(TPBItem)
+    Value: Single;
+    procedure SaveToStream(Stream: TStream; Definition: TPBDefinition); override;
+    procedure LoadFromStream(Stream: TStream; Definition: TPBDefinition); override;
+    constructor Create;
+    procedure Assign(Source: TPBItem); override;
+  end;
+
+  { TPBDoubleItem }
+  TPBDoubleItem = class(TPBItem)
+    Value: Double;
     procedure SaveToStream(Stream: TStream; Definition: TPBDefinition); override;
     procedure LoadFromStream(Stream: TStream; Definition: TPBDefinition); override;
@@ -167 +190 @@
       Items[I] := TPBIntegerItem.Create;
       TPBIntegerItem(Items[I]).Value := TPBDefinition(Definition.Items[I]).DefaultInteger;
+    end else
+    if TPBDefinition(Definition.Items[I]).ItemType = itFloat then begin
+      Items[I] := TPBFloatItem.Create;
+      TPBFloatItem(Items[I]).Value := TPBDefinition(Definition.Items[I]).DefaultDouble;
+    end else
+    if TPBDefinition(Definition.Items[I]).ItemType = itDouble then begin
+      Items[I] := TPBDoubleItem.Create;
+      TPBDoubleItem(Items[I]).Value := TPBDefinition(Definition.Items[I]).DefaultDouble;
     end else
     if TPBDefinition(Definition.Items[I]).ItemType = itString then begin
@@ -239 +270 @@
           TPBStringItem(NewItem).LoadFromStream(Stream, Definition.Items[ItemIndex])
         end else
+        if TPBDefinition(Definition.Items[ItemIndex]).ItemType = itFloat then begin
+          NewItem := TPBFloatItem.Create;
+          TPBFloatItem(NewItem).LoadFromStream(Stream, Definition.Items[ItemIndex])
+        end else
+        if TPBDefinition(Definition.Items[ItemIndex]).ItemType = itDouble then begin
+          NewItem := TPBDoubleItem.Create;
+          TPBDoubleItem(NewItem).LoadFromStream(Stream, Definition.Items[ItemIndex])
+        end else
         if TPBDefinition(Definition.Items[ItemIndex]).ItemType = itMessage then begin
           NewItem := TPBMessageItem.Create;
@@ -254 +293 @@
       if ItemHead.WireType = wtVariant then
         TempItem.LoadVariantFromStream(Stream)
+      else if ItemHead.WireType = wt32bit then
+        TempItem.LoadFixed32FromStream(Stream)
+      else if ItemHead.WireType = wt64bit then
+        TempItem.LoadFixed64FromStream(Stream)
       else if ItemHead.WireType = wtLengthDelimited then
         TempItem.LoadLengthDelimitedFromStream(Stream, TempStream);
@@ -375 +418 @@
 end;
 
+procedure TPBItem.SaveFixed32ToStream(Stream: TStream; Value: Cardinal);
+begin
+  TMemoryStreamEx(Stream).WriteCardinal(Value);
+end;
+
+function TPBItem.LoadFixed32FromStream(Stream: TStream): Cardinal;
+begin
+  Result := TMemoryStreamEx(Stream).ReadCardinal;
+end;
+
+procedure TPBItem.SaveFixed64ToStream(Stream: TStream; Value: QWord);
+begin
+  TMemoryStreamEx(Stream).WriteInt64(Value);
+end;
+
+function TPBItem.LoadFixed64FromStream(Stream: TStream): QWord;
+begin
+  Result := TMemoryStreamEx(Stream).ReadInt64;
+end;
+
 procedure TPBItem.SaveLengthDelimitedToStream(Stream: TStream; Block: TStream);
 begin
@@ -462 +525 @@
   case ItemType of
     itInteger: Result := wtVariant;
-    itFloat: Result := wt64bit;
-    itDouble: Result := wt32bit;
+    itFloat: Result := wt32bit;
+    itDouble: Result := wt64bit;
     itString: Result := wtLengthDelimited;
     itMessage: Result := wtLengthDelimited;
@@ -496 +559 @@
       TPBIntegerItem(Items[I]).Value := Definition.DefaultInteger;
     end else
+    if Definition.ItemType = itFloat then begin
+      Items[I] := TPBFloatItem.Create;
+      TPBFloatItem(Items[I]).Value := Definition.DefaultDouble;
+    end else
+    if Definition.ItemType = itDouble then begin
+      Items[I] := TPBDoubleItem.Create;
+      TPBDoubleItem(Items[I]).Value := Definition.DefaultDouble;
+    end else
     if Definition.ItemType = itString then begin
       Items[I] := TPBStringItem.Create;
@@ -550 +621 @@
 end;
 
+{ TPBFloatItem }
+
+procedure TPBFloatItem.SaveToStream(Stream: TStream; Definition: TPBDefinition
+  );
+begin
+  SaveHeadToStream(Stream, Definition);
+  SaveFixed32ToStream(Stream, Cardinal(Value));
+end;
+
+procedure TPBFloatItem.LoadFromStream(Stream: TStream; Definition: TPBDefinition
+  );
+begin
+  inherited;
+  Value := Single(LoadFixed32FromStream(Stream));
+end;
+
+constructor TPBFloatItem.Create;
+begin
+
+end;
+
+procedure TPBFloatItem.Assign(Source: TPBItem);
+begin
+  if Source is TPBFloatItem then
+    Value := TPBFloatItem(Source).Value;
+end;
+
+{ TPBDoubleItem }
+
+procedure TPBDoubleItem.SaveToStream(Stream: TStream; Definition: TPBDefinition
+  );
+begin
+  SaveHeadToStream(Stream, Definition);
+  SaveFixed64ToStream(Stream, QWord(Value));
+end;
+
+procedure TPBDoubleItem.LoadFromStream(Stream: TStream;
+  Definition: TPBDefinition);
+begin
+  inherited;
+  Value := Double(LoadFixed64FromStream(Stream));
+end;
+
+constructor TPBDoubleItem.Create;
+begin
+
+end;
+
+procedure TPBDoubleItem.Assign(Source: TPBItem);
+begin
+  if Source is TPBDoubleItem then
+    Value := TPBDoubleItem(Source).Value;
+end;
+
 end.