From 4426d0da7abffba27f125112a1484e3c9449761a Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sun, 31 Oct 2021 17:43:59 +0100 Subject: [PATCH] Fixed variant discriminator types --- packages/fcl-res/src/machotypes.pp | 8 ++++---- rtl/inc/sstrings.inc | 2 +- tests/tbs/tb0516.pp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/fcl-res/src/machotypes.pp b/packages/fcl-res/src/machotypes.pp index c90871464d..b9612baa72 100644 --- a/packages/fcl-res/src/machotypes.pp +++ b/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; diff --git a/rtl/inc/sstrings.inc b/rtl/inc/sstrings.inc index 7d47640baa..e5ba96940b 100644 --- a/rtl/inc/sstrings.inc +++ b/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 ); diff --git a/tests/tbs/tb0516.pp b/tests/tbs/tb0516.pp index 559580fb1b..7ce8c93929 100644 --- a/tests/tbs/tb0516.pp +++ b/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