]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
projects / thirdparty / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a242fb4)
[PATCH] modula2: -Wcase-enum detect singular/plural and use switch during build
authorGaius Mulley <gaiusmod2@gmail.com>
Wed, 13 Sep 2023 19:48:53 +0000 (20:48 +0100)
committerGaius Mulley <gaiusmod2@gmail.com>
Wed, 13 Sep 2023 19:48:53 +0000 (20:48 +0100)
This patch generates a singular or plural message relating to the
number of enums missing.  Use -Wcase-enum when building of the
modula-2 libraries and m2/stage2/cc1gm2.

gcc/m2/ChangeLog:

* Make-lang.in (GM2_FLAGS): Add -Wcase-enum.
(GM2_ISO_FLAGS): Add -Wcase-enum.
* gm2-compiler/M2CaseList.mod (EnumerateErrors): Issue
singular or plural start text prior to the enum list.
Remove unused parameter tokenno.
(EmitMissingRangeErrors): New procedure.
(MissingCaseBounds): Call EmitMissingRangeErrors.
(MissingCaseStatementBounds): Call EmitMissingRangeErrors.
* gm2-libs-iso/TextIO.mod: Fix spacing.

libgm2/ChangeLog:

* libm2cor/Makefile.am (libm2cor_la_M2FLAGS): Add
-Wcase-enum.
* libm2cor/Makefile.in: Regenerate.
* libm2iso/Makefile.am (libm2iso_la_M2FLAGS): Add
-Wcase-enum.
* libm2iso/Makefile.in: Regenerate.
* libm2log/Makefile.am (libm2log_la_M2FLAGS): Add
-Wcase-enum.
* libm2log/Makefile.in: Regenerate.
* libm2pim/Makefile.am (libm2pim_la_M2FLAGS): Add
-Wcase-enum.
* libm2pim/Makefile.in: Regenerate.

(cherry picked from commit 3af2af15798cb6243e2643f98f62c9270b1ca5d2)

Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
gcc/m2/Make-lang.in patch | blob | blame | history
gcc/m2/gm2-compiler/M2CaseList.mod patch | blob | blame | history
gcc/m2/gm2-libs-iso/TextIO.mod patch | blob | blame | history
libgm2/libm2cor/Makefile.am patch | blob | blame | history
libgm2/libm2cor/Makefile.in patch | blob | blame | history
libgm2/libm2iso/Makefile.am patch | blob | blame | history
libgm2/libm2iso/Makefile.in patch | blob | blame | history
libgm2/libm2log/Makefile.am patch | blob | blame | history
libgm2/libm2log/Makefile.in patch | blob | blame | history
libgm2/libm2pim/Makefile.am patch | blob | blame | history
libgm2/libm2pim/Makefile.in patch | blob | blame | history

diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 4c06fc44f83f70c420f06cd561c4619131173185..cf4f3c0151156d26a54eab4ddf1184abe57531ba 100644 (file)
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -474,18 +474,21 @@ GM2_G=-g -fm2-g
 GM2_CPP=
 # GM2_DEBUG_STRMEM=-fcpp
 GM2_DEBUG_STRMEM=
-GM2_FLAGS=-Wunused-variable -Wuninit-variable-checking \
- -fsoft-check-all \
- -fno-return -Wreturn-type \
+GM2_FLAGS=-fsoft-check-all \
+ -fno-return \
  $(GM2_G) $(GM2_O) \
  -funbounded-by-reference -fpim -fextended-opaque \
- -Wpedantic-cast -Wpedantic-param-names -ffunction-sections \
- -fdata-sections $(GM2_CPP) # -fauto-init
+ -Wcase-enum -Wpedantic-cast -Wpedantic-param-names \
+ -Wreturn-type -Wunused-variable -Wuninit-variable-checking \
+ -ffunction-sections -fdata-sections \
+ $(GM2_CPP) # -fauto-init
 GM2_ISO_FLAGS=-fsoft-check-all $(GM2_G) $(GM2_O) \
- -fno-return -Wreturn-type \
+ -fno-return \
  -funbounded-by-reference -fiso -fextended-opaque \
