Forráskód Böngészése

+ some missing word handling added

florian 20 éve
szülő
commit
cb397d4f91
1 módosított fájl, 7 hozzáadás és 3 törlés
  1. 7 3
      rtl/objpas/varutils.inc

+ 7 - 3
rtl/objpas/varutils.inc

@@ -67,7 +67,7 @@ begin
       begin
       begin
       if (VType and varByRef) = 0 then
       if (VType and varByRef) = 0 then
         case VType of
         case VType of
-          varEmpty, varNull, varSmallint, varInteger, varSingle, varDouble,
+          varEmpty, varNull, varSmallint, varInteger, varSingle, varDouble, varWord,
           varCurrency, varDate, varError, varBoolean, varByte,VarShortInt,
           varCurrency, varDate, varError, varBoolean, varByte,VarShortInt,
           varInt64, VarLongWord,VarQWord:
           varInt64, VarLongWord,VarQWord:
             ;
             ;
@@ -101,7 +101,7 @@ begin
       else
       else
         case (VType and varTypeMask) of
         case (VType and varTypeMask) of
           varEmpty, varNull:;
           varEmpty, varNull:;
-          varSmallint, varInteger, varSingle, varDouble, varCurrency,
+          varSmallint, varInteger, varSingle, varDouble, varCurrency, varWord,
           varDate, varError, varBoolean, varByte,VarShortInt,
           varDate, varError, varBoolean, varByte,VarShortInt,
           varInt64, VarLongWord,VarQWord:
           varInt64, VarLongWord,VarQWord:
             Move(VBytes, VargDest.VBytes, SizeOf(VargDest.VBytes));
             Move(VBytes, VargDest.VBytes, SizeOf(VargDest.VBytes));
@@ -138,6 +138,7 @@ begin
       varBoolean  : VargDest.VBoolean:=PWordBool(VPointer)^;
       varBoolean  : VargDest.VBoolean:=PWordBool(VPointer)^;
       varError    : VargDest.VError:=PError(VPointer)^;
       varError    : VargDest.VError:=PError(VPointer)^;
       varByte     : VargDest.VByte:=PByte(VPointer)^;
       varByte     : VargDest.VByte:=PByte(VPointer)^;
+      varWord     : VargDest.VWord:=PWord(VPointer)^;
       VarShortInt : VargDest.VShortInt:=PShortInt(VPointer)^;
       VarShortInt : VargDest.VShortInt:=PShortInt(VPointer)^;
       VarInt64    : VargDest.VInt64:=PInt64(VPointer)^;
       VarInt64    : VargDest.VInt64:=PInt64(VPointer)^;
       VarLongWord : VargDest.VLongWord:=PCardinal(VPointer)^;
       VarLongWord : VargDest.VLongWord:=PCardinal(VPointer)^;
@@ -710,7 +711,10 @@ end;
 {$endif HASVARIANT}
 {$endif HASVARIANT}
 {
 {
   $Log$
   $Log$
-  Revision 1.14  2005-01-16 16:15:30  florian
+  Revision 1.15  2005-01-16 16:56:32  florian
+    + some missing word handling added
+
+  Revision 1.14  2005/01/16 16:15:30  florian
     * olestring copying fixed
     * olestring copying fixed
 
 
   Revision 1.13  2005/01/15 18:47:26  florian
   Revision 1.13  2005/01/15 18:47:26  florian