Fixed variant discriminator types

packages/fcl-res/src/machotypes.pp

@@ -36,10 +36,10 @@ type
 
   TMachOSubMachineType = record
     case TMachOMachineType of
-      msmppc_all: (fPpcSubType: TMachOSubMachineTypePowerPC);
-      msmppc64_all: (fPpc64SubType: TMachOSubMachineTypePowerPC64);
-      msm386_all: (f386SubType: TMachOSubMachineType386);
-      msmx64_all: (fX64SubType: TMachOSubMachineTypex64);
+      mmtpowerpc: (fPpcSubType: TMachOSubMachineTypePowerPC);
+      mmtpowerpc64: (fPpc64SubType: TMachOSubMachineTypePowerPC64);
+      mmti386: (f386SubType: TMachOSubMachineType386);
+      mmtx86_64: (fX64SubType: TMachOSubMachineTypex64);
       mmtarm: (fArmSubType: TMachOSubMachineTypeArm);
       mmtarm64: (fArm64SubType: TMachOSubMachineTypeAarch64);
   end;

rtl/inc/sstrings.inc

@@ -537,7 +537,7 @@ type
          case TTypeKind of
             tkInteger,tkChar,tkEnumeration,tkBool,tkWChar: (
               MinValue,MaxValue : Longint;
-              case byte of
+              case TTypeKind of
                 tkEnumeration: (
                   BaseTypeRef : pointer
                   );

tests/tbs/tb0516.pp

@@ -5,8 +5,8 @@ type
   tb = (e1,e2);
   tr = record
     case a: byte of
-      -1,'c'..ea,e2..-5: (l: longint);
-      'b'..eb,-1,-1,-1..-38,-100..e2: (c: cardinal);
+      0..5: (l: longint);
+      100..20: (c: cardinal);
   end;
 
 begin