- -Wpedantic-cast -Wpedantic-param-names -ffunction-sections \
- -fdata-sections $(GM2_CPP)
+ -Wcase-enum -Wpedantic-cast -Wpedantic-param-names -Wreturn-type \
+ -Wunused-variable -Wuninit-variable-checking \
+ -ffunction-sections -fdata-sections \
+ $(GM2_CPP)
 GM2_MIN_FLAGS=$(GM2_G) $(GM2_OS) \
  -funbounded-by-reference -fextended-opaque \
  -Wpedantic-cast -Wpedantic-param-names -fno-exceptions \
diff --git a/gcc/m2/gm2-compiler/M2CaseList.mod b/gcc/m2/gm2-compiler/M2CaseList.mod
index c7596356ddf50dc543a24118db4b4aac475df5cd..18ea1fecf2b7e98be14d381d3218b908910ed696 100644 (file)
--- a/gcc/m2/gm2-compiler/M2CaseList.mod
+++ b/gcc/m2/gm2-compiler/M2CaseList.mod
@@ -36,9 +36,11 @@ FROM DynamicStrings IMPORT InitString, InitStringCharStar, ConCat, Mark, KillStr
 FROM m2tree IMPORT Tree ;
 FROM m2block IMPORT RememberType ;
 FROM m2type IMPORT GetMinFrom ;
+FROM m2expr IMPORT GetIntegerOne ;
 FROM Storage IMPORT ALLOCATE ;
 FROM M2Base IMPORT IsExpressionCompatible ;
 FROM M2Printf IMPORT printf1 ;
+FROM M2LexBuf IMPORT TokenToLocation ;
 
 FROM SymbolTable IMPORT NulSym, IsConst, IsFieldVarient, IsRecord, IsRecordField, GetVarientTag, GetType,
                         ForeachLocalSymDo, GetSymName, IsEnumeration, SkipType, NoOfElements, GetNth ;
@@ -842,16 +844,22 @@ END appendStr ;
 
 
 (*
-   EnumerateErrors -
+   EnumerateErrors - populate errorString with the contents of enumList.
 *)
 
-PROCEDURE EnumerateErrors (tokenno: CARDINAL; enumList: List) ;
+PROCEDURE EnumerateErrors (enumList: List) ;
 VAR
    i, n: CARDINAL ;
 BEGIN
    n := NoOfItemsInList (enumList) ;
    IF (enumList # NIL) AND (n > 0)
    THEN
+      IF n = 1
+      THEN
+         errorString := InitString ('{%W}the missing enumeration field is: ') ;
+      ELSE
+         errorString := InitString ('{%W}the missing enumeration fields are: ') ;
+      END ;
       appendEnum (GetItemFromList (enumList, 1)) ;
       IF n > 1
       THEN
@@ -871,6 +879,24 @@ BEGIN
 END EnumerateErrors ;
 
 
+(*
+   EmitMissingRangeErrors - emits a singular/plural error message for an enumeration type.
+*)
+
+PROCEDURE EmitMissingRangeErrors (tokenno: CARDINAL; type: CARDINAL; set: SetRange) ;
+BEGIN
+   errorString := NIL ;
+   IF IsEnumeration (type)
+   THEN
+      EnumerateErrors (ErrorRanges (type, set))
+   END ;
+   IF errorString # NIL
+   THEN
+      MetaErrorStringT0 (tokenno, errorString)
+   END
+END EmitMissingRangeErrors ;
+
+
 (*
    MissingCaseBounds - returns true if there were any missing bounds
                        in the varient record case list, c.  It will
@@ -902,7 +928,7 @@ BEGIN
                MetaErrorT2 (tokenno,
                             'not all variant record alternatives in the {%kCASE} clause are specified, hint you either need to specify each value of {%2ad} or use an {%kELSE} clause',
                             varient, type) ;
-               EnumerateErrors (tokenno, ErrorRanges (type, set))
+               EmitMissingRangeErrors (tokenno, type, set)
             END ;
             set := DisposeRanges (set)
          END
@@ -944,9 +970,7 @@ BEGIN
                   MetaErrorT1 (tokenno,
                                'not all enumeration values in the {%kCASE} statements are specified, hint you either need to specify each value of {%1Wad} or use an {%kELSE} clause',
                                type) ;
-                  errorString := InitString ('{%W}the missing enumeration fields are: ') ;
-                  EnumerateErrors (tokenno, ErrorRanges (type, set)) ;
-                  MetaErrorStringT0 (tokenno, errorString)
+                  EmitMissingRangeErrors (tokenno, type, set)
                END ;
                set := DisposeRanges (set)
             END
diff --git a/gcc/m2/gm2-libs-iso/TextIO.mod b/gcc/m2/gm2-libs-iso/TextIO.mod
index a6ca17edecb6e09f9b57514e33cb7b937a4d9e6f..eab156d207621b81035a221d0e441908f940ed40 100644 (file)
--- a/gcc/m2/gm2-libs-iso/TextIO.mod
+++ b/gcc/m2/gm2-libs-iso/TextIO.mod
@@ -68,7 +68,7 @@ END DumpState ;
 *)
 
 PROCEDURE SetNul (cid: IOChan.ChanId; i: CARDINAL;
-                     VAR s: ARRAY OF CHAR; range: BOOLEAN) ;
+                  VAR s: ARRAY OF CHAR; range: BOOLEAN) ;
 BEGIN
    IF DebugState
    THEN
diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am
index 48de40c22dd1d0714178ff08c96637079cdabde1..ae96b4bfe783fe8482573bfc47693e5845e7d009 100644 (file)
--- a/libgm2/libm2cor/Makefile.am
+++ b/libgm2/libm2cor/Makefile.am
@@ -117,7 +117,7 @@ libm2cor_la_M2FLAGS = \
     -fm2-pathname=m2cor -I. -I$(GM2_SRC)/gm2-libs-coroutines \
     -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs \
     -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \
-    -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2cor
+    -fm2-g -g -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2cor
 if TARGET_DARWIN
 libm2cor_la_link_flags = -Wl,-undefined,dynamic_lookup
 else
diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in
index a6b05cf71f292aafb7a017c6ef0986dde814e832..8daf0eaa054eaef692ad8df3acf6381a36f688a2 100644 (file)
--- a/libgm2/libm2cor/Makefile.in
+++ b/libgm2/libm2cor/Makefile.in
@@ -467,7 +467,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 @BUILD_CORLIB_TRUE@    -fm2-pathname=m2cor -I. -I$(GM2_SRC)/gm2-libs-coroutines \
 @BUILD_CORLIB_TRUE@    -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs \
 @BUILD_CORLIB_TRUE@    -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \
-@BUILD_CORLIB_TRUE@    -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2cor
+@BUILD_CORLIB_TRUE@    -fm2-g -g -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2cor
 
 @BUILD_CORLIB_TRUE@@TARGET_DARWIN_FALSE@libm2cor_la_link_flags = 
 @BUILD_CORLIB_TRUE@@TARGET_DARWIN_TRUE@libm2cor_la_link_flags = -Wl,-undefined,dynamic_lookup
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
index 1386f156caba09563df8b070dee5847c6ab4e498..90d344f0fa89a76c735133ffae7fe2f9e1964bae 100644 (file)
--- a/libgm2/libm2iso/Makefile.am
+++ b/libgm2/libm2iso/Makefile.am
@@ -191,7 +191,7 @@ libm2iso_la_CFLAGS = $(C_INCLUDES) -I. -I.. -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SR
 libm2iso_la_M2FLAGS = \
   -fm2-pathname=m2iso -I. -Ilibm2iso -I$(GM2_SRC)/gm2-libs-iso \
   -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs \
-  -fiso -fextended-opaque -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2iso
+  -fiso -fextended-opaque -fm2-g -g -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2iso
 if TARGET_DARWIN
 libm2iso_la_link_flags = -Wl,-undefined,dynamic_lookup
 else
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index ec5465058e76fe8818fa396099682eb84e2c058f..8d6443d39466fa996a3b1df3c4057f3839c0ec45 100644 (file)
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -568,7 +568,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 @BUILD_ISOLIB_TRUE@libm2iso_la_M2FLAGS = \
 @BUILD_ISOLIB_TRUE@  -fm2-pathname=m2iso -I. -Ilibm2iso -I$(GM2_SRC)/gm2-libs-iso \
 @BUILD_ISOLIB_TRUE@  -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs \
-@BUILD_ISOLIB_TRUE@  -fiso -fextended-opaque -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2iso
+@BUILD_ISOLIB_TRUE@  -fiso -fextended-opaque -fm2-g -g -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2iso
 
 @BUILD_ISOLIB_TRUE@@TARGET_DARWIN_FALSE@libm2iso_la_link_flags = 
 @BUILD_ISOLIB_TRUE@@TARGET_DARWIN_TRUE@libm2iso_la_link_flags = -Wl,-undefined,dynamic_lookup
diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am
index a15747fd24534b4046ae6657d787cb8e035ebb01..27f38406b0766d019ab4f9109245eae22cc95ac0 100644 (file)
--- a/libgm2/libm2log/Makefile.am
+++ b/libgm2/libm2log/Makefile.am
@@ -136,7 +136,7 @@ libm2log_la_M2FLAGS = \
  -fm2-pathname=m2log -I$(GM2_SRC)/gm2-libs-log \
  -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs \
  -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \
- -Wreturn-type -fcase -fm2-prefix=m2log
+ -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2log
 if TARGET_DARWIN
 libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup
 else
diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index b5b0ad6ed8809d7040eaa7b0ffc075ee94309410..2188f9ec0c50d16795974740c13137967f82af03 100644 (file)
--- a/libgm2/libm2log/Makefile.in
+++ b/libgm2/libm2log/Makefile.in
@@ -476,7 +476,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 @BUILD_LOGLIB_TRUE@ -fm2-pathname=m2log -I$(GM2_SRC)/gm2-libs-log \
 @BUILD_LOGLIB_TRUE@ -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs \
 @BUILD_LOGLIB_TRUE@ -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \
-@BUILD_LOGLIB_TRUE@ -Wreturn-type -fcase -fm2-prefix=m2log
+@BUILD_LOGLIB_TRUE@ -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2log
 
 @BUILD_LOGLIB_TRUE@@TARGET_DARWIN_FALSE@libm2log_la_link_flags = 
 @BUILD_LOGLIB_TRUE@@TARGET_DARWIN_TRUE@libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup
diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am
index ebfeba1ac1df2aeeb86d843e0a2d3a7410582498..ac172b933376a0fa98dcdc85e38ebd90c4a37afe 100644 (file)
--- a/libgm2/libm2pim/Makefile.am
+++ b/libgm2/libm2pim/Makefile.am
@@ -169,7 +169,7 @@ libm2pim_la_CFLAGS = -I. -I.. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -D
 libm2pim_la_M2FLAGS = \
   -fm2-pathname=m2pim -I. -I$(GM2_SRC)/gm2-libs \
   -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \
-  -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2pim
+  -fm2-g -g -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2pim
 if TARGET_DARWIN
 libm2pim_la_link_flags = -Wl,-undefined,dynamic_lookup
 else
diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index 40126da4c93562ed2442baa0b086c871440635ae..4c2d574392b49c4a5775fd4c55f68bf40061ad17 100644 (file)
--- a/libgm2/libm2pim/Makefile.in
+++ b/libgm2/libm2pim/Makefile.in
@@ -537,7 +537,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 @BUILD_PIMLIB_TRUE@libm2pim_la_M2FLAGS = \
 @BUILD_PIMLIB_TRUE@  -fm2-pathname=m2pim -I. -I$(GM2_SRC)/gm2-libs \
 @BUILD_PIMLIB_TRUE@  -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \
-@BUILD_PIMLIB_TRUE@  -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2pim
+@BUILD_PIMLIB_TRUE@  -fm2-g -g -Wcase-enum -Wreturn-type -fcase -fm2-prefix=m2pim
 
 @BUILD_PIMLIB_TRUE@@TARGET_DARWIN_FALSE@libm2pim_la_link_flags = 
 @BUILD_PIMLIB_TRUE@@TARGET_DARWIN_TRUE@libm2pim_la_link_flags = -Wl,-undefined,dynamic_lookup
Mirror of https://gcc.gnu.org/git/gcc.git